Module: Mesa Branch: master Commit: 36347c8d6f265fb9b8ebcd598b189d3b43d6b513 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=36347c8d6f265fb9b8ebcd598b189d3b43d6b513
Author: Ilia Mirkin <[email protected]> Date: Sat Sep 3 20:19:56 2016 -0400 main: GL_RGB10_A2UI does not come with GL 3.0/EXT_texture_integer Add a separate extension check for that format. Prevents glTexImage from trying to find a matching format, which fails on drivers without support for this format. Fixes: sized-texture-format-channels (on a3xx) Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> Cc: [email protected] --- src/mesa/main/glformats.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 0c2210a..85d00af 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -2518,7 +2518,6 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat) case GL_RGBA8I_EXT: case GL_RGBA16I_EXT: case GL_RGBA32I_EXT: - case GL_RGB10_A2UI: return GL_RGBA; case GL_RGB8UI_EXT: case GL_RGB16UI_EXT: @@ -2530,6 +2529,13 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat) } } + if (ctx->Extensions.ARB_texture_rgb10_a2ui) { + switch (internalFormat) { + case GL_RGB10_A2UI: + return GL_RGBA; + } + } + if (ctx->Extensions.EXT_texture_integer) { switch (internalFormat) { case GL_ALPHA8UI_EXT: _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
