Map sRGB VkFormats to unorm instead of snorm

Change-Id: I20f76188262733747a56feca55404afcc674f2d7

diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.cpp b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
index 015577a..9ce4b4a 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkImageUtil.cpp
+++ b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
@@ -156,19 +156,19 @@ VkFormat mapTextureFormat (const tcu::TextureFormat& format)
                case FMT_CASE(RG, SNORM_INT8):                                          return VK_FORMAT_R8G8_SNORM;
                case FMT_CASE(RG, UNSIGNED_INT8):                                       return VK_FORMAT_R8G8_UINT;
                case FMT_CASE(RG, SIGNED_INT8):                                         return VK_FORMAT_R8G8_SINT;
-               case FMT_CASE(sRG, SIGNED_INT8):                                        return VK_FORMAT_R8G8_SRGB;
+               case FMT_CASE(sRG, UNORM_INT8):                                         return VK_FORMAT_R8G8_SRGB;
 
                case FMT_CASE(RGB, UNORM_INT8):                                         return VK_FORMAT_R8G8B8_UNORM;
                case FMT_CASE(RGB, SNORM_INT8):                                         return VK_FORMAT_R8G8B8_SNORM;
                case FMT_CASE(RGB, UNSIGNED_INT8):                                      return VK_FORMAT_R8G8B8_UINT;
                case FMT_CASE(RGB, SIGNED_INT8):                                        return VK_FORMAT_R8G8B8_SINT;
-               case FMT_CASE(sRGB, SNORM_INT8):                                        return VK_FORMAT_R8G8B8_SRGB;
+               case FMT_CASE(sRGB, UNORM_INT8):                                        return VK_FORMAT_R8G8B8_SRGB;
 
                case FMT_CASE(RGBA, UNORM_INT8):                                        return VK_FORMAT_R8G8B8A8_UNORM;
                case FMT_CASE(RGBA, SNORM_INT8):                                        return VK_FORMAT_R8G8B8A8_SNORM;
                case FMT_CASE(RGBA, UNSIGNED_INT8):                                     return VK_FORMAT_R8G8B8A8_UINT;
                case FMT_CASE(RGBA, SIGNED_INT8):                                       return VK_FORMAT_R8G8B8A8_SINT;
-               case FMT_CASE(sRGBA, SNORM_INT8):                                       return VK_FORMAT_R8G8B8A8_SRGB;
+               case FMT_CASE(sRGBA, UNORM_INT8):                                       return VK_FORMAT_R8G8B8A8_SRGB;
 
                case FMT_CASE(RGBA, UNORM_INT_1010102_REV):                     return VK_FORMAT_R10G10B10A2_UNORM;
                case FMT_CASE(RGBA, UNSIGNED_INT_1010102_REV):          return VK_FORMAT_R10G10B10A2_UINT;