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

teximage: return correct desktop GL error for compressedteximage

Browse source 
For GL4.6 the spec says to return GL_INVALID_OPERATION for this.

Cc: mesa-stable
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12032>
(cherry picked from commit 2138d1b9e6)
This commit is contained in:
Dave Airlie 2021-07-23 16:22:33 +10:00 • committed by Eric Engestrom
parent b40e683141
commit dc90d8cc14
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3298,7 +3298,7 @@
"description": "teximage: return correct desktop GL error for compressedteximage",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

2
src/mesa/main/teximage.c
View file

@ -2099,7 +2099,7 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
/* No compressed formats support borders at this time */
if (border != 0) {
reason = "border != 0";
error = GL_INVALID_VALUE;
error = _mesa_is_desktop_gl(ctx) ? GL_INVALID_OPERATION : GL_INVALID_VALUE;
goto error;
}