From: Nanley Chery Date: Wed, 26 Aug 2015 19:01:38 +0000 (-0700) Subject: mesa/texcompress: correct mapping of S3TC formats in conversion function X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=01024ded1e791b33353ffa09d4e3dfb5b638179d;p=mesa.git mesa/texcompress: correct mapping of S3TC formats in conversion function MESA_FORMAT_RGBA_DXT5 should actually be reserved for GL_RGBA[4]_DXT5_S3TC. Also, Gallium and other dri drivers (radeon and nouveau) follow this mapping scheme. Reviewed-by: Chad Versace Signed-off-by: Nanley Chery --- diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index bb94137a940..394c8bab214 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -400,15 +400,15 @@ _mesa_glenum_to_compressed_format(GLenum format) case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_RGB_S3TC: + case GL_RGB4_S3TC: return MESA_FORMAT_RGB_DXT1; case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: - case GL_RGB4_S3TC: return MESA_FORMAT_RGBA_DXT1; case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: case GL_RGBA_S3TC: + case GL_RGBA4_S3TC: return MESA_FORMAT_RGBA_DXT3; case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - case GL_RGBA4_S3TC: return MESA_FORMAT_RGBA_DXT5; case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: