Fixed a Vulkan validation warning when using a Raytracing Acceleratio…

…n structure in an unbounded array (o3de#15475) Signed-off-by: Martin Sattlecker <[email protected]>
chilltk · Mar 30, 2023 · b3ef3a9 · b3ef3a9
1 parent 508cef4
commit b3ef3a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp
@@ -372,7 +372,7 @@ namespace AZ
                         // acceleration structure descriptor is added as the pNext in the VkWriteDescriptorSet
                         VkWriteDescriptorSetAccelerationStructureKHR writeAccelerationStructure = {};
                         writeAccelerationStructure.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR;
-                        writeAccelerationStructure.accelerationStructureCount = 1;
+                        writeAccelerationStructure.accelerationStructureCount = interval.m_max - interval.m_min;
                         writeAccelerationStructure.pAccelerationStructures = updateData.m_accelerationStructures.data() + interval.m_min;
                         writeAccelerationStructureDescs.push_back(AZStd::move(writeAccelerationStructure));
 
@@ -416,6 +416,7 @@ namespace AZ
                     case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
                     case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
                     case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
+                    case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR:
                         unboundedArraySize = aznumeric_cast<uint32_t>(updateData.m_bufferViewsInfo.size());
                         break;
                     case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:

diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp
@@ -380,6 +380,9 @@ namespace AZ
                     case RHI::ShaderInputBufferType::Typed:
                         vbinding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
                         break;
+                    case RHI::ShaderInputBufferType::AccelerationStructure:
+                        vbinding.descriptorType = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;
+                        break;
                     default:
                         vbinding.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
                         break;