fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 16:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa/main: do not allow EXT_packed_float enums before gles3

Browse source 
EXT_packed_float isn't supported on OpenGL ES, we shouldn't allow
these enums there, before OpenGL ES 3.0 which also introduce support
for these enums.

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 17:19:44 +01:00
parent 83db9d3e3a
commit 59690bf0a3
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -355,6 +355,12 @@ _mesa_has_float_depth_buffer(const struct gl_context *ctx)
return _mesa_has_ARB_depth_buffer_float(ctx) || _mesa_is_gles3(ctx);
}
static inline bool
_mesa_has_packed_float(const struct gl_context *ctx)
{
return _mesa_has_EXT_packed_float(ctx) || _mesa_is_gles3(ctx);
}
/**
* Checks if the context supports geometry shaders.
*/

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

@ -1858,7 +1858,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
return GL_NO_ERROR;
case GL_UNSIGNED_INT_10F_11F_11F_REV:
if (!ctx->Extensions.EXT_packed_float) {
if (!_mesa_has_packed_float(ctx)) {
return GL_INVALID_ENUM;
}
if (format != GL_RGB) {
@ -1969,7 +1969,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
return ctx->Extensions.EXT_texture_shared_exponent
? GL_NO_ERROR : GL_INVALID_ENUM;
case GL_UNSIGNED_INT_10F_11F_11F_REV:
return ctx->Extensions.EXT_packed_float
return _mesa_has_packed_float(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM;
default:
return GL_INVALID_ENUM;
@ -2598,7 +2598,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
}
}
if (ctx->Extensions.EXT_packed_float) {
if (_mesa_has_packed_float(ctx)) {
switch (internalFormat) {
case GL_R11F_G11F_B10F_EXT:
return GL_RGB;