diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-03-11 21:32:24 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:38:20 +0000 |
| commit | 9ca931f1cb24625b93947ec2be0a84bb61586765 (patch) | |
| tree | d534b786989f2a08be67a7212e44de0f3d18081a /Graphics/GraphicsEngineVulkan | |
| parent | Updated resource binding validation (diff) | |
| download | DiligentCore-9ca931f1cb24625b93947ec2be0a84bb61586765.tar.gz DiligentCore-9ca931f1cb24625b93947ec2be0a84bb61586765.zip | |
Some minor/cosmetic changes
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp | 32 |
2 files changed, 12 insertions, 24 deletions
diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp index e4fce2b8..e01abac9 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp @@ -923,10 +923,6 @@ bool PipelineResourceSignatureVkImpl::DvpValidateCommittedResource(const SPIRVSh if (!ValidateResourceViewDimension(SPIRVAttribs.Name, SPIRVAttribs.ArraySize, ArrIndex, pTexViewVk, SPIRVAttribs.GetResourceDimension(), SPIRVAttribs.IsMultisample())) BindingsOK = false; } - else - { - // Missing resource error is logged by BindResourceHelper::CacheImage - } break; default: diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp index 83058f38..10dfbbab 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp @@ -547,11 +547,9 @@ template void ShaderResourceCacheVk::TransitionResources<true>(DeviceContextVkIm VkDescriptorBufferInfo ShaderResourceCacheVk::Resource::GetUniformBufferDescriptorWriteInfo() const { - // clang-format off - VERIFY(Type == DescriptorType::UniformBuffer || - Type == DescriptorType::UniformBufferDynamic, + VERIFY((Type == DescriptorType::UniformBuffer || + Type == DescriptorType::UniformBufferDynamic), "Uniform buffer resource is expected"); - // clang-format on DEV_CHECK_ERR(pObject != nullptr, "Unable to get uniform buffer write info: cached object is null"); const auto* pBuffVk = pObject.RawPtr<const BufferVkImpl>(); @@ -572,13 +570,11 @@ VkDescriptorBufferInfo ShaderResourceCacheVk::Resource::GetUniformBufferDescript VkDescriptorBufferInfo ShaderResourceCacheVk::Resource::GetStorageBufferDescriptorWriteInfo() const { - // clang-format off - VERIFY(Type == DescriptorType::StorageBuffer || - Type == DescriptorType::StorageBufferDynamic || - Type == DescriptorType::StorageBuffer_ReadOnly || - Type == DescriptorType::StorageBufferDynamic_ReadOnly, + VERIFY((Type == DescriptorType::StorageBuffer || + Type == DescriptorType::StorageBufferDynamic || + Type == DescriptorType::StorageBuffer_ReadOnly || + Type == DescriptorType::StorageBufferDynamic_ReadOnly), "Storage buffer resource is expected"); - // clang-format on DEV_CHECK_ERR(pObject != nullptr, "Unable to get storage buffer write info: cached object is null"); const auto* pBuffViewVk = pObject.RawPtr<const BufferViewVkImpl>(); @@ -622,12 +618,10 @@ VkDescriptorBufferInfo ShaderResourceCacheVk::Resource::GetStorageBufferDescript VkDescriptorImageInfo ShaderResourceCacheVk::Resource::GetImageDescriptorWriteInfo() const { - // clang-format off - VERIFY(Type == DescriptorType::StorageImage || - Type == DescriptorType::SeparateImage || - Type == DescriptorType::CombinedImageSampler, + VERIFY((Type == DescriptorType::StorageImage || + Type == DescriptorType::SeparateImage || + Type == DescriptorType::CombinedImageSampler), "Storage image, separate image or sampled image resource is expected"); - // clang-format on DEV_CHECK_ERR(pObject != nullptr, "Unable to get image descriptor write info: cached object is null"); bool IsStorageImage = (Type == DescriptorType::StorageImage); @@ -679,12 +673,10 @@ VkDescriptorImageInfo ShaderResourceCacheVk::Resource::GetImageDescriptorWriteIn VkBufferView ShaderResourceCacheVk::Resource::GetBufferViewWriteInfo() const { - // clang-format off - VERIFY(Type == DescriptorType::UniformTexelBuffer || - Type == DescriptorType::StorageTexelBuffer || - Type == DescriptorType::StorageTexelBuffer_ReadOnly, + VERIFY((Type == DescriptorType::UniformTexelBuffer || + Type == DescriptorType::StorageTexelBuffer || + Type == DescriptorType::StorageTexelBuffer_ReadOnly), "Uniform or storage buffer resource is expected"); - // clang-format on DEV_CHECK_ERR(pObject != nullptr, "Unable to get buffer view write info: cached object is null"); // The following bits must have been set at buffer creation time: |