diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-10-08 20:51:30 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-10-08 20:51:30 +0000 |
| commit | bff90b395a3cbcc96a199cf8db95309b13e8e855 (patch) | |
| tree | 9cd99dff9868765f99750fb18127cdcf160bed0a /Graphics | |
| parent | Revert some changes in ShaderResourceLayoutVk, fixed PSO comparison (diff) | |
| download | DiligentCore-bff90b395a3cbcc96a199cf8db95309b13e8e855.tar.gz DiligentCore-bff90b395a3cbcc96a199cf8db95309b13e8e855.zip | |
formating
Diffstat (limited to 'Graphics')
3 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp index 48b24c04..e6e6a84f 100644 --- a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp @@ -113,7 +113,7 @@ PipelineStateGLImpl::PipelineStateGLImpl(IReferenceCounters* pRefCoun else { std::vector<IShader*> Shaders; - SHADER_TYPE ActiveStages = SHADER_TYPE_UNKNOWN; + SHADER_TYPE ActiveStages = SHADER_TYPE_UNKNOWN; for (size_t i = 0; i < ShaderStages.size(); ++i) { Shaders.push_back(ShaderStages[i].second); diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp index 4d29093d..c6432f4a 100644 --- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp +++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp @@ -308,7 +308,7 @@ public: { return m_pResources->GetShaderType(); } - + const SPIRVShaderResources& GetResources() const { return *m_pResources; } const VkResource& GetResource(SHADER_RESOURCE_VARIABLE_TYPE VarType, Uint32 r) const diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index f40f22c8..881196ec 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -575,7 +575,7 @@ bool PipelineStateVkImpl::IsCompatibleWith(const IPipelineState* pPSO) const IsCompatibleShaders = false; break; } - + const auto& Res0 = GetShaderResLayout(s).GetResources(); const auto& Res1 = pPSOVk->GetShaderResLayout(s).GetResources(); if (!Res0.IsCompatibleWith(Res1)) |