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

Fix MSAA mismatch in mesh view output rendering

Browse Source
This commit is contained in:
baldurk
2020-01-16 11:52:29 +00:00
parent 29403836c6
commit ca07c1626e
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_outputwindow.cpp
+5 -5
View File
@@ -446,7 +446,7 @@ void D3D12Replay::GetOutputWindowData(uint64_t id, bytebuf &retData)
dst.PlacedFootprint = layout;
// resolve or copy from colour to backbuffer
if(outw.multisampled)
if(outw.colResolve)
{
D3D12_RESOURCE_BARRIER resolvebarrier = {};
@@ -585,7 +585,7 @@ void D3D12Replay::FlipOutputWindow(uint64_t id)
colbarrier.Transition.pResource = outw.col;
colbarrier.Transition.StateBefore = D3D12_RESOURCE_STATE_RENDER_TARGET;
colbarrier.Transition.StateAfter =
outw.multisampled ? D3D12_RESOURCE_STATE_RESOLVE_SOURCE : D3D12_RESOURCE_STATE_COPY_SOURCE;
outw.colResolve ? D3D12_RESOURCE_STATE_RESOLVE_SOURCE : D3D12_RESOURCE_STATE_COPY_SOURCE;
bbbarrier.Transition.pResource = outw.bb[outw.bbIdx];
bbbarrier.Transition.StateBefore = D3D12_RESOURCE_STATE_PRESENT;
@@ -598,7 +598,7 @@ void D3D12Replay::FlipOutputWindow(uint64_t id)
ID3D12GraphicsCommandList *list = m_pDevice->GetNewList();
// resolve or copy from colour to backbuffer
if(outw.multisampled)
if(outw.colResolve)
{
// transition colour to resolve source, resolve target to resolve dest, backbuffer to copy dest
list->ResourceBarrier(1, &colbarrier);
@@ -641,13 +641,13 @@ void D3D12Replay::FlipOutputWindow(uint64_t id)
if(m_D3D12On7)
{
ID3D12Resource *res = outw.multisampled ? outw.colResolve : outw.col;
ID3D12Resource *res = outw.colResolve ? outw.colResolve : outw.col;
D3D12_RESOURCE_BARRIER toPresent = {};
toPresent.Transition.pResource = res;
toPresent.Transition.StateBefore =
outw.multisampled ? D3D12_RESOURCE_STATE_COPY_SOURCE : D3D12_RESOURCE_STATE_RENDER_TARGET;
outw.colResolve ? D3D12_RESOURCE_STATE_COPY_SOURCE : D3D12_RESOURCE_STATE_RENDER_TARGET;
toPresent.Transition.StateAfter = D3D12_RESOURCE_STATE_PRESENT;
list->ResourceBarrier(1, &toPresent);
renderdoc/driver/d3d12/d3d12_replay.cpp
+2 -2
View File
@@ -1678,8 +1678,8 @@ void D3D12Replay::RenderCheckerboard()
list->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
list->SetPipelineState(outw.multisampled ? m_General.CheckerboardMSAAPipe
: m_General.CheckerboardPipe);
list->SetPipelineState(outw.colResolve ? m_General.CheckerboardMSAAPipe
: m_General.CheckerboardPipe);
list->SetGraphicsRootSignature(m_General.CheckerboardRootSig);
renderdoc/driver/d3d12/d3d12_replay.h
-1
View File
@@ -312,7 +312,6 @@ private:
void MakeDSV();
int width, height;
bool multisampled;
};
float m_OutputWidth = 1.0f;