Eric Anholt
6bf0f6ae86
meta: Detect currently-unsupported integer CopyTexSubImage and complain.
...
This code is unprepared for handling integer (particularly, the
baseFormat of the TexFormat comes out as GL_RGBA, not GL_RGBA_INTEGER,
so the direct call of Driver.ReadPixels crashes due to the int vs
non-int error checking not having happened). I'm frankly tempted to
convert this code to MapRenderbuffer/MapTexImage rather than doing it
as meta ops, now that we have that support.
Improves the remaining crash in Intel oglconform for int-textures to
just a rendering failure.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
2012-01-24 16:37:10 -08:00
Eric Anholt
d6c58545a1
mesa: Add the remaining from/to types for GL_EXT_texture_integer (and R/RG).
...
This aborts and crashes in intel oglconform's int-textures into being
just rendering failures. Clamping isn't handled yet.
v2: Add missing "break".
v3: Drop the int/uint distinction, since they don't need different clamping.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp@vmware.com> (v2)
2012-01-24 16:35:47 -08:00
Eric Anholt
08acd4bd61
mesa: Add support for glGetTexImage on GL_TEXTURE_1D_ARRAY
...
Similarly to how we handle this in texstore, we have to remap height
to depth so that we MapTextureImage each image layer individually.
Fixes part of Intel oglconform's int-textures advanced.fbo.rtt
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
2012-01-24 16:34:02 -08:00
Eric Anholt
86ca4f9cb6
mesa: s/GLuint col/GLint col/ to avoid signed/unsigned comparison warnings.
...
Suggested-by: Brian Paul <brianp@vmware.com>
2012-01-24 16:23:22 -08:00
Eric Anholt
9f1e64d085
mesa: Add support for glGetTexImage() from integer textures.
...
This is a step toward fixing Intel oglconform's
int-textures advanced.fbo.rtt.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
2012-01-24 16:23:22 -08:00
Eric Anholt
f6e82cd2a1
i965/gen6+: Work around GPU hangs with logic ops on integer textures.
...
This doesn't result in correct rendering -- GL requires that logic ops
work, while the hardware specs say it doesn't do them. I'm not sure
how we would want to handle this.
NOTE: This is a candidate for the 8.0 branch.
2012-01-24 16:20:21 -08:00
Eric Anholt
04b4880d7c
i965/gen6+: Disable blending, alpha test, and dither on integer FBOs.
...
Fixes GPU hangs and some rendering failures in piglit
EXT_texture_integer/fbo-blending
NOTE: This is a candidate for the 8.0 branch.
2012-01-24 16:00:04 -08:00
Brian Paul
4a1c660599
mesa/gdi: remove wmesa_set_renderbuffer_funcs() function
...
The code is no longer relevant.
Note: this driver is probably broken now. There's no implementation
of ctx->Driver.Map/UnmapRenderbuffer().
2012-01-24 15:13:20 -07:00
Brian Paul
a9bf149e7f
dri/swrast: remove obsolete swrast_span.c file from source list
2012-01-24 15:08:20 -07:00
Brian Paul
ba151a333b
swrast: fix uninitialized variable warning
2012-01-24 14:12:39 -07:00
Brian Paul
cf386f0a2b
swrast: make rowStride variable signed in put_z32_values()
...
As with commit aed5c8299f
2012-01-24 14:12:38 -07:00
Brian Paul
89bb19adb0
intel: use swrast code to map/unmap renderbuffers for swrast rendering
2012-01-24 14:12:38 -07:00
Brian Paul
4baf90353d
mesa: update comments, fix whitespace in dd.h
2012-01-24 14:12:38 -07:00
Brian Paul
9403cc3aba
swrast: remove unused StoreTexel code
...
No longer needed since we do all rendering to texture with the buffer
mapping and pixel packing functions.
2012-01-24 14:12:37 -07:00
Brian Paul
1caf698191
swrast: use Map/UnmapTextureImage() in framebuffer map/unmap code
...
When we're actually rendering into a texture, map the texture image
instead of the corresponding renderbuffer. Before, we just copied
a pointer from the texture image to the renderbuffer. This change
will make the code usable by hardware drivers.
2012-01-24 14:12:37 -07:00
Brian Paul
56d83ac4bf
mesa: remove ctx->Driver.Map/UnmapTexture() hooks
...
No longer used anywhere.
2012-01-24 14:12:37 -07:00
Brian Paul
8b8a54afd9
nouveau: stop calling ctx->Driver.Map/UnmapTexture()
...
And remove unused nouveau_texture_map/unmap()
2012-01-24 14:12:36 -07:00
Brian Paul
4bbab2275f
tnl: remove ctx->Driver.Map/UnmapTexture() calls
...
ctx->Driver.MapTexture() always points to _swrast_map_texture().
We're already reaching into swrast from t_vb_program.c anyway.
This will let us remove the ctx->Driver.Map/UnmapTexture() functions.
2012-01-24 14:12:36 -07:00
Brian Paul
bde356a158
swrast: move some renderbuffer functions to s_renderbuffer.c
2012-01-24 14:12:35 -07:00
Brian Paul
1839a7fc9f
intel: remove intel_span_supports_format()
...
It always returned True.
2012-01-24 14:12:34 -07:00
Brian Paul
6c1e27ba21
swrast: remove a few extra _mesa_get_format_bytes() calls
2012-01-24 14:12:34 -07:00
Brian Paul
1da7d6c919
mesa: update comments for gl_renderbuffer
2012-01-24 14:12:33 -07:00
Brian Paul
1888dd52a3
mesa/swrast/drivers: remove obsolete gl_renderbuffer fields
...
This removes the last of the legacy fields from gl_renderbuffer.
2012-01-24 14:12:33 -07:00
Brian Paul
becbb64313
dri/swrast: use swrast_renderbuffer type
2012-01-24 14:12:33 -07:00
Brian Paul
0c1862851f
swrast: use swrast_renderbuffer instead of gl_renderbuffer
2012-01-24 14:12:32 -07:00
Brian Paul
797c18be1f
osmesa: use swrast_renderbuffer
2012-01-24 14:12:32 -07:00
Brian Paul
c080202db5
radeon: derive radeon_renderbuffer from swrast_renderbuffer
2012-01-24 14:12:31 -07:00
Brian Paul
9f8ed9d662
intel: derive intel_renderbuffer from swrast_renderbuffer
...
Drivers that rely on swrast need to do this, as with swrast_texture_image.
2012-01-24 14:12:31 -07:00
Brian Paul
d16e71eeb4
xlib: derive xmesa_renderbuffer from swrast_renderbuffer
2012-01-24 14:12:31 -07:00
Brian Paul
f2479530b8
swrast: allocate swrast_renderbuffers instead of gl_renderbuffers
2012-01-24 14:12:30 -07:00
Brian Paul
34988272d9
swrast: new swrast_renderbuffer type
...
This will let us move the swrast-specific fields out of gl_renderbuffer.
2012-01-24 14:12:30 -07:00
Brian Paul
924de7dc96
intel: use intel_rb_format() to get renderbuffer format
...
This will make future changes cleaner and less invasive.
2012-01-24 14:12:29 -07:00
Brian Paul
1048d55d5f
dri/swrast: rename swrast_renderbuffer to dri_swrast_renderbuffer
...
To prevent name collision with future swrast_renderbuffer in the swrast
module.
2012-01-24 14:12:29 -07:00
Brian Paul
c45771905f
swrast: use stencil packing function in s_stencil.c
2012-01-24 14:12:28 -07:00
Brian Paul
881ef2a9db
swrast: use color packing functions in s_span.c
2012-01-24 14:12:28 -07:00
Brian Paul
8696a52102
swrast: remove s_spantemp.h
2012-01-24 14:12:27 -07:00
Brian Paul
b0f0d7a811
xlib: remove xm_span.c and related code
2012-01-24 14:12:27 -07:00
Brian Paul
59a5b5a193
mesa: remove gl_renderbuffer::Wrapped
...
There's no such thing as renderbuffer wrappers anymore.
2012-01-24 14:12:27 -07:00
Brian Paul
ab331140c6
swrast: rewrite, simplify the the render-to-texture code
2012-01-24 14:12:26 -07:00
Brian Paul
7a36345f70
mesa: rename gl_renderbuffer::Data to Buffer
...
To better indicate that this pointer to the malloc'd memory.
2012-01-24 14:12:26 -07:00
Brian Paul
f6a3979a04
mesa: move freeing of software renderbuffers into swrast
2012-01-24 14:12:25 -07:00
Brian Paul
f9874feef4
mesa: remove gl_renderbuffer::DataType
2012-01-24 14:12:24 -07:00
Brian Paul
1e1b5cb01a
mesa: remove gl_renderbuffer:RowStride field
2012-01-24 14:12:24 -07:00
Brian Paul
82846fea4d
mesa: finally, remove the GetRow/PutRow/etc functions
2012-01-24 14:12:23 -07:00
Brian Paul
304f7a1327
dri: remove all the obsolete spantmp files
2012-01-24 14:12:23 -07:00
Brian Paul
a4c6dedb27
radeon: remove obsolete GetRow/PutRow code
2012-01-24 14:12:22 -07:00
Brian Paul
f892debdc2
nouveau: remove obsolete GetRow/PutRow code
2012-01-24 14:12:21 -07:00
Brian Paul
41869c4942
intel: remove most of the span Get/PutRow code
2012-01-24 14:12:21 -07:00
Brian Paul
cb5fa9ea62
dri/swrast: remove obsolete GetRow/PutRow code
2012-01-24 14:12:20 -07:00
Brian Paul
2873555a76
osmesa: remove obsolete GetRow/PutRow code
2012-01-24 14:12:19 -07:00