From 8abd052c11b3121f6c8a1830b3cfeb388e01ba57 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 12 May 2018 23:23:56 -0700 Subject: Added texel uniform/storage buffer detection --- Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp index bb7431a5..ff79ab41 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp @@ -399,8 +399,8 @@ void ShaderResourceLayoutVk::VkResource::CacheTexelBuffer(IDeviceObject* VkDescriptorSet vkDescrSet, Uint32 ArrayInd) { - VERIFY(SpirvAttribs.Type == SPIRVShaderResourceAttribs::ResourceType::UniformBuffer || - SpirvAttribs.Type == SPIRVShaderResourceAttribs::ResourceType::StorageBuffer, + VERIFY(SpirvAttribs.Type == SPIRVShaderResourceAttribs::ResourceType::UniformTexelBuffer || + SpirvAttribs.Type == SPIRVShaderResourceAttribs::ResourceType::StorageTexelBuffer, "Uniform or storage buffer resource is expected"); if (UpdateCachedResource(DstRes, ArrayInd, pBufferView, IID_BufferViewVk, "buffer view")) @@ -534,7 +534,12 @@ void ShaderResourceLayoutVk::VkResource::BindResource(IDeviceObject *pObj, Uint3 case SPIRVShaderResourceAttribs::ResourceType::StorageBuffer: CacheBuffer(pObj, DstRes, vkDescrSet, ArrayIndex); break; - + + case SPIRVShaderResourceAttribs::ResourceType::UniformTexelBuffer: + case SPIRVShaderResourceAttribs::ResourceType::StorageTexelBuffer: + CacheTexelBuffer(pObj, DstRes, vkDescrSet, ArrayIndex); + break; + case SPIRVShaderResourceAttribs::ResourceType::StorageImage: case SPIRVShaderResourceAttribs::ResourceType::SeparateImage: case SPIRVShaderResourceAttribs::ResourceType::SampledImage: -- cgit v1.2.3