AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getteximage: Return correct error value when texure object is not found

Browse Source 
glGetTextureSubImage() and glGetCompressedTextureSubImage() are currently
returning INVALID_OPERATION error when the passed texture argument does not
correspond to an existing texture object. However, the error should be
INVALID_VALUE instead. From OpenGL 4.5 spec PDF, section '8.11. Texture
Queries', page 236:

    "An INVALID_VALUE error is generated if texture is not the name of
     an existing texture object."

Same wording applies to the compressed version.

The INVALID_OPERATION error is coming from the call to
_mesa_lookup_texture_err(). This patch uses _mesa_lookup_texture() instead
and emits the correct error in the caller.

Fixes: GL45-CTS.get_texture_sub_image.errors_test

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Eduardo Lima Mitev
2017-02-15 12:14:40 +01:00
parent a9a517f530
commit 633c959fae
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/texgetimage.c
+4 -2
View File
@@ -1459,9 +1459,10 @@ _mesa_GetTextureSubImage(GLuint texture, GLint level,
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
static const char *caller = "glGetTextureSubImage"; static const char *caller = "glGetTextureSubImage";
struct gl_texture_object *texObj = struct gl_texture_object *texObj =
_mesa_lookup_texture_err(ctx, texture, caller); _mesa_lookup_texture(ctx, texture);
if (!texObj) { if (!texObj) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(texture)", caller);
return; return;
} }
@@ -1775,8 +1776,9 @@ _mesa_GetCompressedTextureSubImage(GLuint texture, GLint level,
static const char *caller = "glGetCompressedTextureImage"; static const char *caller = "glGetCompressedTextureImage";
struct gl_texture_object *texObj; struct gl_texture_object *texObj;
texObj = _mesa_lookup_texture_err(ctx, texture, caller); texObj = _mesa_lookup_texture(ctx, texture);
if (!texObj) { if (!texObj) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(texture)", caller);
return; return;
} }