summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNanley Chery <[email protected]>2015-04-28 15:10:11 -0700
committerNanley Chery <[email protected]>2015-08-26 14:36:43 -0700
commitcd49b97a8a2c0dd8dc1d7f32b86f519e936571fd (patch)
tree1de9f9d455ccf9b8617f8675491cace34300a5b9
parent12b519b4571d27a45abd3266f35b126d00dcb926 (diff)
mesa/teximage: return the base internal format of the ASTC formats
This is necesary to initialize the gl_texture_image struct. From the KHR_texture_compression_astc_ldr spec: "Added to Section 3.8.6, Compressed Texture Images Add the tokens specified above to Table 3.16, Compressed Internal Formats. In all cases, the base internal format will be RGBA. The encoding allows images to be encoded with fewer channels, but this is always presented as RGBA to the sampler." v2. use _mesa_is_astc_format(). Reviewed-by: Anuj Phogat <[email protected]> Signed-off-by: Nanley Chery <[email protected]>
-rw-r--r--src/mesa/main/teximage.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 56ae4150a6f..0535db35f26 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -565,6 +565,10 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
}
}
+ if (ctx->Extensions.KHR_texture_compression_astc_ldr &&
+ _mesa_is_astc_format(internalFormat))
+ return GL_RGBA;
+
if (_mesa_is_gles3(ctx) || ctx->Extensions.ARB_ES3_compatibility) {
switch (internalFormat) {
case GL_COMPRESSED_RGB8_ETC2: