Mesa (master): mesa/main: Fix GetTextureImage error reporting

Iago Toral Quiroga itoral at kemper.freedesktop.org
Wed Sep 6 06:24:42 UTC 2017


Module: Mesa
Branch: master
Commit: 94f740e3fce0cb26e4d90cb9de75b5d971080606
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94f740e3fce0cb26e4d90cb9de75b5d971080606

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Tue Sep  5 13:06:37 2017 +0200

mesa/main: Fix GetTextureImage error reporting

GetTex*Image should return INVALID_ENUM if target is not valid, however,
GetTextureImage does not receive a target, and instead should return
INVALID_OPERATION if the effective target is not valid. From the
OpenGL 4.6 core profile spec, section 8.11 Texture Queries:

"An INVALID_OPERATION error is generated by GetTextureImage if the effective
 target is not one of TEXTURE_1D, TEXTURE_2D, TEXTURE_3D, TEXTURE_1D_ARRAY,
 TEXTURE_2D_ARRAY, TEXTURE_CUBE_MAP_ARRAY, TEXTURE_RECTANGLE, or
 TEXTURE_CUBE_MAP (for GetTextureImage only)."

Fixes:
KHR-GL45.direct_state_access.textures_image_query_errors

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

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

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 715bc249be..26cf3e5644 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -1430,7 +1430,7 @@ _mesa_GetTextureImage(GLuint texture, GLint level, GLenum format, GLenum type,
    }
 
    if (!legal_getteximage_target(ctx, texObj->Target, true)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "%s", caller);
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
       return;
    }
 




More information about the mesa-commit mailing list