From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sun, 4 Sep 2016 00:19:56 +0000 (-0400)
Subject: main: GL_RGB10_A2UI does not come with GL 3.0/EXT_texture_integer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=36347c8d6f265fb9b8ebcd598b189d3b43d6b513;p=mesa.git

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 <imirkin@alum.mit.edu>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Cc: mesa-stable@lists.freedesktop.org
---

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 0c2210a42d9..85d00af487f 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: