Don't add event usage when m_CurEventID == 0

This commit is contained in:
baldurk
2018-03-03 01:10:49 +00:00
parent 169604ea05
commit d65e4339ec
+30 -21
View File
@@ -5354,14 +5354,17 @@ bool WrappedID3D11DeviceContext::Serialise_CopySubresourceRegion(
draw.copySource = srcOrigID;
draw.copyDestination = dstOrigID;
if(dstLiveID == srcLiveID)
if(m_CurEventID)
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::Copy));
}
else
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::CopyDst));
m_ResourceUses[srcLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::CopySrc));
if(dstLiveID == srcLiveID)
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::Copy));
}
else
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::CopyDst));
m_ResourceUses[srcLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::CopySrc));
}
}
}
@@ -5504,14 +5507,17 @@ bool WrappedID3D11DeviceContext::Serialise_CopyResource(SerialiserType &ser,
draw.copySource = srcOrigID;
draw.copyDestination = dstOrigID;
if(dstLiveID == srcLiveID)
if(m_CurEventID)
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::Copy));
}
else
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::CopyDst));
m_ResourceUses[srcLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::CopySrc));
if(dstLiveID == srcLiveID)
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::Copy));
}
else
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::CopyDst));
m_ResourceUses[srcLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::CopySrc));
}
}
}
@@ -6017,14 +6023,17 @@ bool WrappedID3D11DeviceContext::Serialise_ResolveSubresource(SerialiserType &se
draw.copySource = srcOrigID;
draw.copyDestination = dstOrigID;
if(dstLiveID == srcLiveID)
if(m_CurEventID)
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::Resolve));
}
else
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::ResolveDst));
m_ResourceUses[srcLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::ResolveSrc));
if(dstLiveID == srcLiveID)
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::Resolve));
}
else
{
m_ResourceUses[dstLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::ResolveDst));
m_ResourceUses[srcLiveID].push_back(EventUsage(m_CurEventID, ResourceUsage::ResolveSrc));
}
}
}