[Mesa-dev] [PATCH 1/3] gettextsubimage: verify zoffset and depth are correct
Juan A. Suarez Romero
jasuarez at igalia.com
Wed Apr 11 17:51:52 UTC 2018
According to OpenGL 4.6 spec, section 8.11.4 ("Texture Image Queries"),
relative to errors for GetTextureSubImage() function:
"An INVALID_VALUE error is generated if the effective target is
TEXTURE_1D and either yoffset is not zero, or height is not one.
An INVALID_VALUE error is generated if the effective target is
TEXTURE_1D, TEXTURE_1D_ARRAY, TEXTURE_2D or TEXTURE_RECTANGLE, and
either zoffset is not zero, or depth is not one."
The commit fixes the check for height and depth.
This fixes arb_get_texture_sub_image piglit tests.
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>
---
src/mesa/main/texgetimage.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index c61842e39ad..fbdbcd90a7d 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -953,7 +953,7 @@ dimensions_error_check(struct gl_context *ctx,
"%s(1D, yoffset = %d)", caller, yoffset);
return true;
}
- if (height > 1) {
+ if (height != 1) {
_mesa_error(ctx, GL_INVALID_VALUE,
"%s(1D, height = %d)", caller, height);
return true;
@@ -967,7 +967,7 @@ dimensions_error_check(struct gl_context *ctx,
"%s(zoffset = %d)", caller, zoffset);
return true;
}
- if (depth > 1) {
+ if (depth != 1) {
_mesa_error(ctx, GL_INVALID_VALUE,
"%s(depth = %d)", caller, depth);
return true;
--
2.14.3
More information about the mesa-dev
mailing list