[Mesa-dev] [PATCH] main: GL_RGB10_A2UI does not come with GL 3.0/EXT_texture_integer

[Nicolai Hähnle]

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

On 04.09.2016 02:24, Ilia Mirkin wrote:
> 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 <imirkin at alum.mit.edu>
> Cc: mesa-stable at lists.freedesktop.org
> ---
>
> Technically we should be exposing it on a3xx, as it's required by ES 3.0.
> However I've thus far failed to do so in a way that actually works for all
> the necessary use-cases.
>
>  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:
>