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

mesa/main: validate GL_UNSIGNED_INT_5_9_9_9_REV

Browse Source 
Shared exponent only works if we have EXT_texture_shared_exponent (which
is required by GL 3.0 support), or GLES 3.

While we're at it, drop the needless and conservative check for GL 2.0
(which incorrectly lets through GLES2 as well).

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29835>
This commit is contained in:
Erik Faye-Lund
2024-06-03 10:13:04 +02:00
committed by Marge Bot
parent 7035a74d93
commit 75cad45ab1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/glformats.c
+4 -3
View File
@@ -1747,6 +1747,9 @@ valid_texture_type_enum(const struct gl_context *ctx, GLenum type)
case GL_UNSIGNED_INT_10F_11F_11F_REV:
return _mesa_has_packed_float(ctx);
case GL_UNSIGNED_INT_5_9_9_9_REV:
return _mesa_has_texture_shared_exponent(ctx);
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
return _mesa_has_float_depth_buffer(ctx);
@@ -1971,8 +1974,6 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
return _mesa_has_EXT_texture_type_2_10_10_10_REV(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM;
case GL_UNSIGNED_INT_5_9_9_9_REV:
return _mesa_has_texture_shared_exponent(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM;
case GL_UNSIGNED_INT_10F_11F_11F_REV:
return GL_NO_ERROR;
default:
@@ -3212,7 +3213,7 @@ _mesa_gles_error_check_format_and_type(struct gl_context *ctx,
break;
case GL_UNSIGNED_INT_5_9_9_9_REV:
if (ctx->Version <= 20 || internalFormat != GL_RGB9_E5)
if (internalFormat != GL_RGB9_E5)
return GL_INVALID_OPERATION;
break;