diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-01-28 22:56:04 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-01-28 22:56:04 +0000 |
| commit | 6e75dd99a14c390f7ef20b26025bcbd73a402a20 (patch) | |
| tree | 72f0bb6d988b82e93dc17e24f7593f400eefab54 /Graphics/GraphicsEngine | |
| parent | Vk backend: added validation of parameters that can't be validated when resou... (diff) | |
| download | DiligentCore-6e75dd99a14c390f7ef20b26025bcbd73a402a20.tar.gz DiligentCore-6e75dd99a14c390f7ef20b26025bcbd73a402a20.zip | |
Renamed PIPELINE_RESOURCE_FLAG_COMBINED_IMAGE to PIPELINE_RESOURCE_FLAG_COMBINED_SAMPLER, added combined sampler PRS test
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/interface/PipelineResourceSignature.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/src/PipelineResourceSignatureBase.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngine/interface/PipelineResourceSignature.h b/Graphics/GraphicsEngine/interface/PipelineResourceSignature.h index 84074250..eb2c9470 100644 --- a/Graphics/GraphicsEngine/interface/PipelineResourceSignature.h +++ b/Graphics/GraphicsEngine/interface/PipelineResourceSignature.h @@ -96,7 +96,7 @@ DILIGENT_TYPED_ENUM(PIPELINE_RESOURCE_FLAGS, Uint8) /// Indicates that a texture SRV will be combined with a sampler. /// Applies to SHADER_RESOURCE_TYPE_TEXTURE_SRV resources. - PIPELINE_RESOURCE_FLAG_COMBINED_IMAGE = 0x02, + PIPELINE_RESOURCE_FLAG_COMBINED_SAMPLER = 0x02, /// Indicates that this variable will be used to bind formatted buffers. /// Applies to SHADER_RESOURCE_TYPE_BUFFER_UAV and SHADER_RESOURCE_TYPE_BUFFER_SRV diff --git a/Graphics/GraphicsEngine/src/PipelineResourceSignatureBase.cpp b/Graphics/GraphicsEngine/src/PipelineResourceSignatureBase.cpp index a1f0556b..5f24eed1 100644 --- a/Graphics/GraphicsEngine/src/PipelineResourceSignatureBase.cpp +++ b/Graphics/GraphicsEngine/src/PipelineResourceSignatureBase.cpp @@ -74,9 +74,9 @@ void ValidatePipelineResourceSignatureDesc(const PipelineResourceSignatureDesc& Res.ResourceType != SHADER_RESOURCE_TYPE_TEXTURE_SRV)) LOG_PRS_ERROR_AND_THROW("Desc.Resources[", i, "].Flags must not contain PIPELINE_RESOURCE_FLAG_NO_DYNAMIC_BUFFERS if ResourceType is not buffer"); - if ((Res.Flags & PIPELINE_RESOURCE_FLAG_COMBINED_IMAGE) && + if ((Res.Flags & PIPELINE_RESOURCE_FLAG_COMBINED_SAMPLER) && Res.ResourceType != SHADER_RESOURCE_TYPE_TEXTURE_SRV) - LOG_PRS_ERROR_AND_THROW("Desc.Resources[", i, "].Flags must not contain PIPELINE_RESOURCE_FLAG_COMBINED_IMAGE if ResourceType is not SHADER_RESOURCE_TYPE_TEXTURE_SRV"); + LOG_PRS_ERROR_AND_THROW("Desc.Resources[", i, "].Flags must not contain PIPELINE_RESOURCE_FLAG_COMBINED_SAMPLER if ResourceType is not SHADER_RESOURCE_TYPE_TEXTURE_SRV"); if ((Res.Flags & PIPELINE_RESOURCE_FLAG_FORMATTED_BUFFER) && (Res.ResourceType != SHADER_RESOURCE_TYPE_BUFFER_UAV && |