From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Thu, 11 Feb 2016 20:10:52 +0000 (-0800)
Subject: mesa: Handle astc 3d formats in _mesa_base_tex_format()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dcfea1d7ebd849dc356e13ce73be1e1344201d23;p=mesa.git

mesa: Handle astc 3d formats in _mesa_base_tex_format()

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 6dcdefc3aaa..24ce7b04f6b 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -2388,8 +2388,10 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
             return base_compressed;
    }
 
-   if (ctx->Extensions.KHR_texture_compression_astc_ldr &&
-      _mesa_is_astc_format(internalFormat))
+   if ((ctx->Extensions.KHR_texture_compression_astc_ldr &&
+        is_astc_2d_format(internalFormat)) ||
+       (ctx->Extensions.OES_texture_compression_astc &&
+        is_astc_3d_format(internalFormat)))
         return GL_RGBA;
 
    if (ctx->Extensions.MESA_ycbcr_texture) {