Mesa (master): mesa/formats: Use the correct swizzle parameter for the 11-bit EAC formats

Jason Ekstrand jekstrand at kemper.freedesktop.org
Wed Aug 6 22:16:41 UTC 2014


Module: Mesa
Branch: master
Commit: bb89d82ac432771602b391a85cb05749e374edf5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb89d82ac432771602b391a85cb05749e374edf5

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug  6 10:27:58 2014 -0700

mesa/formats: Use the correct swizzle parameter for the 11-bit EAC formats

Red-only formats should be x001 and RG formats should be xy01.

Signed-off-by: Jason Ekstrand <jason.ekstrand at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

---

 src/mesa/main/formats.csv |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/formats.csv b/src/mesa/main/formats.csv
index 5abb706..f45e34b 100644
--- a/src/mesa/main/formats.csv
+++ b/src/mesa/main/formats.csv
@@ -274,9 +274,9 @@ MESA_FORMAT_ETC2_RGB8                     , etc2  , 4, 4, x64 ,     ,     ,
 MESA_FORMAT_ETC2_SRGB8                    , etc2  , 4, 4, x64 ,     ,     ,     , xyz1, srgb
 MESA_FORMAT_ETC2_RGBA8_EAC                , etc2  , 4, 4, x128,     ,     ,     , xyzw, rgb
 MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC         , etc2  , 4, 4, x128,     ,     ,     , xyzw, srgb
-MESA_FORMAT_ETC2_R11_EAC                  , etc2  , 4, 4, x64 ,     ,     ,     , xyzw, rgb
-MESA_FORMAT_ETC2_RG11_EAC                 , etc2  , 4, 4, x128,     ,     ,     , xyzw, rgb
-MESA_FORMAT_ETC2_SIGNED_R11_EAC           , etc2  , 4, 4, x64 ,     ,     ,     , xyzw, rgb
-MESA_FORMAT_ETC2_SIGNED_RG11_EAC          , etc2  , 4, 4, x128,     ,     ,     , xyzw, rgb
+MESA_FORMAT_ETC2_R11_EAC                  , etc2  , 4, 4, x64 ,     ,     ,     , x001, rgb
+MESA_FORMAT_ETC2_RG11_EAC                 , etc2  , 4, 4, x128,     ,     ,     , xy01, rgb
+MESA_FORMAT_ETC2_SIGNED_R11_EAC           , etc2  , 4, 4, x64 ,     ,     ,     , x001, rgb
+MESA_FORMAT_ETC2_SIGNED_RG11_EAC          , etc2  , 4, 4, x128,     ,     ,     , xy01, rgb
 MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1 , etc2  , 4, 4, x64 ,     ,     ,     , xyzw, rgb
 MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1, etc2  , 4, 4, x128,     ,     ,     , xyzw, srgb




More information about the mesa-commit mailing list