From fb19ccb53576b51800e654d37a48a2dfd1a8a913 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 10 Sep 2020 12:23:22 +0100
Subject: [PATCH] Don't pool-allocate D3D12 shaders

---
 renderdoc/driver/d3d12/d3d12_replay.cpp    | 8 +-------
 renderdoc/driver/d3d12/d3d12_resources.cpp | 5 -----
 renderdoc/driver/d3d12/d3d12_resources.h   | 2 --
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp
index ea2364579..b9e74d6b1 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.cpp
+++ b/renderdoc/driver/d3d12/d3d12_replay.cpp
@@ -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();
diff --git a/renderdoc/driver/d3d12/d3d12_resources.cpp b/renderdoc/driver/d3d12/d3d12_resources.cpp
index 669bfb41d..6d000f2ac 100644
--- a/renderdoc/driver/d3d12/d3d12_resources.cpp
+++ b/renderdoc/driver/d3d12/d3d12_resources.cpp
@@ -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;
 }
 
diff --git a/renderdoc/driver/d3d12/d3d12_resources.h b/renderdoc/driver/d3d12/d3d12_resources.h
index a7b11e729..6a092d7c4 100644
--- a/renderdoc/driver/d3d12/d3d12_resources.h
+++ b/renderdoc/driver/d3d12/d3d12_resources.h
@@ -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)