Add missing formats to mapTextureFormat

This change adds the missing formats to mapTextureFormat(). While this
does not affect existing vulkan tests, it may enable the use of those
formats eventually.

Affects:
dE-IT.framework.vulkan.image_util

Components: Vulkan
VK-GL-CTS issue: 3381

Change-Id: I5148be25ff185892e10f6bc582ef6d7557b0fe09

diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.cpp b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
index b629e8f..2d4ab91 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkImageUtil.cpp
+++ b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
@@ -2827,12 +2827,16 @@ VkFormat mapTextureFormat (const tcu::TextureFormat& format)
                case FMT_CASE(BGR, SNORM_INT8):                                         return VK_FORMAT_B8G8R8_SNORM;
                case FMT_CASE(BGR, UNSIGNED_INT8):                                      return VK_FORMAT_B8G8R8_UINT;
                case FMT_CASE(BGR, SIGNED_INT8):                                        return VK_FORMAT_B8G8R8_SINT;
+               case FMT_CASE(BGR, USCALED_INT8):                                       return VK_FORMAT_B8G8R8_USCALED;
+               case FMT_CASE(BGR, SSCALED_INT8):                                       return VK_FORMAT_B8G8R8_SSCALED;
                case FMT_CASE(sBGR, UNORM_INT8):                                        return VK_FORMAT_B8G8R8_SRGB;
 
                case FMT_CASE(BGRA, UNORM_INT8):                                        return VK_FORMAT_B8G8R8A8_UNORM;
                case FMT_CASE(BGRA, SNORM_INT8):                                        return VK_FORMAT_B8G8R8A8_SNORM;
                case FMT_CASE(BGRA, UNSIGNED_INT8):                                     return VK_FORMAT_B8G8R8A8_UINT;
                case FMT_CASE(BGRA, SIGNED_INT8):                                       return VK_FORMAT_B8G8R8A8_SINT;
+               case FMT_CASE(BGRA, USCALED_INT8):                                      return VK_FORMAT_B8G8R8A8_USCALED;
+               case FMT_CASE(BGRA, SSCALED_INT8):                                      return VK_FORMAT_B8G8R8A8_SSCALED;
                case FMT_CASE(sBGRA, UNORM_INT8):                                       return VK_FORMAT_B8G8R8A8_SRGB;
 
                case FMT_CASE(BGRA, UNORM_INT_1010102_REV):                     return VK_FORMAT_A2R10G10B10_UNORM_PACK32;
@@ -2881,6 +2885,9 @@ VkFormat mapTextureFormat (const tcu::TextureFormat& format)
                case FMT_CASE(RGBA, USCALED_INT_1010102_REV):           return VK_FORMAT_A2B10G10R10_USCALED_PACK32;
                case FMT_CASE(RGBA, SSCALED_INT_1010102_REV):           return VK_FORMAT_A2B10G10R10_SSCALED_PACK32;
 
+               case FMT_CASE(BGRA, USCALED_INT_1010102_REV):           return VK_FORMAT_A2R10G10B10_USCALED_PACK32;
+               case FMT_CASE(BGRA, SSCALED_INT_1010102_REV):           return VK_FORMAT_A2R10G10B10_SSCALED_PACK32;
+
                case FMT_CASE(ARGB, UNORM_SHORT_4444):                          return VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT;
                case FMT_CASE(ABGR, UNORM_SHORT_4444):                          return VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT;