From: Jordan Justen Date: Fri, 28 Dec 2012 19:37:23 +0000 (-0800) Subject: glformats: allow GL_RGB+GL_UNSIGNED_INT_2_10_10_10_REV for GLES2/3 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=80784066cca39ddd79420c32de7770317d56cdf8;p=mesa.git glformats: allow GL_RGB+GL_UNSIGNED_INT_2_10_10_10_REV for GLES2/3 This format is allowed by the GL_EXT_texture_type_2_10_10_10_REV extension. Signed-off-by: Jordan Justen Reviewed-by: Ian Romanick --- diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 678ba95b5b7..85fe43d73d3 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -1289,6 +1289,10 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx, ctx->Extensions.ARB_texture_rgb10_a2ui) { break; /* OK */ } + if (type == GL_UNSIGNED_INT_2_10_10_10_REV && format == GL_RGB && + ctx->API == API_OPENGLES2) { + break; /* OK by GL_EXT_texture_type_2_10_10_10_REV */ + } return GL_INVALID_OPERATION; case GL_UNSIGNED_INT_24_8: @@ -1402,6 +1406,10 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx, case GL_UNSIGNED_SHORT_5_6_5: case GL_UNSIGNED_SHORT_5_6_5_REV: return GL_NO_ERROR; + case GL_UNSIGNED_INT_2_10_10_10_REV: + /* OK by GL_EXT_texture_type_2_10_10_10_REV */ + return (ctx->API == API_OPENGLES2) + ? GL_NO_ERROR : GL_INVALID_ENUM; case GL_HALF_FLOAT: return ctx->Extensions.ARB_half_float_pixel ? GL_NO_ERROR : GL_INVALID_ENUM;