From fc3ff7808369188fe3ccab0e92ad79e35996439c Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Tue, 12 Jun 2018 22:35:02 +0200
Subject: [PATCH] [dxgi] Map typeless formats to their UNORM variants by
 default

Works around some annoyances with RenderDoc.
---
 src/dxgi/dxgi_format.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dxgi/dxgi_format.cpp b/src/dxgi/dxgi_format.cpp
index 6c01da259..91956b154 100644
--- a/src/dxgi/dxgi_format.cpp
+++ b/src/dxgi/dxgi_format.cpp
@@ -46,7 +46,7 @@ namespace dxvk {
       VK_FORMAT_R32G32B32_UINT,
       VK_IMAGE_ASPECT_COLOR_BIT },
     // DXGI_FORMAT_R16G16B16A16_TYPELESS
-    { VK_FORMAT_R16G16B16A16_UINT,
+    { VK_FORMAT_R16G16B16A16_UNORM,
       VK_FORMAT_UNDEFINED,
       VK_FORMAT_R16G16B16A16_UINT },
     // DXGI_FORMAT_R16G16B16A16_FLOAT
@@ -113,7 +113,7 @@ namespace dxvk {
       VK_FORMAT_UNDEFINED,
       0, VK_IMAGE_ASPECT_STENCIL_BIT },
     // DXGI_FORMAT_R10G10B10A2_TYPELESS
-    { VK_FORMAT_A2B10G10R10_UINT_PACK32,
+    { VK_FORMAT_A2B10G10R10_UNORM_PACK32,
       VK_FORMAT_UNDEFINED,
       VK_FORMAT_A2B10G10R10_UINT_PACK32 },
     // DXGI_FORMAT_R10G10B10A2_UNORM
@@ -132,7 +132,7 @@ namespace dxvk {
       VK_FORMAT_UNDEFINED,
       VK_IMAGE_ASPECT_COLOR_BIT },
     // DXGI_FORMAT_R8G8B8A8_TYPELESS
-    { VK_FORMAT_R8G8B8A8_UINT,
+    { VK_FORMAT_R8G8B8A8_UNORM,
       VK_FORMAT_UNDEFINED,
       VK_FORMAT_R8G8B8A8_UINT },
     // DXGI_FORMAT_R8G8B8A8_UNORM
@@ -161,7 +161,7 @@ namespace dxvk {
       VK_FORMAT_R8G8B8A8_UINT,
       VK_IMAGE_ASPECT_COLOR_BIT },
     // DXGI_FORMAT_R16G16_TYPELESS
-    { VK_FORMAT_R16G16_UINT,
+    { VK_FORMAT_R16G16_UNORM,
       VK_FORMAT_UNDEFINED,
       VK_FORMAT_R16G16_UINT },
     // DXGI_FORMAT_R16G16_FLOAT
@@ -234,7 +234,7 @@ namespace dxvk {
       VK_FORMAT_UNDEFINED,
       0, VK_IMAGE_ASPECT_STENCIL_BIT },
     // DXGI_FORMAT_R8G8_TYPELESS
-    { VK_FORMAT_R8G8_UINT,
+    { VK_FORMAT_R8G8_UNORM,
       VK_FORMAT_UNDEFINED,
       VK_FORMAT_R8G8_UINT },
     // DXGI_FORMAT_R8G8_UNORM
@@ -258,7 +258,7 @@ namespace dxvk {
       VK_FORMAT_R8G8_UINT,
       VK_IMAGE_ASPECT_COLOR_BIT },
     // DXGI_FORMAT_R16_TYPELESS
-    { VK_FORMAT_R16_UINT,
+    { VK_FORMAT_R16_UNORM,
       VK_FORMAT_D16_UNORM,
       VK_FORMAT_R16_UINT },
     // DXGI_FORMAT_R16_FLOAT
@@ -293,7 +293,7 @@ namespace dxvk {
       VK_FORMAT_R16_UINT,
       VK_IMAGE_ASPECT_COLOR_BIT },
     // DXGI_FORMAT_R8_TYPELESS
-    { VK_FORMAT_R8_UINT,
+    { VK_FORMAT_R8_UNORM,
       VK_FORMAT_UNDEFINED,
       VK_FORMAT_R8_UINT },
     // DXGI_FORMAT_R8_UNORM