From 78fa6c94992a6d1a140da1354448a004e62c9683 Mon Sep 17 00:00:00 2001 From: azhirnov Date: Sat, 6 Feb 2021 00:35:37 +0300 Subject: merged with resource_signature --- Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp | 9 --------- Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp | 7 ++++++- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'Graphics/GraphicsEngineD3DBase') diff --git a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp index c51c0ce7..4a6930c8 100644 --- a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp +++ b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp @@ -221,15 +221,6 @@ public: return BindPoint != InvalidBindPoint; } - String GetPrintName(Uint32 ArrayInd) const - { - VERIFY_EXPR(ArrayInd < BindCount); - if (BindCount > 1) - return String(Name) + '[' + std::to_string(ArrayInd) + ']'; - else - return Name; - } - bool IsCompatibleWith(const D3DShaderResourceAttribs& Attribs) const { return BindPoint == Attribs.BindPoint && diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp index 29f82d86..4694a44f 100644 --- a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp +++ b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp @@ -427,7 +427,8 @@ HLSLShaderResourceDesc D3DShaderResourceAttribs::GetHLSLResourceDesc() const ResourceDesc.Name = Name; ResourceDesc.ArraySize = BindCount; ResourceDesc.ShaderRegister = BindPoint; - switch (GetInputType()) + + switch (static_cast(GetInputType())) { case D3D_SIT_CBUFFER: ResourceDesc.Type = SHADER_RESOURCE_TYPE_CONSTANT_BUFFER; @@ -463,6 +464,10 @@ HLSLShaderResourceDesc D3DShaderResourceAttribs::GetHLSLResourceDesc() const ResourceDesc.Type = SHADER_RESOURCE_TYPE_BUFFER_UAV; break; + case D3D_SIT_RTACCELERATIONSTRUCTURE: + ResourceDesc.Type = SHADER_RESOURCE_TYPE_ACCEL_STRUCT; + break; + default: UNEXPECTED("Unknown input type"); } -- cgit v1.2.3