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

mesa/main: do not allow ARB_texture_rgb10_a2ui enums before gles3

Browse Source 
ARB_texture_rgb10_a2ui isn't supported on OpenGL ES, we shouldn't expose
it there even if the driver supports it.

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 16:40:31 +01:00
parent 76b038bee7
commit b5a370dc25
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/context.h
+6
View File
@@ -343,6 +343,12 @@ _mesa_has_integer_textures(const struct gl_context *ctx)
return _mesa_has_EXT_texture_integer(ctx) || _mesa_is_gles3(ctx); return _mesa_has_EXT_texture_integer(ctx) || _mesa_is_gles3(ctx);
} }
static inline bool
_mesa_has_texture_rgb10_a2ui(const struct gl_context *ctx)
{
return _mesa_has_ARB_texture_rgb10_a2ui(ctx) || _mesa_is_gles3(ctx);
}
/** /**
* Checks if the context supports geometry shaders. * Checks if the context supports geometry shaders.
*/ */
src/mesa/main/glformats.c
+6 -6
View File
@@ -1800,7 +1800,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
break; /* OK */ break; /* OK */
} }
if (format == GL_RGB_INTEGER_EXT && if (format == GL_RGB_INTEGER_EXT &&
ctx->Extensions.ARB_texture_rgb10_a2ui) { _mesa_has_texture_rgb10_a2ui(ctx)) {
break; /* OK */ break; /* OK */
} }
return GL_INVALID_OPERATION; return GL_INVALID_OPERATION;
@@ -1815,7 +1815,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
break; /* OK */ break; /* OK */
} }
if ((format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT) && if ((format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT) &&
ctx->Extensions.ARB_texture_rgb10_a2ui) { _mesa_has_texture_rgb10_a2ui(ctx)) {
break; /* OK */ break; /* OK */
} }
return GL_INVALID_OPERATION; return GL_INVALID_OPERATION;
@@ -1829,7 +1829,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
break; /* OK */ break; /* OK */
} }
if ((format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT) && if ((format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT) &&
ctx->Extensions.ARB_texture_rgb10_a2ui) { _mesa_has_texture_rgb10_a2ui(ctx)) {
break; /* OK */ break; /* OK */
} }
if (type == GL_UNSIGNED_INT_2_10_10_10_REV && format == GL_RGB && if (type == GL_UNSIGNED_INT_2_10_10_10_REV && format == GL_RGB &&
@@ -2087,7 +2087,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
case GL_UNSIGNED_BYTE_2_3_3_REV: case GL_UNSIGNED_BYTE_2_3_3_REV:
case GL_UNSIGNED_SHORT_5_6_5: case GL_UNSIGNED_SHORT_5_6_5:
case GL_UNSIGNED_SHORT_5_6_5_REV: case GL_UNSIGNED_SHORT_5_6_5_REV:
return ctx->Extensions.ARB_texture_rgb10_a2ui return _mesa_has_texture_rgb10_a2ui(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM; ? GL_NO_ERROR : GL_INVALID_ENUM;
default: default:
return GL_INVALID_ENUM; return GL_INVALID_ENUM;
@@ -2127,7 +2127,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
case GL_UNSIGNED_INT_8_8_8_8_REV: case GL_UNSIGNED_INT_8_8_8_8_REV:
case GL_UNSIGNED_INT_10_10_10_2: case GL_UNSIGNED_INT_10_10_10_2:
case GL_UNSIGNED_INT_2_10_10_10_REV: case GL_UNSIGNED_INT_2_10_10_10_REV:
return ctx->Extensions.ARB_texture_rgb10_a2ui return _mesa_has_texture_rgb10_a2ui(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM; ? GL_NO_ERROR : GL_INVALID_ENUM;
default: default:
return GL_INVALID_ENUM; return GL_INVALID_ENUM;
@@ -2501,7 +2501,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
} }
} }
if (ctx->Extensions.ARB_texture_rgb10_a2ui) { if (_mesa_has_texture_rgb10_a2ui(ctx)) {
switch (internalFormat) { switch (internalFormat) {
case GL_RGB10_A2UI: case GL_RGB10_A2UI:
return GL_RGBA; return GL_RGBA;