lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-21 06:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

For depth-only textures allow a depth-read-only DSV to be bound with SRV

Browse Source 
* We were only allowing depth-stencil textures to be bound with depth
  read-only DSVs, which doesn't cover all cases.
This commit is contained in:
baldurk
2017-03-28 11:48:28 +01:00
parent e89f047e09
commit c50902f030
2 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_renderstate.cpp
+13 -1
View File
@@ -1179,10 +1179,22 @@ void D3D11RenderState::UnbindIUnknownForRead(const ResourceRange &range, bool al
{
readStencilOnly = true;
}
if(fmt == DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS || fmt == DXGI_FORMAT_R24_UNORM_X8_TYPELESS)
else if(fmt == DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS ||
fmt == DXGI_FORMAT_R24_UNORM_X8_TYPELESS)
{
readDepthOnly = true;
}
else
{
fmt = GetTypelessFormat(fmt);
// any format that could be depth-only, treat it as reading depth only.
// this only applies for conflicts detected with the depth target.
if(fmt == DXGI_FORMAT_R32_TYPELESS || fmt == DXGI_FORMAT_R16_TYPELESS)
{
readDepthOnly = true;
}
}
SAFE_RELEASE(res);
}
renderdoc/driver/d3d11/d3d11_renderstate.h
+21 -17
View File
@@ -237,6 +237,8 @@ struct D3D11RenderState
D3D11_RESOURCE_DIMENSION dim;
res->GetType(&dim);
DXGI_FORMAT fmt = DXGI_FORMAT_UNKNOWN;
if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE1D)
{
D3D11_TEXTURE1D_DESC d;
@@ -247,16 +249,7 @@ struct D3D11RenderState
d.Format = srvd.Format;
}
if(d.Format == DXGI_FORMAT_X32_TYPELESS_G8X24_UINT ||
d.Format == DXGI_FORMAT_X24_TYPELESS_G8_UINT)
{
readStencilOnly = true;
}
if(d.Format == DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS ||
d.Format == DXGI_FORMAT_R24_UNORM_X8_TYPELESS)
{
readDepthOnly = true;
}
fmt = d.Format;
}
else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE2D)
{
@@ -268,13 +261,24 @@ struct D3D11RenderState
d.Format = srvd.Format;
}
if(d.Format == DXGI_FORMAT_X32_TYPELESS_G8X24_UINT ||
d.Format == DXGI_FORMAT_X24_TYPELESS_G8_UINT)
{
readStencilOnly = true;
}
if(d.Format == DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS ||
d.Format == DXGI_FORMAT_R24_UNORM_X8_TYPELESS)
fmt = d.Format;
}
if(fmt == DXGI_FORMAT_X32_TYPELESS_G8X24_UINT || fmt == DXGI_FORMAT_X24_TYPELESS_G8_UINT)
{
readStencilOnly = true;
}
else if(fmt == DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS || fmt == DXGI_FORMAT_R24_UNORM_X8_TYPELESS)
{
readDepthOnly = true;
}
else
{
fmt = GetTypelessFormat(fmt);
// any format that could be depth-only, treat it as reading depth only.
// this only applies for conflicts detected with the depth target.
if(fmt == DXGI_FORMAT_R32_TYPELESS || fmt == DXGI_FORMAT_R16_TYPELESS)
{
readDepthOnly = true;
}