diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-01-25 06:06:01 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-01-25 06:06:01 +0000 |
| commit | 6abf2a9082f55588671351db1c38851a2bcde25f (patch) | |
| tree | 718360aeb031f89999ce6d8aa3bcf61ea4d18901 /Graphics/GraphicsEngineVulkan | |
| parent | Few updates to resource signature VK implementation (diff) | |
| download | DiligentCore-6abf2a9082f55588671351db1c38851a2bcde25f.tar.gz DiligentCore-6abf2a9082f55588671351db1c38851a2bcde25f.zip | |
Added first couple of pipeline resource signature tests
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
3 files changed, 4 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp index 2cb20f5c..1a0a476e 100644 --- a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp @@ -29,7 +29,9 @@ /// \file /// Declaration of Diligent::DeviceContextVkImpl class + #include <unordered_map> +#include <bitset> #include "DeviceContextVk.h" #include "DeviceContextNextGenBase.hpp" diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp index 87bc319a..409cca1a 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp @@ -29,13 +29,11 @@ /// \file /// Declaration of Diligent::PipelineResourceSignatureVkImpl class + #include <array> -#include <bitset> #include "PipelineResourceSignatureBase.hpp" #include "VulkanUtilities/VulkanObjectWrappers.hpp" -#include "VulkanUtilities/VulkanLogicalDevice.hpp" -#include "VulkanUtilities/VulkanCommandBuffer.hpp" #include "SRBMemoryAllocator.hpp" namespace Diligent @@ -43,7 +41,6 @@ namespace Diligent class RenderDeviceVkImpl; class ShaderResourceCacheVk; class ShaderVariableManagerVk; -class DeviceContextVkImpl; enum class DescriptorType : Uint8 { diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index 4ee76d8c..ce8114b9 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -761,7 +761,7 @@ void PipelineStateVkImpl::InitPipelineLayout(const PipelineStateCreateInfo& Crea PIPELINE_RESOURCE_FLAGS Flags; GetShaderResourceTypeAndFlags(Res.Type, Type, Flags); - Resources.emplace_back(Res.Name, Res.ArraySize, Type, Stage.Type, DefaultVarType, Flags); + Resources.emplace_back(Stage.Type, Res.Name, Res.ArraySize, Type, DefaultVarType, Flags); } else { |