Mesa (10.4): mesa: cherry-pick the second half of commit 2aa71e9485a

Emil Velikov evelikov at kemper.freedesktop.org
Fri Mar 6 19:42:34 UTC 2015


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

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Fri Mar  6 18:52:38 2015 +0000

mesa: cherry-pick the second half of commit 2aa71e9485a

Missed out by commit 39ae85732d2(mesa: Fix error validating args for
TexSubImage3D)

Reported-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 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 3c494be..a85bb94 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2498,7 +2498,7 @@ texsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
 
    if (error_check_subtexture_dimensions(ctx, "glTexSubImage", dimensions,
                                          texImage, xoffset, yoffset, zoffset,
-                                         width, height, 1)) {
+                                         width, height, depth)) {
       return GL_TRUE;
    }
 




More information about the mesa-commit mailing list