diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-10-07 21:12:45 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-10-07 21:12:45 +0000 |
| commit | c75307ce6d2d3d18b9ad7ba0bbcf2e2e59ba5a2c (patch) | |
| tree | 8ed496ca42fc711e1ff9ac344b17e6a0c0824cfb /Graphics/GraphicsEngine | |
| parent | Fixed typo (diff) | |
| download | DiligentCore-c75307ce6d2d3d18b9ad7ba0bbcf2e2e59ba5a2c.tar.gz DiligentCore-c75307ce6d2d3d18b9ad7ba0bbcf2e2e59ba5a2c.zip | |
Few minor updates
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp | 3 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/Shader.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp index 5648e39d..f82f18cf 100644 --- a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp +++ b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp @@ -32,6 +32,7 @@ #include <vector> +#include "Atomics.hpp" #include "ShaderResourceVariable.h" #include "PipelineState.h" #include "StringTools.hpp" @@ -340,7 +341,7 @@ template <typename ResourceLayoutType, struct ShaderVariableBase : public ResourceVariableBaseInterface { ShaderVariableBase(ResourceLayoutType& ParentResLayout) : - m_ParentResLayout(ParentResLayout) + m_ParentResLayout{ParentResLayout} { } diff --git a/Graphics/GraphicsEngine/interface/Shader.h b/Graphics/GraphicsEngine/interface/Shader.h index e004f7f1..dce77a82 100644 --- a/Graphics/GraphicsEngine/interface/Shader.h +++ b/Graphics/GraphicsEngine/interface/Shader.h @@ -346,7 +346,9 @@ DILIGENT_TYPED_ENUM(SHADER_RESOURCE_TYPE, Uint8) SHADER_RESOURCE_TYPE_SAMPLER, /// Input attachment in a render pass - SHADER_RESOURCE_TYPE_INPUT_ATTACHMENT + SHADER_RESOURCE_TYPE_INPUT_ATTACHMENT, + + SHADER_RESOURCE_TYPE_LAST = SHADER_RESOURCE_TYPE_INPUT_ATTACHMENT }; // clang-format on |
