Mesa (master): mesa: Drop incorrect A4B4G4R4 _mesa_format_matches_format_and_type() cases.
Eric Anholt
anholt at kemper.freedesktop.org
Sat Feb 3 00:51:02 UTC 2018
Module: Mesa
Branch: master
Commit: 1429cd74c2c03a311d92a60b66806db3d96d6b16
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1429cd74c2c03a311d92a60b66806db3d96d6b16
Author: Eric Anholt <eric at anholt.net>
Date: Thu Feb 1 11:12:47 2018 -0800
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 <marek.olsak at amd.com>
---
src/mesa/main/formats.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index c1d8641116..8d32757a87 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:
More information about the mesa-commit
mailing list