aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2016-02-14 07:16:25 -0700
committerBrian Paul <[email protected]>2016-02-14 09:16:22 -0700
commit816c987b67e3c65e17687b84f4575aaf61e9580a (patch)
tree1f4dc9f70d45990d57d47097a92ae6232131ffe9 /src/mesa
parenta4cff1859efedac37368c1ddc55b091b6cd3eb65 (diff)
mesa: move assertion in _mesa_cube_face_target()
Fixes piglit arb_texture_view-sampling-2d-array-as-2d-layer regression. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94134 Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/teximage.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index a7e54f78cfe..17f2c908ecc 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -76,11 +76,13 @@ _mesa_num_tex_faces(GLenum target)
static inline GLenum
_mesa_cube_face_target(GLenum target, unsigned face)
{
- assert(face < 6);
- if (target == GL_TEXTURE_CUBE_MAP)
+ if (target == GL_TEXTURE_CUBE_MAP) {
+ assert(face < 6);
return GL_TEXTURE_CUBE_MAP_POSITIVE_X + face;
- else
+ }
+ else {
return target;
+ }
}