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

mesa/main: do not allow floating-point texture enums on gles1 

ctx->Extensions.OES_texture_float 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.

There's no extension enabling floating-point textures for OpenGL
ES 1.x, so we shouldn't allow those enums there.

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-16 11:07:01 +01:00
parent 167dcd59ae
commit 52dc8b4f7b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesa/main/glformats.c
View File

@ -2895,7 +2895,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
return GL_INVALID_OPERATION;
break;
case GL_RGBA:
if (ctx->Extensions.OES_texture_float && internalFormat == format)
if (_mesa_has_OES_texture_float(ctx) && internalFormat == format)
break;
default:
return GL_INVALID_OPERATION;
@ -2903,7 +2903,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
break;
case GL_HALF_FLOAT_OES:
if (ctx->Extensions.OES_texture_half_float && internalFormat == format)
if (_mesa_has_OES_texture_half_float(ctx) && internalFormat == format)
break;
default:
return GL_INVALID_OPERATION;
@ -3030,7 +3030,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
return GL_INVALID_OPERATION;
break;
case GL_RGB:
if (ctx->Extensions.OES_texture_float && internalFormat == format)
if (_mesa_has_OES_texture_float(ctx) && internalFormat == format)
break;
default:
return GL_INVALID_OPERATION;
@ -3038,7 +3038,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
break;
case GL_HALF_FLOAT_OES:
if (!ctx->Extensions.OES_texture_half_float || internalFormat != format)
if (!_mesa_has_OES_texture_half_float(ctx) || internalFormat != format)
return GL_INVALID_OPERATION;
break;
@ -3138,7 +3138,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
break;
case GL_RG:
if (_mesa_has_rg_textures(ctx) &&
ctx->Extensions.OES_texture_half_float)
_mesa_has_OES_texture_half_float(ctx))
break;
/* fallthrough */
default:
@ -3153,7 +3153,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
break;
case GL_RG:
if (_mesa_has_rg_textures(ctx) &&
ctx->Extensions.OES_texture_float)
_mesa_has_OES_texture_float(ctx))
break;
/* fallthrough */
default:
@ -3242,7 +3242,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
case GL_RG:
case GL_RED:
if (_mesa_has_rg_textures(ctx) &&
ctx->Extensions.OES_texture_half_float)
_mesa_has_OES_texture_half_float(ctx))
break;
/* fallthrough */
default:
@ -3257,7 +3257,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
break;
case GL_RED:
if (_mesa_has_rg_textures(ctx) &&
ctx->Extensions.OES_texture_float)
_mesa_has_OES_texture_float(ctx))
break;
/* fallthrough */
default:
@ -3369,11 +3369,11 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
case GL_LUMINANCE_ALPHA:
switch (type) {
case GL_FLOAT:
if (!ctx->Extensions.OES_texture_float || internalFormat != format)
if (!_mesa_has_OES_texture_float(ctx) || internalFormat != format)
return GL_INVALID_OPERATION;
break;
case GL_HALF_FLOAT_OES:
if (!ctx->Extensions.OES_texture_half_float || internalFormat != format)
if (!_mesa_has_OES_texture_half_float(ctx) || internalFormat != format)
return GL_INVALID_OPERATION;
break;
case GL_UNSIGNED_BYTE: