From c5a010a48c4ee762248d47c324b4bd8ecc85c60c Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sat, 21 Jul 2018 11:41:45 +0200
Subject: [PATCH] [dxgi] Do not use MUTABLE_FORMAT_BIT for SRGB images

Creation of non-SRGB views for SRGB images fails on Windows.
---
 src/dxgi/dxgi_format.cpp | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/dxgi/dxgi_format.cpp b/src/dxgi/dxgi_format.cpp
index e5746ce13..d95038838 100644
--- a/src/dxgi/dxgi_format.cpp
+++ b/src/dxgi/dxgi_format.cpp
@@ -609,8 +609,7 @@ namespace dxvk {
     { VK_FORMAT_R8G8B8A8_UNORM,
       VK_FORMAT_R8G8B8A8_SRGB },
     // DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
-    { VK_FORMAT_R8G8B8A8_UNORM,
-      VK_FORMAT_R8G8B8A8_SRGB },
+    { },
     // DXGI_FORMAT_R8G8B8A8_UINT
     { },
     // DXGI_FORMAT_R8G8B8A8_SNORM
@@ -714,8 +713,7 @@ namespace dxvk {
     { VK_FORMAT_BC1_RGBA_UNORM_BLOCK,
       VK_FORMAT_BC1_RGBA_SRGB_BLOCK },
     // DXGI_FORMAT_BC1_UNORM_SRGB
-    { VK_FORMAT_BC1_RGBA_UNORM_BLOCK,
-      VK_FORMAT_BC1_RGBA_SRGB_BLOCK },
+    { },
     // DXGI_FORMAT_BC2_TYPELESS
     { VK_FORMAT_BC2_UNORM_BLOCK,
       VK_FORMAT_BC2_SRGB_BLOCK },
@@ -723,8 +721,7 @@ namespace dxvk {
     { VK_FORMAT_BC2_UNORM_BLOCK,
       VK_FORMAT_BC2_SRGB_BLOCK },
     // DXGI_FORMAT_BC2_UNORM_SRGB
-    { VK_FORMAT_BC2_UNORM_BLOCK,
-      VK_FORMAT_BC2_SRGB_BLOCK },
+    { },
     // DXGI_FORMAT_BC3_TYPELESS
     { VK_FORMAT_BC3_UNORM_BLOCK,
       VK_FORMAT_BC3_SRGB_BLOCK },
@@ -732,8 +729,7 @@ namespace dxvk {
     { VK_FORMAT_BC3_UNORM_BLOCK,
       VK_FORMAT_BC3_SRGB_BLOCK },
     // DXGI_FORMAT_BC3_UNORM_SRGB
-    { VK_FORMAT_BC3_UNORM_BLOCK,
-      VK_FORMAT_BC3_SRGB_BLOCK },
+    { },
     // DXGI_FORMAT_BC4_TYPELESS
     { VK_FORMAT_BC4_UNORM_BLOCK,
       VK_FORMAT_BC4_SNORM_BLOCK },
@@ -762,14 +758,12 @@ namespace dxvk {
     { VK_FORMAT_B8G8R8A8_UNORM,
       VK_FORMAT_B8G8R8A8_SRGB },
     // DXGI_FORMAT_B8G8R8A8_UNORM_SRGB
-    { VK_FORMAT_B8G8R8A8_UNORM,
-      VK_FORMAT_B8G8R8A8_SRGB },
+    { },
     // DXGI_FORMAT_B8G8R8X8_TYPELESS
     { VK_FORMAT_B8G8R8A8_UNORM,
       VK_FORMAT_B8G8R8A8_SRGB },
     // DXGI_FORMAT_B8G8R8X8_UNORM_SRGB
-    { VK_FORMAT_B8G8R8A8_UNORM,
-      VK_FORMAT_B8G8R8A8_SRGB },
+    { },
     // DXGI_FORMAT_BC6H_TYPELESS
     { VK_FORMAT_BC6H_UFLOAT_BLOCK,
       VK_FORMAT_BC6H_SFLOAT_BLOCK },
@@ -784,8 +778,7 @@ namespace dxvk {
     { VK_FORMAT_BC7_UNORM_BLOCK,
       VK_FORMAT_BC7_SRGB_BLOCK },
     // DXGI_FORMAT_BC7_UNORM_SRGB
-    { VK_FORMAT_BC7_UNORM_BLOCK,
-      VK_FORMAT_BC7_SRGB_BLOCK },
+    { },
     // DXGI_FORMAT_AYUV
     { }, // Unsupported
     // DXGI_FORMAT_Y410