summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2018-02-01 11:12:47 -0800
committerEric Anholt <[email protected]>2018-02-02 16:27:49 -0800
commit1429cd74c2c03a311d92a60b66806db3d96d6b16 (patch)
treeffc9a9a2f23d19f27d744bf37ffe009b5bf4698b /src/mesa/main
parentbbef9474fa52d9aba06eeede52558fc5ccb762dd (diff)
mesa: Drop incorrect A4B4G4R4 _mesa_format_matches_format_and_type() cases.
swapBytes operates on bytes, not 4-bit channels, so you can't just take non-swapBytes cases and flip the REV flag. Avoids piglit texture-packed-formats regressions when enabling the ABGR4444 format. Fixes: c5a5c9a7db89 ("mesa/formats: add new mesa formats and their pack/unpack functions.") Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/formats.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index c1d8641116e..8d32757a879 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1568,15 +1568,9 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
if (format == GL_RGBA && type == GL_UNSIGNED_SHORT_4_4_4_4 && !swapBytes)
return GL_TRUE;
- if (format == GL_RGBA && type == GL_UNSIGNED_SHORT_4_4_4_4_REV && swapBytes)
- return GL_TRUE;
-
if (format == GL_ABGR_EXT && type == GL_UNSIGNED_SHORT_4_4_4_4_REV && !swapBytes)
return GL_TRUE;
- if (format == GL_ABGR_EXT && type == GL_UNSIGNED_SHORT_4_4_4_4 && swapBytes)
- return GL_TRUE;
-
return GL_FALSE;
case MESA_FORMAT_R4G4B4A4_UNORM: