From 9f4fb3cd335a3298c809ce760d8a93533001e103 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 27 Nov 2019 11:07:06 +0000
Subject: [PATCH] Don't lose forced SRGB texture remapping in D3D11/D3D12

---
 renderdoc/driver/d3d11/d3d11_replay.cpp | 2 +-
 renderdoc/driver/d3d12/d3d12_replay.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_replay.cpp b/renderdoc/driver/d3d11/d3d11_replay.cpp
index a8efc00d9..c6274a0df 100644
--- a/renderdoc/driver/d3d11/d3d11_replay.cpp
+++ b/renderdoc/driver/d3d11/d3d11_replay.cpp
@@ -2121,10 +2121,10 @@ void D3D11Replay::GetTextureData(ResourceId tex, const Subresource &sub,
     {
       if(params.remap == RemapTexture::RGBA8)
       {
+        desc.Format = GetTypedFormat(DXGI_FORMAT_R8G8B8A8_TYPELESS, params.typeCast);
         if((IsSRGBFormat(desc.Format) || wrapTex->m_RealDescriptor) &&
            params.typeCast == CompType::Typeless)
           desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
-        desc.Format = GetTypedFormat(DXGI_FORMAT_R8G8B8A8_TYPELESS, params.typeCast);
       }
       else if(params.remap == RemapTexture::RGBA16)
       {
diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp
index 1922ffcf2..82aaf9ac3 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.cpp
+++ b/renderdoc/driver/d3d12/d3d12_replay.cpp
@@ -3058,9 +3058,9 @@ void D3D12Replay::GetTextureData(ResourceId tex, const Subresource &sub,
   {
     if(params.remap == RemapTexture::RGBA8)
     {
+      copyDesc.Format = GetTypedFormat(DXGI_FORMAT_R8G8B8A8_TYPELESS, params.typeCast);
       if(IsSRGBFormat(copyDesc.Format) && params.typeCast == CompType::Typeless)
         copyDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
-      copyDesc.Format = GetTypedFormat(DXGI_FORMAT_R8G8B8A8_TYPELESS, params.typeCast);
     }
     else if(params.remap == RemapTexture::RGBA16)
     {