diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-02-28 15:56:53 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-02-28 15:56:53 +0000 |
| commit | a11b4c46b33a49501b81ce638474abd36b89582b (patch) | |
| tree | e67111e272edc8aa63b8f0af538452909dba1ec9 /Graphics/GraphicsEngine | |
| parent | Improved shader resource binding error reporting in ShaderResourceLayoutVk (diff) | |
| download | DiligentCore-a11b4c46b33a49501b81ce638474abd36b89582b.tar.gz DiligentCore-a11b4c46b33a49501b81ce638474abd36b89582b.zip | |
Renamed PipelineLayoutDesc to PipelineResourceLayoutDesc
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/PipelineStateBase.h | 12 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h | 12 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/PipelineState.h | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.h b/Graphics/GraphicsEngine/include/PipelineStateBase.h index fbc492e3..ddc682ef 100644 --- a/Graphics/GraphicsEngine/include/PipelineStateBase.h +++ b/Graphics/GraphicsEngine/include/PipelineStateBase.h @@ -66,7 +66,7 @@ public: m_LayoutElements (PSODesc.GraphicsPipeline.InputLayout.NumElements, LayoutElement{}, STD_ALLOCATOR_RAW_MEM(LayoutElement, GetRawAllocator(), "Allocator for vector<LayoutElement>")), m_NumShaders(0) { - const auto& SrcLayout = PSODesc.Layout; + const auto& SrcLayout = PSODesc.ResourceLayout; size_t StringPoolSize = 0; if (SrcLayout.Variables != nullptr) { @@ -81,7 +81,7 @@ public: } m_StringPool.Reserve(StringPoolSize, GetRawAllocator()); - auto& DstLayout = this->m_Desc.Layout; + auto& DstLayout = this->m_Desc.ResourceLayout; if (SrcLayout.Variables != nullptr) { ShaderResourceVariableDesc* Variables = @@ -266,10 +266,10 @@ public: */ auto& RawAllocator = GetRawAllocator(); - if (this->m_Desc.Layout.Variables != nullptr) - RawAllocator.Free(const_cast<ShaderResourceVariableDesc*>(this->m_Desc.Layout.Variables)); - if (this->m_Desc.Layout.StaticSamplers != nullptr) - RawAllocator.Free(const_cast<StaticSamplerDesc*>(this->m_Desc.Layout.StaticSamplers)); + if (this->m_Desc.ResourceLayout.Variables != nullptr) + RawAllocator.Free(const_cast<ShaderResourceVariableDesc*>(this->m_Desc.ResourceLayout.Variables)); + if (this->m_Desc.ResourceLayout.StaticSamplers != nullptr) + RawAllocator.Free(const_cast<StaticSamplerDesc*>(this->m_Desc.ResourceLayout.StaticSamplers)); } IMPLEMENT_QUERY_INTERFACE_IN_PLACE( IID_PipelineState, TDeviceObjectBase ) diff --git a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h index 5c5629d3..2282a3f7 100644 --- a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h +++ b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h @@ -66,9 +66,9 @@ inline SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE ); } -inline SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE ShaderStage, - const Char* Name, - const PipelineLayoutDesc& LayoutDesc) +inline SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE ShaderStage, + const Char* Name, + const PipelineResourceLayoutDesc& LayoutDesc) { return GetShaderVariableType(ShaderStage, Name, LayoutDesc.DefaultVariableType, LayoutDesc.Variables, LayoutDesc.NumVariables); } @@ -87,9 +87,9 @@ inline SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE ); } -inline SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE ShaderStage, - const String& Name, - const PipelineLayoutDesc& LayoutDesc) +inline SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE ShaderStage, + const String& Name, + const PipelineResourceLayoutDesc& LayoutDesc) { return GetShaderVariableType(ShaderStage, Name, LayoutDesc.DefaultVariableType, LayoutDesc.Variables, LayoutDesc.NumVariables); } diff --git a/Graphics/GraphicsEngine/interface/PipelineState.h b/Graphics/GraphicsEngine/interface/PipelineState.h index 39064c75..61a4e68e 100644 --- a/Graphics/GraphicsEngine/interface/PipelineState.h +++ b/Graphics/GraphicsEngine/interface/PipelineState.h @@ -108,7 +108,7 @@ struct StaticSamplerDesc /// Pipeline layout description -struct PipelineLayoutDesc +struct PipelineResourceLayoutDesc { /// Default shader resource variable type. This type will be used if shader /// variable description is not found in the Variables array @@ -221,7 +221,7 @@ struct PipelineStateDesc : DeviceObjectAttribs Uint64 CommandQueueMask = 1; /// Pipeline layout description - PipelineLayoutDesc Layout; + PipelineResourceLayoutDesc ResourceLayout; /// Graphics pipeline state description. This memeber is ignored if IsComputePipeline == True GraphicsPipelineDesc GraphicsPipeline; |