commit 3654d60162e55c9597c5582cad3ef9834a8c5c32
author Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Mar 03 11:30:36 2015 -0700
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:33:24 2015 +0800
tree 4eb51d28781579aa1ce930e51d9f41cb4551a8e1
parent 18248e603e1748a5a734f9dd31f56a5aa9597ca1

xgl: Add missing formats and remove channel mapping

Alpha header version: r29599

Changed formats:
XGL_FMT_BC1_UNORM => XGL_FMT_BC1_RGB_UNORM
XGL_FMT_BC1_SRGB => XGL_FMT_BC1_RGB_SRGB
XGL_FMT_ASTC_4x5_UNORM => XGL_FMT_ASTC_5x4_UNORM
XGL_FMT_ASTC_4x5_SRGB => XGL_FMT_ASTC_5x4_SRGB

New formats:
XGL_FMT_BC1_RGBA_UNORM
XGL_FMT_BC1_RGBA_SRGB
XGL_FMT_ETC2_R8G8B8_SRGB
XGL_FMT_ETC2_R8G8B8A1_SRGB
XGL_FMT_ETC2_R8G8B8A8_SRGB
XGL_FMT_B4G4R4A4_UNORM
XGL_FMT_B5G5R5A1_UNORM

None of the new formats are currently supported in the sample driver.

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 2f74af5..3ba6b5e 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -398,8 +398,10 @@
         [XGL_FMT_D16_UNORM_S8_UINT]    = { 3,  2 },
         [XGL_FMT_D24_UNORM_S8_UINT]    = { 4,  2 },
         [XGL_FMT_D32_SFLOAT_S8_UINT]   = { 4,  2 },
-        [XGL_FMT_BC1_UNORM]            = { 8,  4 },
-        [XGL_FMT_BC1_SRGB]             = { 8,  4 },
+        [XGL_FMT_BC1_RGB_UNORM]        = { 8,  4 },
+        [XGL_FMT_BC1_RGB_SRGB]         = { 8,  4 },
+        [XGL_FMT_BC1_RGBA_UNORM]       = { 8,  4 },
+        [XGL_FMT_BC1_RGBA_SRGB]        = { 8,  4 },
         [XGL_FMT_BC2_UNORM]            = { 16, 4 },
         [XGL_FMT_BC2_SRGB]             = { 16, 4 },
         [XGL_FMT_BC3_UNORM]            = { 16, 4 },
@@ -414,16 +416,19 @@
         [XGL_FMT_BC7_SRGB]             = { 16, 4 },
         // TODO: Initialize remaining compressed formats.
         [XGL_FMT_ETC2_R8G8B8_UNORM]    = { 0, 0 },
+        [XGL_FMT_ETC2_R8G8B8_SRGB]     = { 0, 0 },
         [XGL_FMT_ETC2_R8G8B8A1_UNORM]  = { 0, 0 },
+        [XGL_FMT_ETC2_R8G8B8A1_SRGB]   = { 0, 0 },
         [XGL_FMT_ETC2_R8G8B8A8_UNORM]  = { 0, 0 },
+        [XGL_FMT_ETC2_R8G8B8A8_SRGB]   = { 0, 0 },
         [XGL_FMT_EAC_R11_UNORM]        = { 0, 0 },
         [XGL_FMT_EAC_R11_SNORM]        = { 0, 0 },
         [XGL_FMT_EAC_R11G11_UNORM]     = { 0, 0 },
         [XGL_FMT_EAC_R11G11_SNORM]     = { 0, 0 },
         [XGL_FMT_ASTC_4x4_UNORM]       = { 0, 0 },
         [XGL_FMT_ASTC_4x4_SRGB]        = { 0, 0 },
-        [XGL_FMT_ASTC_4x5_UNORM]       = { 0, 0 },
-        [XGL_FMT_ASTC_4x5_SRGB]        = { 0, 0 },
+        [XGL_FMT_ASTC_5x4_UNORM]       = { 0, 0 },
+        [XGL_FMT_ASTC_5x4_SRGB]        = { 0, 0 },
         [XGL_FMT_ASTC_5x5_UNORM]       = { 0, 0 },
         [XGL_FMT_ASTC_5x5_SRGB]        = { 0, 0 },
         [XGL_FMT_ASTC_6x5_UNORM]       = { 0, 0 },
@@ -448,6 +453,8 @@
         [XGL_FMT_ASTC_12x10_SRGB]      = { 0, 0 },
         [XGL_FMT_ASTC_12x12_UNORM]     = { 0, 0 },
         [XGL_FMT_ASTC_12x12_SRGB]      = { 0, 0 },
+        [XGL_FMT_B4G4R4A4_UNORM]       = { 2, 4 },
+        [XGL_FMT_B5G5R5A1_UNORM]       = { 2, 4 },
         [XGL_FMT_B5G6R5_UNORM]         = { 2, 3 },
         [XGL_FMT_B5G6R5_USCALED]       = { 2, 3 },
         [XGL_FMT_B8G8R8_UNORM]         = { 3, 3 },
@@ -1227,7 +1234,7 @@
              it->format <= XGL_FMT_R32G32B32_SFLOAT) ||
             (it->format >= XGL_FMT_B8G8R8_UNORM &&
              it->format <= XGL_FMT_B8G8R8_SRGB) ||
-            (it->format >= XGL_FMT_BC1_UNORM &&
+            (it->format >= XGL_FMT_BC1_RGB_UNORM &&
              it->format <= XGL_FMT_ASTC_12x12_SRGB) ||
             (it->format >= XGL_FMT_D16_UNORM &&
              it->format <= XGL_FMT_D32_SFLOAT_S8_UINT) ||