Mesa (master): mesa: Fix error validating args for TexSubImage3D

Iago Toral Quiroga itoral at kemper.freedesktop.org
Tue Feb 24 08:01:17 UTC 2015


Module: Mesa
Branch: master
Commit: 2aa71e9485a5a062b1bd2dd8bdc081a8fa4c873d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2aa71e9485a5a062b1bd2dd8bdc081a8fa4c873d

Author: Eduardo Lima Mitev <elima at igalia.com>
Date:   Mon Feb  2 18:14:47 2015 +0100

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 at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.4 10.5" <mesa-stable at lists.freedestkop.org>

---

 src/mesa/main/teximage.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index f73edc3..c65d6ab 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;




More information about the mesa-commit mailing list