fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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.

But turns out this is a spec bug, and Khronos is fixing it for the next
revisions.

The proposal is to return INVALID_OPERATION in these cases.

This reverts commit 633c959fae.

v2:
- Use _mesa_lookup_texture_err (Samuel Pitoiset)

v3:
- _mesa_lookup_texture_err() already handles texture > 0 (Samuel
Pitoiset)
- Just revert 633c959fae (Juan A. Suarez)

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
This commit is contained in:
Juan A. Suarez Romero 2017-06-22 18:16:16 +02:00
parent c87f73724e
commit 87a2d3963a
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/main/texgetimage.c
View file

@ -1458,13 +1458,10 @@ _mesa_GetTextureSubImage(GLuint texture, GLint level,
{
GET_CURRENT_CONTEXT(ctx);
static const char *caller = "glGetTextureSubImage";
struct gl_texture_object *texObj = NULL;
if (texture > 0)
texObj = _mesa_lookup_texture(ctx, texture);
struct gl_texture_object *texObj =
_mesa_lookup_texture_err(ctx, texture, caller);
if (!texObj) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(texture)", caller);
return;
}
@ -1778,11 +1775,8 @@ _mesa_GetCompressedTextureSubImage(GLuint texture, GLint level,
static const char *caller = "glGetCompressedTextureImage";
struct gl_texture_object *texObj = NULL;
if (texture > 0)
texObj = _mesa_lookup_texture(ctx, texture);
texObj = _mesa_lookup_texture_err(ctx, texture, caller);
if (!texObj) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(texture)", caller);
return;
}