From 79d3b203efbdae2bc4af866611911f3be347bc3e Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Wed, 6 Jun 2018 23:09:39 +0200
Subject: [PATCH] [dxvk] Added format flag to mark SRGB color formats

---
 src/dxvk/dxvk_format.cpp | 41 ++++++++++++++++++++++++++++------------
 src/dxvk/dxvk_format.h   |  1 +
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/dxvk/dxvk_format.cpp b/src/dxvk/dxvk_format.cpp
index 99735dfd1..f8d1819ff 100644
--- a/src/dxvk/dxvk_format.cpp
+++ b/src/dxvk/dxvk_format.cpp
@@ -51,7 +51,8 @@ namespace dxvk {
       DxvkFormatFlag::SampledInteger },
     
     // VK_FORMAT_R8_SRGB
-    { 1, VK_IMAGE_ASPECT_COLOR_BIT },
+    { 1, VK_IMAGE_ASPECT_COLOR_BIT,
+      DxvkFormatFlag::ColorSpaceSrgb },
     
     // VK_FORMAT_R8G8_UNORM
     { 2, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -74,7 +75,8 @@ namespace dxvk {
       DxvkFormatFlag::SampledInteger },
     
     // VK_FORMAT_R8G8_SRGB
-    { 2, VK_IMAGE_ASPECT_COLOR_BIT },
+    { 2, VK_IMAGE_ASPECT_COLOR_BIT,
+      DxvkFormatFlag::ColorSpaceSrgb },
     
     // VK_FORMAT_R8G8B8_UNORM
     { 3, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -97,7 +99,8 @@ namespace dxvk {
       DxvkFormatFlag::SampledInteger },
     
     // VK_FORMAT_R8G8B8_SRGB
-    { 3, VK_IMAGE_ASPECT_COLOR_BIT },
+    { 3, VK_IMAGE_ASPECT_COLOR_BIT,
+      DxvkFormatFlag::ColorSpaceSrgb },
     
     // VK_FORMAT_B8G8R8_UNORM
     { 3, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -120,7 +123,8 @@ namespace dxvk {
       DxvkFormatFlag::SampledInteger },
     
     // VK_FORMAT_B8G8R8_SRGB
-    { 3, VK_IMAGE_ASPECT_COLOR_BIT },
+    { 3, VK_IMAGE_ASPECT_COLOR_BIT,
+      DxvkFormatFlag::ColorSpaceSrgb },
     
     // VK_FORMAT_R8G8B8A8_UNORM
     { 4, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -143,7 +147,8 @@ namespace dxvk {
       DxvkFormatFlag::SampledInteger },
     
     // VK_FORMAT_R8G8B8A8_SRGB
-    { 4, VK_IMAGE_ASPECT_COLOR_BIT },
+    { 4, VK_IMAGE_ASPECT_COLOR_BIT,
+      DxvkFormatFlag::ColorSpaceSrgb },
     
     // VK_FORMAT_B8G8R8A8_UNORM
     { 4, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -166,7 +171,8 @@ namespace dxvk {
       DxvkFormatFlag::SampledInteger },
     
     // VK_FORMAT_B8G8R8A8_SRGB
-    { 4, VK_IMAGE_ASPECT_COLOR_BIT },
+    { 4, VK_IMAGE_ASPECT_COLOR_BIT,
+      DxvkFormatFlag::ColorSpaceSrgb },
     
     // VK_FORMAT_A8B8G8R8_UNORM_PACK32
     { 4, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -189,7 +195,8 @@ namespace dxvk {
       DxvkFormatFlag::SampledInteger },
     
     // VK_FORMAT_A8B8G8R8_SRGB_PACK32
-    { 4, VK_IMAGE_ASPECT_COLOR_BIT },
+    { 4, VK_IMAGE_ASPECT_COLOR_BIT,
+      DxvkFormatFlag::ColorSpaceSrgb },
     
     // VK_FORMAT_A2R10G10B10_UNORM_PACK32
     { 4, VK_IMAGE_ASPECT_COLOR_BIT },
@@ -445,7 +452,9 @@ namespace dxvk {
     
     // VK_FORMAT_BC1_RGB_SRGB_BLOCK
     { 8, VK_IMAGE_ASPECT_COLOR_BIT,
-      DxvkFormatFlag::BlockCompressed,
+      DxvkFormatFlags(
+        DxvkFormatFlag::BlockCompressed,
+        DxvkFormatFlag::ColorSpaceSrgb),
       VkExtent3D { 4, 4, 1 } },
     
     // VK_FORMAT_BC1_RGBA_UNORM_BLOCK
@@ -455,7 +464,9 @@ namespace dxvk {
     
     // VK_FORMAT_BC1_RGBA_SRGB_BLOCK
     { 8, VK_IMAGE_ASPECT_COLOR_BIT,
-      DxvkFormatFlag::BlockCompressed,
+      DxvkFormatFlags(
+        DxvkFormatFlag::BlockCompressed,
+        DxvkFormatFlag::ColorSpaceSrgb),
       VkExtent3D { 4, 4, 1 } },
     
     // VK_FORMAT_BC2_UNORM_BLOCK
@@ -465,7 +476,9 @@ namespace dxvk {
     
     // VK_FORMAT_BC2_SRGB_BLOCK
     { 16, VK_IMAGE_ASPECT_COLOR_BIT,
-      DxvkFormatFlag::BlockCompressed,
+      DxvkFormatFlags(
+        DxvkFormatFlag::BlockCompressed,
+        DxvkFormatFlag::ColorSpaceSrgb),
       VkExtent3D { 4, 4, 1 } },
     
     // VK_FORMAT_BC3_UNORM_BLOCK
@@ -475,7 +488,9 @@ namespace dxvk {
     
     // VK_FORMAT_BC3_SRGB_BLOCK
     { 16, VK_IMAGE_ASPECT_COLOR_BIT,
-      DxvkFormatFlag::BlockCompressed,
+      DxvkFormatFlags(
+        DxvkFormatFlag::BlockCompressed,
+        DxvkFormatFlag::ColorSpaceSrgb),
       VkExtent3D { 4, 4, 1 } },
     
     // VK_FORMAT_BC4_UNORM_BLOCK
@@ -515,7 +530,9 @@ namespace dxvk {
     
     // VK_FORMAT_BC7_SRGB_BLOCK
     { 16, VK_IMAGE_ASPECT_COLOR_BIT,
-      DxvkFormatFlag::BlockCompressed,
+      DxvkFormatFlags(
+        DxvkFormatFlag::BlockCompressed,
+        DxvkFormatFlag::ColorSpaceSrgb),
       VkExtent3D { 4, 4, 1 } },
     
     // VK_FORMAT_G8B8G8R8_422_UNORM_KHR
diff --git a/src/dxvk/dxvk_format.h b/src/dxvk/dxvk_format.h
index bb60ecbc1..0fbacd144 100644
--- a/src/dxvk/dxvk_format.h
+++ b/src/dxvk/dxvk_format.h
@@ -7,6 +7,7 @@ namespace dxvk {
   enum class DxvkFormatFlag {
     BlockCompressed = 0,  ///< Image format is block compressed
     SampledInteger  = 1,  ///< Sampled type is an integer type
+    ColorSpaceSrgb  = 2,  ///< Non-linear SRGB color format
   };
   
   using DxvkFormatFlags = Flags<DxvkFormatFlag>;