lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-11-08 15:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cache whether the current pipeline is partially-writing to OM targets

Browse Source 
* This is updated whenever the OM bindings change, or viewport/scissors
  change. Much lower frequency than per-draw where we were calculating
  this information during capture.
This commit is contained in:
baldurk committed 2017-07-27 16:17:25 +01:00
1 parent 9f172daffc
commit 61db91eb42
2 files changed
+55 -58
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

renderdoc/driver/d3d11/d3d11_renderstate.cpp
+53 -58
View File
@@ -45,6 +45,7 @@ D3D11RenderState::D3D11RenderState(Serialiser *ser)
m_pSerialiser = ser;
m_ImmediatePipeline = false;
m_ViewportScissorPartial = true;
m_pDevice = NULL;
}
@@ -84,6 +85,8 @@ void D3D11RenderState::CopyState(const D3D11RenderState &other)
memcpy(&CS, &other.CS, sizeof(CS));
memcpy(&CSUAVs, &other.CSUAVs, sizeof(CSUAVs));
m_ViewportScissorPartial = other.m_ViewportScissorPartial;
AddRefs();
}
@@ -218,6 +221,50 @@ void D3D11RenderState::MarkReferenced(WrappedID3D11DeviceContext *ctx, bool init
ctx->MarkResourceReferenced(GetIDForResource(SO.Buffers[i]),
initial ? eFrameRef_Unknown : eFrameRef_Write);
for(UINT i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++)
{
if(OM.RenderTargets[i])
{
ctx->MarkResourceReferenced(GetIDForResource(OM.RenderTargets[i]),
initial ? eFrameRef_Unknown : eFrameRef_Read);
if(m_ViewportScissorPartial)
ctx->MarkResourceReferenced(GetViewResourceResID(OM.RenderTargets[i]),
initial ? eFrameRef_Unknown : eFrameRef_Read);
ctx->MarkResourceReferenced(GetViewResourceResID(OM.RenderTargets[i]),
initial ? eFrameRef_Unknown : eFrameRef_Write);
}
}
for(UINT i = 0; i < D3D11_1_UAV_SLOT_COUNT; i++)
{
if(OM.UAVs[i])
{
// UAVs we always assume to be partial updates
ctx->MarkResourceReferenced(GetIDForResource(OM.UAVs[i]),
initial ? eFrameRef_Unknown : eFrameRef_Read);
ctx->MarkResourceReferenced(GetIDForResource(OM.UAVs[i]),
initial ? eFrameRef_Unknown : eFrameRef_Write);
ctx->MarkResourceReferenced(GetViewResourceResID(OM.UAVs[i]),
initial ? eFrameRef_Unknown : eFrameRef_Read);
ctx->MarkResourceReferenced(GetViewResourceResID(OM.UAVs[i]),
initial ? eFrameRef_Unknown : eFrameRef_Write);
}
}
if(OM.DepthView)
{
ctx->MarkResourceReferenced(GetIDForResource(OM.DepthView),
initial ? eFrameRef_Unknown : eFrameRef_Read);
if(m_ViewportScissorPartial)
ctx->MarkResourceReferenced(GetViewResourceResID(OM.DepthView),
initial ? eFrameRef_Unknown : eFrameRef_Read);
ctx->MarkResourceReferenced(GetViewResourceResID(OM.DepthView),
initial ? eFrameRef_Unknown : eFrameRef_Write);
}
}
void D3D11RenderState::CacheViewportPartial()
{
// tracks the min region of the enabled viewports plus scissors, to see if we could potentially
// partially-update a render target (ie. we know for sure that we are only
// writing to a region in one of the viewports). In this case we mark the
@@ -250,11 +297,11 @@ void D3D11RenderState::MarkReferenced(WrappedID3D11DeviceContext *ctx, bool init
viewportScissorMin.bottom = RDCMIN(viewportScissorMin.bottom, scissor.bottom);
}
bool viewportScissorPartial = false;
m_ViewportScissorPartial = false;
if(viewportScissorMin.left > 0 || viewportScissorMin.top > 0)
{
viewportScissorPartial = true;
m_ViewportScissorPartial = true;
}
else
{
@@ -272,7 +319,7 @@ void D3D11RenderState::MarkReferenced(WrappedID3D11DeviceContext *ctx, bool init
if(dim == D3D11_RESOURCE_DIMENSION_BUFFER)
{
// assume partial
viewportScissorPartial = true;
m_ViewportScissorPartial = true;
}
else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE1D)
{
@@ -280,7 +327,7 @@ void D3D11RenderState::MarkReferenced(WrappedID3D11DeviceContext *ctx, bool init
((ID3D11Texture1D *)res)->GetDesc(&desc);
if(viewportScissorMin.right < (LONG)desc.Width)
viewportScissorPartial = true;
m_ViewportScissorPartial = true;
}
else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE2D)
{
@@ -289,7 +336,7 @@ void D3D11RenderState::MarkReferenced(WrappedID3D11DeviceContext *ctx, bool init
if(viewportScissorMin.right < (LONG)desc.Width ||
viewportScissorMin.bottom < (LONG)desc.Height)
viewportScissorPartial = true;
m_ViewportScissorPartial = true;
}
else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE3D)
{
@@ -298,64 +345,12 @@ void D3D11RenderState::MarkReferenced(WrappedID3D11DeviceContext *ctx, bool init
if(viewportScissorMin.right < (LONG)desc.Width ||
viewportScissorMin.bottom < (LONG)desc.Height)
viewportScissorPartial = true;
m_ViewportScissorPartial = true;
}
}
SAFE_RELEASE(res);
}
for(UINT i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++)
{
ID3D11Resource *res = NULL;
if(OM.RenderTargets[i])
{
OM.RenderTargets[i]->GetResource(&res);
ctx->MarkResourceReferenced(GetIDForResource(OM.RenderTargets[i]),
initial ? eFrameRef_Unknown : eFrameRef_Read);
if(viewportScissorPartial)
ctx->MarkResourceReferenced(GetIDForResource(res),
initial ? eFrameRef_Unknown : eFrameRef_Read);
ctx->MarkResourceReferenced(GetIDForResource(res),
initial ? eFrameRef_Unknown : eFrameRef_Write);
SAFE_RELEASE(res);
}
}
for(UINT i = 0; i < D3D11_1_UAV_SLOT_COUNT; i++)
{
ID3D11Resource *res = NULL;
if(OM.UAVs[i])
{
OM.UAVs[i]->GetResource(&res);
// UAVs we always assume to be partial updates
ctx->MarkResourceReferenced(GetIDForResource(OM.UAVs[i]),
initial ? eFrameRef_Unknown : eFrameRef_Read);
ctx->MarkResourceReferenced(GetIDForResource(OM.UAVs[i]),
initial ? eFrameRef_Unknown : eFrameRef_Write);
ctx->MarkResourceReferenced(GetIDForResource(res),
initial ? eFrameRef_Unknown : eFrameRef_Read);
ctx->MarkResourceReferenced(GetIDForResource(res),
initial ? eFrameRef_Unknown : eFrameRef_Write);
SAFE_RELEASE(res);
}
}
{
ID3D11Resource *res = NULL;
if(OM.DepthView)
{
OM.DepthView->GetResource(&res);
ctx->MarkResourceReferenced(GetIDForResource(OM.DepthView),
initial ? eFrameRef_Unknown : eFrameRef_Read);
if(viewportScissorPartial)
ctx->MarkResourceReferenced(GetIDForResource(res),
initial ? eFrameRef_Unknown : eFrameRef_Read);
ctx->MarkResourceReferenced(GetIDForResource(res),
initial ? eFrameRef_Unknown : eFrameRef_Write);
SAFE_RELEASE(res);
}
}
}
void D3D11RenderState::AddRefs()
renderdoc/driver/d3d11/d3d11_renderstate.h
+2
View File
@@ -274,6 +274,7 @@ struct D3D11RenderState
}
void SetDevice(WrappedID3D11Device *device) { m_pDevice = device; }
void MarkReferenced(WrappedID3D11DeviceContext *ctx, bool initial) const;
void CacheViewportPartial();
private:
void AddRefs();
@@ -282,6 +283,7 @@ private:
Serialiser *GetSerialiser() { return m_pSerialiser; }
Serialiser *m_pSerialiser;
bool m_ImmediatePipeline;
bool m_ViewportScissorPartial;
WrappedID3D11Device *m_pDevice;
};