diff options
author | Eric Anholt <eric@anholt.net> | 2013-04-19 11:44:53 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2013-04-30 10:40:43 -0700 |
commit | 0c883e46d871797cd1141498850d51cde6e54b76 (patch) | |
tree | 54019d9f77240229e7da69de95be45eb47de4984 /src/mesa/swrast/s_texrender.c | |
parent | e7ecc11311d142a8ac919627011372a265224bcd (diff) | |
download | external_mesa3d-0c883e46d871797cd1141498850d51cde6e54b76.zip external_mesa3d-0c883e46d871797cd1141498850d51cde6e54b76.tar.gz external_mesa3d-0c883e46d871797cd1141498850d51cde6e54b76.tar.bz2 |
swrast: Replace ImageOffsets with an ImageSlices pointer.
This is a step toward allowing drivers to use their normal mapping paths,
instead of requiring that all slice mappings come from an aligned offset
from the first slice's map.
This incidentally fixes missing slice handling in FXT1 swrast.
v2: Use slice height helper function.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/swrast/s_texrender.c')
-rw-r--r-- | src/mesa/swrast/s_texrender.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/swrast/s_texrender.c b/src/mesa/swrast/s_texrender.c index 7b25a7b..92d4edc 100644 --- a/src/mesa/swrast/s_texrender.c +++ b/src/mesa/swrast/s_texrender.c @@ -88,18 +88,8 @@ update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att) /* Want to store linear values, not sRGB */ rb->Format = _mesa_get_srgb_format_linear(format); - - /* Set the gl_renderbuffer::Buffer field so that mapping the buffer - * succeeds. - */ - if (att->Texture->Target == GL_TEXTURE_3D || - att->Texture->Target == GL_TEXTURE_2D_ARRAY_EXT) { - srb->Buffer = swImage->Buffer + - swImage->ImageOffsets[zOffset] * _mesa_get_format_bytes(format); - } - else { - srb->Buffer = swImage->Buffer; - } + + srb->Buffer = swImage->ImageSlices[zOffset]; } |