diff options
author | Iago Toral Quiroga <itoral@igalia.com> | 2017-09-05 13:06:37 +0200 |
---|---|---|
committer | Iago Toral Quiroga <itoral@igalia.com> | 2017-09-06 08:19:53 +0200 |
commit | 94f740e3fce0cb26e4d90cb9de75b5d971080606 (patch) | |
tree | 159fee847100cfe77464b086d89003b606dbc31c | |
parent | c77ea0501c93bbf4d47b2256d629b4ffb6ae4c8a (diff) |
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@gmail.com>
-rw-r--r-- | src/mesa/main/texgetimage.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |