diff options
| author | azhirnov <zh1dron@gmail.com> | 2021-02-05 21:35:37 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:31:35 +0000 |
| commit | 78fa6c94992a6d1a140da1354448a004e62c9683 (patch) | |
| tree | c21183a39d58ba9ccc89d9d8ea6fe1aa9de2ec35 /Graphics/GraphicsEngineD3DBase | |
| parent | Merged master (diff) | |
| download | DiligentCore-78fa6c94992a6d1a140da1354448a004e62c9683.tar.gz DiligentCore-78fa6c94992a6d1a140da1354448a004e62c9683.zip | |
merged with resource_signature
Diffstat (limited to 'Graphics/GraphicsEngineD3DBase')
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp | 9 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp | 7 |
2 files changed, 6 insertions, 10 deletions
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<Uint32>(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"); } |