From: Eduardo Lima Mitev <elima@igalia.com>
Date: Mon, 2 Feb 2015 17:14:47 +0000 (+0100)
Subject: mesa: Fix error validating args for TexSubImage3D
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2aa71e9485a5a062b1bd2dd8bdc081a8fa4c873d;p=mesa.git

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>
---

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