summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
diff options
context:
space:
mode:
authorAnuj Phogat <anuj.phogat@gmail.com>2016-03-14 10:25:50 -0700
committerAnuj Phogat <anuj.phogat@gmail.com>2016-03-21 14:55:18 -0700
commit65cd2f8443e0226797204be73033a852682c3da3 (patch)
tree3aaefb0c18ba2c8696f34b7b07bc227edd6d434f /src/mesa/swrast
parentfce0b55ccbc33d320b9734a53c2a9f7886450c73 (diff)
downloadexternal_mesa3d-65cd2f8443e0226797204be73033a852682c3da3.zip
external_mesa3d-65cd2f8443e0226797204be73033a852682c3da3.tar.gz
external_mesa3d-65cd2f8443e0226797204be73033a852682c3da3.tar.bz2
swrast: Move assert for 'slice' in to check_map_teximage
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Alejandro PiƱeiro <apinheiro@igalia.com>
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_texture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index 9ccd0e3..25918e3 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -188,6 +188,7 @@ check_map_teximage(const struct gl_texture_image *texImage,
assert(y < texImage->Height || texImage->Height == 0);
assert(x + w <= texImage->Width);
assert(y + h <= texImage->Height);
+ assert(slice < texture_slices(texImage));
}
/**
@@ -240,7 +241,6 @@ _swrast_map_teximage(struct gl_context *ctx,
assert(swImage->Buffer);
assert(swImage->Buffer == swImage->ImageSlices[0]);
- assert(slice < texture_slices(texImage));
map = swImage->ImageSlices[slice];
/* apply x/y offset to map address */