diff options
| author | Nanley Chery <nanley.g.chery@intel.com> | 2015-08-26 12:01:38 -0700 |
|---|---|---|
| committer | Nanley Chery <nanley.g.chery@intel.com> | 2015-08-31 15:03:08 -0700 |
| commit | 01024ded1e791b33353ffa09d4e3dfb5b638179d (patch) | |
| tree | 8f78a9ada948aedea6c1f85888e16ec668598898 /src/mesa/main/texcompress.c | |
| parent | 3063913f77cd2db1a263cb824a5c8c3dcc1a51a0 (diff) | |
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 <chad.versace@intel.com>
Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Diffstat (limited to 'src/mesa/main/texcompress.c')
| -rw-r--r-- | src/mesa/main/texcompress.c | 4 |
1 files changed, 2 insertions, 2 deletions
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: |