summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorAnuj Phogat <[email protected]>2016-02-11 12:10:52 -0800
committerAnuj Phogat <[email protected]>2016-05-03 03:43:18 -0700
commitdcfea1d7ebd849dc356e13ce73be1e1344201d23 (patch)
tree8f9e03df709ca1ad4be2d7ad6e346ad15ea24deb /src/mesa/main
parentcf85ef1618f5d05a1f4017aec6a9fa81cc935e79 (diff)
mesa: Handle astc 3d formats in _mesa_base_tex_format()
Signed-off-by: Anuj Phogat <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/glformats.c6
1 files changed, 4 insertions, 2 deletions
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) {