From 6e75dd99a14c390f7ef20b26025bcbd73a402a20 Mon Sep 17 00:00:00 2001 From: assiduous Date: Thu, 28 Jan 2021 14:56:04 -0800 Subject: Renamed PIPELINE_RESOURCE_FLAG_COMBINED_IMAGE to PIPELINE_RESOURCE_FLAG_COMBINED_SAMPLER, added combined sampler PRS test --- Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp | 4 ++-- Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp index 408a784a..614f8f6e 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp @@ -99,7 +99,7 @@ inline VkDescriptorType GetVkDescriptorType(DescriptorType Type) DescriptorType GetDescriptorType(const PipelineResourceDesc& Res) { const bool WithDynamicOffset = (Res.Flags & PIPELINE_RESOURCE_FLAG_NO_DYNAMIC_BUFFERS) == 0; - const bool CombinedSampler = (Res.Flags & PIPELINE_RESOURCE_FLAG_COMBINED_IMAGE) != 0; + const bool CombinedSampler = (Res.Flags & PIPELINE_RESOURCE_FLAG_COMBINED_SAMPLER) != 0; const bool UseTexelBuffer = (Res.Flags & PIPELINE_RESOURCE_FLAG_FORMATTED_BUFFER) != 0; static_assert(SHADER_RESOURCE_TYPE_LAST == SHADER_RESOURCE_TYPE_ACCEL_STRUCT, "Please update the switch below to handle the new shader resource type"); @@ -115,7 +115,7 @@ DescriptorType GetDescriptorType(const PipelineResourceDesc& Res) (WithDynamicOffset ? DescriptorType::StorageBufferDynamic : DescriptorType::StorageBuffer); case SHADER_RESOURCE_TYPE_TEXTURE_SRV: - VERIFY_EXPR((Res.Flags & ~PIPELINE_RESOURCE_FLAG_COMBINED_IMAGE) == 0); + VERIFY_EXPR((Res.Flags & ~PIPELINE_RESOURCE_FLAG_COMBINED_SAMPLER) == 0); return CombinedSampler ? DescriptorType::CombinedImageSampler : DescriptorType::SeparateImage; case SHADER_RESOURCE_TYPE_BUFFER_SRV: diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp index ac260c8d..c7e81769 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp @@ -541,7 +541,7 @@ void GetShaderResourceTypeAndFlags(SPIRVShaderResourceAttribs::ResourceType Type case SPIRVShaderResourceAttribs::ResourceType::SampledImage: OutType = SHADER_RESOURCE_TYPE_TEXTURE_SRV; - OutFlags = PIPELINE_RESOURCE_FLAG_COMBINED_IMAGE; + OutFlags = PIPELINE_RESOURCE_FLAG_COMBINED_SAMPLER; break; case SPIRVShaderResourceAttribs::ResourceType::AtomicCounter: -- cgit v1.2.3