From 76a1a90ee26e3f2e78fab018bbbfc43ddc85d849 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Wed, 6 Mar 2019 10:03:57 -0800 Subject: Removed unused m_ResourceLayout member from ShaderVariableManagerVk and ShaderVariableManagerD3D12 plus a bunch of minor updates to fix clang warnings --- Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h b/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h index 1b650828..95659276 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h +++ b/Graphics/GraphicsEngineOpenGL/include/GLProgramResources.h @@ -148,7 +148,7 @@ namespace Diligent } }; - struct UniformBufferInfo : GLProgramVariableBase + struct UniformBufferInfo final : GLProgramVariableBase { UniformBufferInfo (const UniformBufferInfo&) = delete; UniformBufferInfo& operator= (const UniformBufferInfo&) = delete; @@ -183,7 +183,7 @@ namespace Diligent static_assert( (sizeof(UniformBufferInfo) % sizeof(void*)) == 0, "sizeof(UniformBufferInfo) must be multiple of sizeof(void*)"); - struct SamplerInfo : GLProgramVariableBase + struct SamplerInfo final : GLProgramVariableBase { SamplerInfo (const SamplerInfo&) = delete; SamplerInfo& operator= (const SamplerInfo&) = delete; @@ -225,7 +225,7 @@ namespace Diligent static_assert( (sizeof(SamplerInfo) % sizeof(void*)) == 0, "sizeof(SamplerInfo) must be multiple of sizeof(void*)"); - struct ImageInfo : GLProgramVariableBase + struct ImageInfo final : GLProgramVariableBase { ImageInfo (const ImageInfo&) = delete; ImageInfo& operator= (const ImageInfo&) = delete; @@ -264,7 +264,7 @@ namespace Diligent static_assert( (sizeof(ImageInfo) % sizeof(void*)) == 0, "sizeof(ImageInfo) must be multiple of sizeof(void*)"); - struct StorageBlockInfo : GLProgramVariableBase + struct StorageBlockInfo final : GLProgramVariableBase { StorageBlockInfo (const StorageBlockInfo&) = delete; StorageBlockInfo& operator= (const StorageBlockInfo&) = delete; -- cgit v1.2.3