Don't pool-allocate D3D12 shaders

This commit is contained in:
baldurk
2020-09-10 13:35:16 +01:00
parent e9360a819f
commit fb19ccb535
3 changed files with 1 additions and 14 deletions
+1 -7
View File
@@ -412,7 +412,7 @@ rdcarray<ShaderEntryPoint> D3D12Replay::GetShaderEntryPoints(ResourceId shader)
{
ID3D12DeviceChild *res = m_pDevice->GetResourceManager()->GetCurrentResource(shader);
if(!res || !WrappedID3D12Shader::IsAlloc(res))
if(!res)
return {};
WrappedID3D12Shader *sh = (WrappedID3D12Shader *)res;
@@ -2715,12 +2715,6 @@ void D3D12Replay::FillCBufferVariables(ResourceId pipeline, ResourceId shader, r
ID3D12DeviceChild *res = m_pDevice->GetResourceManager()->GetCurrentResource(shader);
if(!WrappedID3D12Shader::IsAlloc(res))
{
RDCERR("Shader ID %s does not correspond to a known fake shader", ToStr(shader).c_str());
return;
}
WrappedID3D12Shader *sh = (WrappedID3D12Shader *)res;
const ShaderReflection &refl = sh->GetDetails();
@@ -38,8 +38,6 @@ const GUID RENDERDOC_ID3D12ShaderGUID_ShaderDebugMagicValue = RENDERDOC_ShaderDe
ALL_D3D12_TYPES;
WRAPPED_POOL_INST(WrappedID3D12Shader);
D3D12ResourceType IdentifyTypeByPtr(ID3D12Object *ptr)
{
if(ptr == NULL)
@@ -74,9 +72,6 @@ TrackedResource12 *GetTracked(ID3D12Object *ptr)
ALL_D3D12_TYPES;
if(WrappedID3D12Shader::IsAlloc(ptr))
return (TrackedResource12 *)(WrappedID3D12Shader *)ptr;
return NULL;
}
-2
View File
@@ -656,8 +656,6 @@ public:
class ShaderEntry : public WrappedDeviceChild12<ID3D12DeviceChild>
{
public:
ALLOCATE_WITH_WRAPPED_POOL(ShaderEntry);
static bool m_InternalResources;
static void InternalResources(bool internalResources)