lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for format-based checks when displaying casted typeless textures

Browse Source
This commit is contained in:
baldurk
2019-11-20 12:02:18 +00:00
parent 861e7d8b67
commit a430f9d42e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_debug.h
+2 -2
View File
@@ -57,7 +57,7 @@ struct TextureShaderDetails
{
TextureShaderDetails()
{
texFmt = DXGI_FORMAT_UNKNOWN;
texFmt = srvFormat = DXGI_FORMAT_UNKNOWN;
texWidth = 0;
texHeight = 0;
texDepth = 0;
@@ -75,7 +75,7 @@ struct TextureShaderDetails
RDCEraseEl(srv);
}
DXGI_FORMAT texFmt;
DXGI_FORMAT texFmt, srvFormat;
UINT texWidth;
UINT texHeight;
UINT texDepth;
renderdoc/driver/d3d11/d3d11_rendertexture.cpp
+4 -2
View File
@@ -151,7 +151,8 @@ TextureShaderDetails D3D11DebugManager::GetShaderDetails(ResourceId id, CompType
details.texType = eTexType_2DMS;
}
if(mode == TEXDISPLAY_DEPTH_TARGET || IsDepthFormat(details.texFmt))
if(mode == TEXDISPLAY_DEPTH_TARGET || IsDepthFormat(details.texFmt) ||
IsDepthFormat(GetTypedFormat(details.texFmt, typeHint)))
{
details.texType = eTexType_Depth;
details.texFmt = GetTypedFormat(details.texFmt, typeHint);
@@ -390,6 +391,7 @@ TextureShaderDetails D3D11DebugManager::GetShaderDetails(ResourceId id, CompType
RDCERR("Failed to create cache SRV 0, type %d HRESULT: %s", details.texType, ToStr(hr).c_str());
}
details.srvFormat = srvFormat;
details.srv[details.texType] = cache.srv[0];
if(IsYUVFormat(srvFormat))
@@ -759,7 +761,7 @@ bool D3D11Replay::RenderTextureInternal(TextureDisplay cfg, bool blendAlpha)
pixelData.OutputDisplayFormat |= TEXDISPLAY_SINT_TEX;
srvOffset = 20;
}
if(!IsSRGBFormat(details.texFmt) && cfg.linearDisplayAsGamma)
if(!IsSRGBFormat(details.texFmt) && !IsSRGBFormat(details.srvFormat) && cfg.linearDisplayAsGamma)
{
pixelData.OutputDisplayFormat |= TEXDISPLAY_GAMMA_CURVE;
}