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

Fix compile errors on CI targets

Browse Source
This commit is contained in:
baldurk
2016-10-18 19:35:01 +02:00
parent 2fe22e96b5
commit b8520a274d
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+4 -4
View File
@@ -2772,12 +2772,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearDepthStencilView(
m_Cmd->AddDrawcall(draw, true);
D3D12Descriptor *desc = DescriptorFromPortableHandle(GetResourceManager(), dsv);
D3D12Descriptor *descriptor = DescriptorFromPortableHandle(GetResourceManager(), dsv);
D3D12DrawcallTreeNode &drawNode = m_Cmd->GetDrawcallStack().back()->children.back();
drawNode.resourceUsage.push_back(std::make_pair(
GetResID(desc->nonsamp.resource), EventUsage(drawNode.draw.eventID, eUsage_Clear)));
GetResID(descriptor->nonsamp.resource), EventUsage(drawNode.draw.eventID, eUsage_Clear)));
}
}
@@ -2857,12 +2857,12 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearRenderTargetView(
m_Cmd->AddDrawcall(draw, true);
D3D12Descriptor *desc = DescriptorFromPortableHandle(GetResourceManager(), rtv);
D3D12Descriptor *descriptor = DescriptorFromPortableHandle(GetResourceManager(), rtv);
D3D12DrawcallTreeNode &drawNode = m_Cmd->GetDrawcallStack().back()->children.back();
drawNode.resourceUsage.push_back(std::make_pair(
GetResID(desc->nonsamp.resource), EventUsage(drawNode.draw.eventID, eUsage_Clear)));
GetResID(descriptor->nonsamp.resource), EventUsage(drawNode.draw.eventID, eUsage_Clear)));
}
}
renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp
+3 -3
View File
@@ -95,14 +95,14 @@ bool WrappedID3D12CommandQueue::Serialise_ExecuteCommandLists(UINT NumCommandLis
{
ScopedContext msgscope(m_pSerialiser, "DebugMessage", "DebugMessage", 0, false);
string desc;
string msgDesc;
if(m_State >= WRITING)
desc = debugMessages[i].description.elems;
msgDesc = debugMessages[i].description.elems;
SERIALISE_ELEMENT(uint32_t, Category, debugMessages[i].category);
SERIALISE_ELEMENT(uint32_t, Severity, debugMessages[i].severity);
SERIALISE_ELEMENT(uint32_t, ID, debugMessages[i].messageID);
SERIALISE_ELEMENT(string, Description, desc);
SERIALISE_ELEMENT(string, Description, msgDesc);
if(m_State == READING)
{
renderdoc/driver/d3d12/d3d12_device.cpp
+2 -2
View File
@@ -767,9 +767,9 @@ bool WrappedID3D12Device::Serialise_MapDataWrite(Serialiser *localSerialiser,
{
ID3D12Resource *r = GetResourceManager()->GetLiveAs<ID3D12Resource>(res);
D3D12_RANGE range = {};
range.Begin = range.End = 0;
byte *mapPtr = NULL;
mapPtr = NULL;
HRESULT hr = r->Map(sub, &range, (void **)&mapPtr);
if(SUCCEEDED(hr))
renderdoc/replay/replay_renderer.cpp
+4
View File
@@ -1268,16 +1268,19 @@ bool ReplayRenderer::PixelHistory(ResourceId target, uint32_t x, uint32_t y, uin
case eUsage_GS_Constants:
case eUsage_PS_Constants:
case eUsage_CS_Constants:
case eUsage_All_Constants:
case eUsage_VS_Resource:
case eUsage_HS_Resource:
case eUsage_DS_Resource:
case eUsage_GS_Resource:
case eUsage_PS_Resource:
case eUsage_CS_Resource:
case eUsage_All_Resource:
case eUsage_InputTarget:
case eUsage_CopySrc:
case eUsage_ResolveSrc:
case eUsage_Barrier:
case eUsage_Indirect:
// read-only, not a valid pixel history event
continue;
@@ -1289,6 +1292,7 @@ bool ReplayRenderer::PixelHistory(ResourceId target, uint32_t x, uint32_t y, uin
case eUsage_GS_RWResource:
case eUsage_PS_RWResource:
case eUsage_CS_RWResource:
case eUsage_All_RWResource:
case eUsage_ColourTarget:
case eUsage_DepthStencilTarget:
case eUsage_Clear: