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

mesa/main: do not allow EXT_texture_shared_exponent enums before gles3

Browse source 
ctx->Extensions.EXT_texture_shared_exponent is set regardless of the
API that's used, so checking for those direcly will always allow the
enums from this extensions when they are supported by the driver.

We also need to make sure this is enabled on OpenGL ES 3. Because the
check is repeated, let's introduce a helper.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Erik Faye-Lund 2018-11-15 18:00:24 +01:00
parent 510b642460
commit 1b2e9aca77
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/main/context.h
View file

@ -367,6 +367,12 @@ _mesa_has_rg_textures(const struct gl_context *ctx)
return _mesa_has_ARB_texture_rg(ctx) || _mesa_is_gles3(ctx);
}
static inline bool
_mesa_has_texture_shared_exponent(const struct gl_context *ctx)
{
return _mesa_has_EXT_texture_shared_exponent(ctx) || _mesa_is_gles3(ctx);
}
/**
* Checks if the context supports geometry shaders.
*/

4
src/mesa/main/glformats.c
View file

@ -1966,7 +1966,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
return (ctx->API == API_OPENGLES2)
? GL_NO_ERROR : GL_INVALID_ENUM;
case GL_UNSIGNED_INT_5_9_9_9_REV:
return ctx->Extensions.EXT_texture_shared_exponent
return _mesa_has_texture_shared_exponent(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM;
case GL_UNSIGNED_INT_10F_11F_11F_REV:
return _mesa_has_packed_float(ctx)
@ -2589,7 +2589,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
}
}
if (ctx->Extensions.EXT_texture_shared_exponent) {
if (_mesa_has_texture_shared_exponent(ctx)) {
switch (internalFormat) {
case GL_RGB9_E5_EXT:
return GL_RGB;