summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEduardo Lima Mitev <elima@igalia.com>2015-02-02 18:14:47 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2015-02-24 12:38:40 +0000
commit04dc301669693e8b34a98d759f3c7378a6c43cc7 (patch)
tree4add6213e466d35ef3556b438fb8d64b0c89d3a5 /src
parent4952a376972bcb29be0c15a33d1d5fc23f35cae5 (diff)
mesa: Fix error validating args for TexSubImage3D
The zoffset and depth values were not being considered when calling error_check_subtexture_dimensions(). Fixes 2 dEQP tests: * dEQP-GLES3.functional.negative_api.texture.texsubimage3d_neg_offset * dEQP-GLES3.functional.negative_api.texture.texsubimage3d_invalid_offset Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Cc: "10.4 10.5" <mesa-stable@lists.freedestkop.org> (cherry picked from commit 2aa71e9485a5a062b1bd2dd8bdc081a8fa4c873d)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/teximage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 29c325bf222..c9c48bb9362 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2491,8 +2491,8 @@ texsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
}
if (error_check_subtexture_dimensions(ctx, dimensions,
- texImage, xoffset, yoffset, 0,
- width, height, 1,
+ texImage, xoffset, yoffset, zoffset,
+ width, height, depth,
dsa ? "glTextureSubImage" :
"glTexSubImage")) {
return GL_TRUE;