Direct3D11: added BindPointsD3D11 instead of TBindPoints and TBindPointsAndActiveBits,

GetShaderResourceTypeAndFlags moved to D3DBase,
added DvpVerifySRBResources() and DvpValidateCommittedResource()

2 files changed, 1 insertions, 58 deletions

diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
index b9df6e0a..8f2dd985 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
@@ -755,7 +755,7 @@ DXGI_FORMAT TypeToRayTracingVertexFormat(VALUE_TYPE ValueType, Uint32 ComponentC
 
 D3D12_DESCRIPTOR_RANGE_TYPE ResourceTypeToD3D12DescriptorRangeType(SHADER_RESOURCE_TYPE ResType)
 {
-    static_assert(SHADER_RESOURCE_TYPE_LAST == SHADER_RESOURCE_TYPE_ACCEL_STRUCT, "Please update the switch below to handle the new resource type");
+    static_assert(SHADER_RESOURCE_TYPE_LAST == 8, "Please update the switch below to handle the new resource type");
 
     switch (ResType)
     {
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
index b03ceade..0e5783f0 100644
--- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
@@ -294,63 +294,6 @@ void GetShaderIdentifiers(ID3D12DeviceChild*                       pSO,
     }
 }
 
-void GetShaderResourceTypeAndFlags(const D3DShaderResourceAttribs& Attribs,
-                                   SHADER_RESOURCE_TYPE&           OutType,
-                                   PIPELINE_RESOURCE_FLAGS&        OutFlags)
-{
-    OutFlags = PIPELINE_RESOURCE_FLAG_UNKNOWN;
-
-    switch (int{Attribs.GetInputType()})
-    {
-        case D3D_SIT_CBUFFER:
-            OutType = SHADER_RESOURCE_TYPE_CONSTANT_BUFFER;
-            break;
-        case D3D_SIT_TBUFFER:
-            UNSUPPORTED("TBuffers are not supported");
-            OutType = SHADER_RESOURCE_TYPE_TEXTURE_SRV;
-            break;
-        case D3D_SIT_TEXTURE:
-            if (Attribs.GetSRVDimension() == D3D_SRV_DIMENSION_BUFFER)
-            {
-                OutType  = SHADER_RESOURCE_TYPE_BUFFER_SRV;
-                OutFlags = PIPELINE_RESOURCE_FLAG_FORMATTED_BUFFER;
-            }
-            else
-                OutType = SHADER_RESOURCE_TYPE_TEXTURE_SRV;
-            break;
-        case D3D_SIT_SAMPLER:
-            OutType = SHADER_RESOURCE_TYPE_SAMPLER;
-            break;
-        case D3D_SIT_UAV_RWTYPED:
-            if (Attribs.GetSRVDimension() == D3D_SRV_DIMENSION_BUFFER)
-            {
-                OutType  = SHADER_RESOURCE_TYPE_BUFFER_UAV;
-                OutFlags = PIPELINE_RESOURCE_FLAG_FORMATTED_BUFFER;
-            }
-            else
-                OutType = SHADER_RESOURCE_TYPE_TEXTURE_UAV;
-            break;
-        case D3D_SIT_STRUCTURED:
-        case D3D_SIT_BYTEADDRESS:
-            OutType = SHADER_RESOURCE_TYPE_BUFFER_SRV;
-            break;
-        case D3D_SIT_UAV_RWSTRUCTURED:
-        case D3D_SIT_UAV_RWBYTEADDRESS:
-        case D3D_SIT_UAV_APPEND_STRUCTURED:
-        case D3D_SIT_UAV_CONSUME_STRUCTURED:
-        case D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER:
-            OutType = SHADER_RESOURCE_TYPE_BUFFER_UAV;
-            break;
-        case D3D_SIT_RTACCELERATIONSTRUCTURE:
-            OutType = SHADER_RESOURCE_TYPE_ACCEL_STRUCT;
-            break;
-        default:
-            UNEXPECTED("Unknown HLSL resource type");
-            OutType = SHADER_RESOURCE_TYPE_UNKNOWN;
-            break;
-    }
-}
-
 void VerifyResourceMerge(const PipelineStateDesc&        PSODesc,
                          const D3DShaderResourceAttribs& ExistingRes,
                          const D3DShaderResourceAttribs& NewResAttribs)