diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-03-03 07:59:59 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-03-03 07:59:59 +0000 |
| commit | fcb0730b65c01f8e7f3a7d8085141b960100fec7 (patch) | |
| tree | 2b118d0da0ed68366fa121302723957438c66355 /Graphics/GraphicsEngineVulkan | |
| parent | Partially reworked ShaderResourceLayoutD3D11 (diff) | |
| download | DiligentCore-fcb0730b65c01f8e7f3a7d8085141b960100fec7.tar.gz DiligentCore-fcb0730b65c01f8e7f3a7d8085141b960100fec7.zip | |
Minor update to ShaderResourceLayoutVk
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp index 48d117f6..9f212fd4 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp @@ -69,10 +69,10 @@ static Int32 FindImmutableSampler(SHADER_TYPE ShaderType, return -1; } -static SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE ShaderType, - const SPIRVShaderResourceAttribs& Attribs, - const PipelineResourceLayoutDesc& ResourceLayoutDesc, - const char* CombinedSamplerSuffix) +static SHADER_RESOURCE_VARIABLE_TYPE FindShaderVariableType(SHADER_TYPE ShaderType, + const SPIRVShaderResourceAttribs& Attribs, + const PipelineResourceLayoutDesc& ResourceLayoutDesc, + const char* CombinedSamplerSuffix) { if (Attribs.Type == SPIRVShaderResourceAttribs::ResourceType::SeparateSampler) { @@ -120,7 +120,7 @@ void ShaderResourceLayoutVk::AllocateMemory(std::shared_ptr<const SPIRVShaderRes m_pResources->ProcessResources( [&](const SPIRVShaderResourceAttribs& ResAttribs, Uint32) { - auto VarType = GetShaderVariableType(ShaderType, ResAttribs, ResourceLayoutDesc, CombinedSamplerSuffix); + auto VarType = FindShaderVariableType(ShaderType, ResAttribs, ResourceLayoutDesc, CombinedSamplerSuffix); if (IsAllowedType(VarType, AllowedTypeBits)) { // For immutable separate samplers we still allocate VkResource instances, but they are never exposed to the app @@ -187,7 +187,7 @@ void ShaderResourceLayoutVk::InitializeStaticResourceLayout(std::shared_ptr<cons m_pResources->ProcessResources( [&](const SPIRVShaderResourceAttribs& Attribs, Uint32) { - auto VarType = GetShaderVariableType(ShaderType, Attribs, ResourceLayoutDesc, CombinedSamplerSuffix); + auto VarType = FindShaderVariableType(ShaderType, Attribs, ResourceLayoutDesc, CombinedSamplerSuffix); if (!IsAllowedType(VarType, AllowedTypeBits)) return; @@ -345,7 +345,7 @@ void ShaderResourceLayoutVk::Initialize(IRenderDevice* const SPIRVShaderResourceAttribs& Attribs) { const auto ShaderType = Resources.GetShaderType(); - const SHADER_RESOURCE_VARIABLE_TYPE VarType = GetShaderVariableType(ShaderType, Attribs, ResourceLayoutDesc, Resources.GetCombinedSamplerSuffix()); + const SHADER_RESOURCE_VARIABLE_TYPE VarType = FindShaderVariableType(ShaderType, Attribs, ResourceLayoutDesc, Resources.GetCombinedSamplerSuffix()); if (!IsAllowedType(VarType, AllowedTypeBits)) return; |