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

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: 39ae85732d29906ea2a16dfdfc77f8e5dbed5853
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=39ae85732d29906ea2a16dfdfc77f8e5dbed5853

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>
(cherry picked from commit 2aa71e9485a5a062b1bd2dd8bdc081a8fa4c873d)
[Emil Velikov: Resolve trivial conflicts]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Conflicts:
	src/mesa/main/teximage.c

---

 src/mesa/main/teximage.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 7766904..3c494be 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2497,7 +2497,7 @@ texsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
    }
 
    if (error_check_subtexture_dimensions(ctx, "glTexSubImage", dimensions,
-                                         texImage, xoffset, yoffset, 0,
+                                         texImage, xoffset, yoffset, zoffset,
                                          width, height, 1)) {
       return GL_TRUE;
    }