diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-11-06 05:05:20 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-11-06 05:05:20 +0000 |
| commit | 5531240cdeea37a07f549360c45f50c23e78e39b (patch) | |
| tree | a4045d8eb10ceedc9a92497bca855a17f3b46a07 /Graphics/GraphicsEngine | |
| parent | GraphicsEngineBase: removed pch.h (diff) | |
| download | DiligentCore-5531240cdeea37a07f549360c45f50c23e78e39b.tar.gz DiligentCore-5531240cdeea37a07f549360c45f50c23e78e39b.zip | |
Fixed gcc error plus few minor updates
Diffstat (limited to 'Graphics/GraphicsEngine')
4 files changed, 4 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngine/include/FramebufferBase.hpp b/Graphics/GraphicsEngine/include/FramebufferBase.hpp index fc008d73..ca386375 100644 --- a/Graphics/GraphicsEngine/include/FramebufferBase.hpp +++ b/Graphics/GraphicsEngine/include/FramebufferBase.hpp @@ -66,7 +66,7 @@ public: TDeviceObjectBase{pRefCounters, pDevice, Desc, bIsDeviceInternal}, m_pRenderPass{Desc.pRenderPass} { - ValidateFramebufferDesc(Desc); + ValidateFramebufferDesc(this->m_Desc); if (this->m_Desc.AttachmentCount > 0) { diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp index 5245c589..3f92416d 100644 --- a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp +++ b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp @@ -33,6 +33,7 @@ #include <array> #include <vector> #include <unordered_map> +#include <unordered_set> #include "PipelineState.h" #include "DeviceObjectBase.hpp" diff --git a/Graphics/GraphicsEngine/include/RenderPassBase.hpp b/Graphics/GraphicsEngine/include/RenderPassBase.hpp index fbc65dd7..f98d89da 100644 --- a/Graphics/GraphicsEngine/include/RenderPassBase.hpp +++ b/Graphics/GraphicsEngine/include/RenderPassBase.hpp @@ -81,7 +81,7 @@ public: bool bIsDeviceInternal = false) : TDeviceObjectBase{pRefCounters, pDevice, Desc, bIsDeviceInternal} { - ValidateRenderPassDesc(Desc); + ValidateRenderPassDesc(this->m_Desc); if (Desc.AttachmentCount != 0) { diff --git a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp index cc657844..32a728f5 100644 --- a/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp +++ b/Graphics/GraphicsEngine/include/ShaderBindingTableBase.hpp @@ -64,7 +64,7 @@ public: bool bIsDeviceInternal = false) : TDeviceObjectBase{pRefCounters, pDevice, Desc, bIsDeviceInternal} { - ValidateShaderBindingTableDesc(Desc); + ValidateShaderBindingTableDesc(this->m_Desc); this->m_pPSO = ValidatedCast<PipelineStateImplType>(this->m_Desc.pPSO); this->m_ShaderRecordSize = this->m_pPSO->GetRayTracingPipelineDesc().ShaderRecordSize; |