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

Test entry points that could be applied to wrong resource types

Browse Source
This commit is contained in:
baldurk
2020-10-02 16:43:11 +01:00
parent 1b35c93999
commit 4518fda3ed
5 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_replay.cpp
+18 -2
View File
@@ -2698,12 +2698,20 @@ void D3D12Replay::GetBufferData(ResourceId buff, uint64_t offset, uint64_t lengt
if(it == m_pDevice->GetResourceList().end())
{
RDCERR("Getting buffer data for unknown buffer %s!", ToStr(buff).c_str());
RDCERR("Getting buffer data for unknown buffer %s!",
ToStr(m_pDevice->GetResourceManager()->GetLiveID(buff)).c_str());
return;
}
WrappedID3D12Resource1 *buffer = it->second;
if(buffer->GetDesc().Dimension != D3D12_RESOURCE_DIMENSION_BUFFER)
{
RDCERR("Getting buffer data for non-buffer %s!",
ToStr(m_pDevice->GetResourceManager()->GetLiveID(buff)).c_str());
return;
}
RDCASSERT(buffer);
GetDebugManager()->GetBufferData(buffer, offset, length, retData);
@@ -3012,7 +3020,15 @@ void D3D12Replay::GetTextureData(ResourceId tex, const Subresource &sub,
if(resource == NULL)
{
RDCERR("Trying to get texture data for unknown ID %s!", ToStr(tex).c_str());
RDCERR("Trying to get texture data for unknown ID %s!",
ToStr(m_pDevice->GetResourceManager()->GetLiveID(tex)).c_str());
return;
}
if(resource->GetDesc().Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
{
RDCERR("Getting texture data for buffer %s!",
ToStr(m_pDevice->GetResourceManager()->GetLiveID(tex)).c_str());
return;
}
util/test/tests/D3D11/D3D11_Simple_Triangle.py
+9
View File
@@ -45,3 +45,12 @@ class D3D11_Simple_Triangle(rdtest.TestCase):
}
self.check_mesh_data(postvs_ref, postvs_data)
# Check that nothing breaks if we call typical enumeration functions on resources
for res in self.controller.GetResources():
res: rd.ResourceDescription
self.controller.GetShaderEntryPoints(res.resourceId)
self.controller.GetUsage(res.resourceId)
self.controller.GetBufferData(res.resourceId, 0, 0)
self.controller.GetTextureData(res.resourceId, rd.Subresource())
util/test/tests/D3D12/D3D12_Simple_Triangle.py
+9
View File
@@ -46,3 +46,12 @@ class D3D12_Simple_Triangle(rdtest.TestCase):
self.check_mesh_data(postvs_ref, postvs_data)
# Check that nothing breaks if we call typical enumeration functions on resources
for res in self.controller.GetResources():
res: rd.ResourceDescription
self.controller.GetShaderEntryPoints(res.resourceId)
self.controller.GetUsage(res.resourceId)
self.controller.GetBufferData(res.resourceId, 0, 0)
self.controller.GetTextureData(res.resourceId, rd.Subresource())
util/test/tests/GL/GL_Simple_Triangle.py
+9
View File
@@ -48,3 +48,12 @@ class GL_Simple_Triangle(rdtest.TestCase):
}
self.check_mesh_data(postvs_ref, postvs_data)
# Check that nothing breaks if we call typical enumeration functions on resources
for res in self.controller.GetResources():
res: rd.ResourceDescription
self.controller.GetShaderEntryPoints(res.resourceId)
self.controller.GetUsage(res.resourceId)
self.controller.GetBufferData(res.resourceId, 0, 0)
self.controller.GetTextureData(res.resourceId, rd.Subresource())
util/test/tests/Vulkan/VK_Simple_Triangle.py
+9
View File
@@ -48,3 +48,12 @@ class VK_Simple_Triangle(rdtest.TestCase):
}
self.check_mesh_data(postvs_ref, postvs_data)
# Check that nothing breaks if we call typical enumeration functions on resources
for res in self.controller.GetResources():
res: rd.ResourceDescription
self.controller.GetShaderEntryPoints(res.resourceId)
self.controller.GetUsage(res.resourceId)
self.controller.GetBufferData(res.resourceId, 0, 0)
self.controller.GetTextureData(res.resourceId, rd.Subresource())