summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNanley Chery <[email protected]>2015-08-27 16:25:48 -0700
committerNanley Chery <[email protected]>2015-09-19 13:27:10 -0700
commitdb2777091d70c7abd28e0a8aac16b4a416e42e81 (patch)
tree0cc8523ce1045ae64dc716a25e395bf9a38fc531
parent29835fe19e0ca73a8017427498056ff7eb713cdd (diff)
mesa/texcompress: add compressed formats to base format utility function
Add S3TC and PALETTE formats. Reviewed-by: Anuj Phogat <[email protected]> Signed-off-by: Nanley Chery <[email protected]>
-rw-r--r--src/mesa/main/texcompress.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index e0294a88bfa..84973d3fe5d 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -100,6 +100,12 @@ _mesa_gl_compressed_format_base_format(GLenum format)
case GL_ETC1_RGB8_OES:
case GL_COMPRESSED_RGB8_ETC2:
case GL_COMPRESSED_SRGB8_ETC2:
+ case GL_RGB_S3TC:
+ case GL_RGB4_S3TC:
+ case GL_PALETTE4_RGB8_OES:
+ case GL_PALETTE4_R5_G6_B5_OES:
+ case GL_PALETTE8_RGB8_OES:
+ case GL_PALETTE8_R5_G6_B5_OES:
return GL_RGB;
case GL_COMPRESSED_RGBA:
@@ -117,6 +123,14 @@ _mesa_gl_compressed_format_base_format(GLenum format)
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+ case GL_RGBA_S3TC:
+ case GL_RGBA4_S3TC:
+ case GL_PALETTE4_RGBA8_OES:
+ case GL_PALETTE8_RGB5_A1_OES:
+ case GL_PALETTE4_RGBA4_OES:
+ case GL_PALETTE4_RGB5_A1_OES:
+ case GL_PALETTE8_RGBA8_OES:
+ case GL_PALETTE8_RGBA4_OES:
return GL_RGBA;
case GL_COMPRESSED_ALPHA: