fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 10:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Fix error validating args for TexSubImage3D

Browse source 
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 2aa71e9485)
[Emil Velikov: Resolve trivial conflicts]
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

Conflicts:
	src/mesa/main/teximage.c
This commit is contained in:
Eduardo Lima Mitev 2015-02-02 18:14:47 +01:00 • committed by Emil Velikov
parent 61c1aabb9f
commit 39ae85732d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/main/teximage.c
View file

@ -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;
}