From dded9540172f001e257587afa08d8ce8b049a5d3 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Tue, 10 Nov 2015 17:01:22 +0800
Subject: bug 12998 part 7: drop unwanted USCALED formats

---
 demos/vulkaninfo.c        | 5 -----
 icd/common/icd-format.c   | 9 ---------
 include/vulkan/vulkan.h   | 5 -----
 layers/vk_layer_utils.cpp | 5 -----
 4 files changed, 24 deletions(-)

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index d49853a3..d2277edc 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -171,16 +171,11 @@ static const char *vk_format_string(VkFormat fmt)
 #define STR(r) case VK_FORMAT_ ##r: return #r
     STR(UNDEFINED);
     STR(R4G4_UNORM_PACK8);
-    STR(R4G4_USCALED);
     STR(R4G4B4A4_UNORM_PACK16);
-    STR(R4G4B4A4_USCALED);
     STR(B4G4R4A4_UNORM_PACK16);
     STR(R5G6B5_UNORM_PACK16);
-    STR(R5G6B5_USCALED);
     STR(B5G6R5_UNORM_PACK16);
-    STR(B5G6R5_USCALED);
     STR(R5G5B5A1_UNORM_PACK16);
-    STR(R5G5B5A1_USCALED);
     STR(B5G5R5A1_UNORM_PACK16);
     STR(R8_UNORM);
     STR(R8_SNORM);
diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c
index 210ad62b..73f3c186 100644
--- a/icd/common/icd-format.c
+++ b/icd/common/icd-format.c
@@ -37,16 +37,11 @@ static const struct icd_format_info {
 } icd_format_table[VK_FORMAT_RANGE_SIZE] = {
     [VK_FORMAT_UNDEFINED]            = { 0,  0 },
     [VK_FORMAT_R4G4_UNORM_PACK8]           = { 1,  2 },
-    [VK_FORMAT_R4G4_USCALED]         = { 1,  2 },
     [VK_FORMAT_R4G4B4A4_UNORM_PACK16]       = { 2,  4 },
-    [VK_FORMAT_R4G4B4A4_USCALED]     = { 2,  4 },
     [VK_FORMAT_B4G4R4A4_UNORM_PACK16]       = { 2,  4 },
     [VK_FORMAT_R5G6B5_UNORM_PACK16]         = { 2,  3 },
-    [VK_FORMAT_R5G6B5_USCALED]       = { 2,  3 },
     [VK_FORMAT_B5G6R5_UNORM_PACK16]         = { 2, 3 },
-    [VK_FORMAT_B5G6R5_USCALED]       = { 2, 3 },
     [VK_FORMAT_R5G5B5A1_UNORM_PACK16]       = { 2,  4 },
-    [VK_FORMAT_R5G5B5A1_USCALED]     = { 2,  4 },
     [VK_FORMAT_B5G5R5A1_UNORM_PACK16]       = { 2,  4 },
     [VK_FORMAT_R8_UNORM]             = { 1,  1 },
     [VK_FORMAT_R8_SNORM]             = { 1,  1 },
@@ -497,19 +492,16 @@ void icd_format_get_raw_value(VkFormat format,
     case VK_FORMAT_UNDEFINED:
         break;
     case VK_FORMAT_R4G4_UNORM_PACK8:
-    case VK_FORMAT_R4G4_USCALED:
         ((uint8_t *) value)[0]  = (color[0] & 0xf) << 0   |
                                   (color[1] & 0xf) << 4;
         break;
     case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
-    case VK_FORMAT_R4G4B4A4_USCALED:
         ((uint16_t *) value)[0] = (color[0] & 0xf) << 0   |
                                   (color[1] & 0xf) << 4   |
                                   (color[2] & 0xf) << 8   |
                                   (color[3] & 0xf) << 12;
         break;
     case VK_FORMAT_R5G6B5_UNORM_PACK16:
-    case VK_FORMAT_R5G6B5_USCALED:
         ((uint16_t *) value)[0] = (color[0] & 0x1f) << 0  |
                                   (color[1] & 0x3f) << 5  |
                                   (color[2] & 0x1f) << 11;
@@ -520,7 +512,6 @@ void icd_format_get_raw_value(VkFormat format,
                                   (color[0] & 0x1f) << 11;
         break;
     case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
-    case VK_FORMAT_R5G5B5A1_USCALED:
         ((uint16_t *) value)[0] = (color[0] & 0x1f) << 0  |
                                   (color[1] & 0x1f) << 5  |
                                   (color[2] & 0x1f) << 10 |
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index b4e2a3b1..048d83c1 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -209,16 +209,11 @@ typedef enum VkInternalAllocationType {
 typedef enum VkFormat {
     VK_FORMAT_UNDEFINED,
     VK_FORMAT_R4G4_UNORM_PACK8,
-    VK_FORMAT_R4G4_USCALED,
     VK_FORMAT_R4G4B4A4_UNORM_PACK16,
-    VK_FORMAT_R4G4B4A4_USCALED,
     VK_FORMAT_B4G4R4A4_UNORM_PACK16,
     VK_FORMAT_R5G6B5_UNORM_PACK16,
-    VK_FORMAT_R5G6B5_USCALED,
     VK_FORMAT_B5G6R5_UNORM_PACK16,
-    VK_FORMAT_B5G6R5_USCALED,
     VK_FORMAT_R5G5B5A1_UNORM_PACK16,
-    VK_FORMAT_R5G5B5A1_USCALED,
     VK_FORMAT_B5G5R5A1_UNORM_PACK16,
     VK_FORMAT_R8_UNORM,
     VK_FORMAT_R8_SNORM,
diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index f105988d..33226a1f 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -39,16 +39,11 @@ typedef struct _VULKAN_FORMAT_INFO {
 static const VULKAN_FORMAT_INFO vk_format_table[VK_FORMAT_RANGE_SIZE] = {
     { 0,  0 }, //    [VK_FORMAT_UNDEFINED]
     { 1,  2 }, //    [VK_FORMAT_R4G4_UNORM_PACK8]
-    { 1,  2 }, //    [VK_FORMAT_R4G4_USCALED]
     { 2,  4 }, //    [VK_FORMAT_R4G4B4A4_UNORM_PACK16]
-    { 2,  4 }, //    [VK_FORMAT_R4G4B4A4_USCALED]
     { 2,  4 }, //    [VK_FORMAT_B4G4R4A4_UNORM_PACK16]
     { 2,  3 }, //    [VK_FORMAT_R5G6B5_UNORM_PACK16]
-    { 2,  3 }, //    [VK_FORMAT_R5G6B5_USCALED]
     { 2,  3 }, //    [VK_FORMAT_B5G6R5_UNORM_PACK16]
-    { 2,  3 }, //    [VK_FORMAT_B5G6R5_USCALED]
     { 2,  4 }, //    [VK_FORMAT_R5G5B5A1_UNORM_PACK16]
-    { 2,  4 }, //    [VK_FORMAT_R5G5B5A1_USCALED]
     { 2,  4 }, //    [VK_FORMAT_B5G5R5A1_UNORM_PACK16]
     { 1,  1 }, //    [VK_FORMAT_R8_UNORM]
     { 1,  1 }, //    [VK_FORMAT_R8_SNORM]
-- 
cgit v1.2.3