birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6377 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16886

Browse Source 
Vulkan validation fixes for RayTracing
This commit is contained in:
dmcdiarmid-ly
2021-12-13 12:46:53 -07:00
committed by GitHub
parent c444978648 da8967d570
commit d5980da3d4
12 changed files with 88 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/BufferDescriptor.h
+5 -1
View File
@@ -61,7 +61,11 @@ namespace AZ
(RayTracingAccelerationStructure , AZ_BIT(9)),
/// Supports ray tracing shader table usage.
(RayTracingShaderTable , AZ_BIT(10)));
(RayTracingShaderTable , AZ_BIT(10)),
/// Supports ray tracing scratch buffer usage.
(RayTracingScratchBuffer, AZ_BIT(11)));
AZ_DEFINE_ENUM_BITWISE_OPERATORS(AZ::RHI::BufferBindFlags);
Gems/Atom/RHI/Code/Include/Atom/RHI/RayTracingBufferPools.h
+1 -1
View File
@@ -44,7 +44,7 @@ namespace AZ
RayTracingBufferPools() = default;
virtual RHI::BufferBindFlags GetShaderTableBufferBindFlags() const { return RHI::BufferBindFlags::ShaderRead | RHI::BufferBindFlags::CopyRead | RHI::BufferBindFlags::RayTracingShaderTable; }
virtual RHI::BufferBindFlags GetScratchBufferBindFlags() const { return RHI::BufferBindFlags::ShaderReadWrite; }
virtual RHI::BufferBindFlags GetScratchBufferBindFlags() const { return RHI::BufferBindFlags::ShaderReadWrite | RHI::BufferBindFlags::RayTracingScratchBuffer; }
virtual RHI::BufferBindFlags GetBlasBufferBindFlags() const { return RHI::BufferBindFlags::ShaderReadWrite | RHI::BufferBindFlags::RayTracingAccelerationStructure; }
virtual RHI::BufferBindFlags GetTlasInstancesBufferBindFlags() const { return RHI::BufferBindFlags::ShaderRead; }
virtual RHI::BufferBindFlags GetTlasBufferBindFlags() const { return RHI::BufferBindFlags::RayTracingAccelerationStructure; }
Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ namespace AZ
// create scratch buffer
buffers.m_scratchBuffer = RHI::Factory::Get().CreateBuffer();
AZ::RHI::BufferDescriptor scratchBufferDescriptor;
scratchBufferDescriptor.m_bindFlags = RHI::BufferBindFlags::ShaderReadWrite;
scratchBufferDescriptor.m_bindFlags = RHI::BufferBindFlags::ShaderReadWrite | RHI::BufferBindFlags::RayTracingScratchBuffer;
scratchBufferDescriptor.m_byteCount = prebuildInfo.ScratchDataSizeInBytes;
AZ::RHI::BufferInitRequest scratchBufferRequest;
Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ namespace AZ
// create scratch buffer
buffers.m_scratchBuffer = RHI::Factory::Get().CreateBuffer();
AZ::RHI::BufferDescriptor scratchBufferDescriptor;
scratchBufferDescriptor.m_bindFlags = RHI::BufferBindFlags::ShaderReadWrite;
scratchBufferDescriptor.m_bindFlags = RHI::BufferBindFlags::ShaderReadWrite | RHI::BufferBindFlags::RayTracingScratchBuffer;
scratchBufferDescriptor.m_byteCount = prebuildInfo.ScratchDataSizeInBytes;
AZ::RHI::BufferInitRequest scratchBufferRequest;
Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp
+14 -9
View File
@@ -736,7 +736,7 @@ namespace AZ
if (RHI::CheckBitsAny(bindFlags, BindFlags::RayTracingAccelerationStructure))
{
usageFlags |= VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR;
usageFlags |= VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR;
}
if (RHI::CheckBitsAny(bindFlags, BindFlags::RayTracingShaderTable))
@@ -756,7 +756,7 @@ namespace AZ
{
return RHI::CheckBitsAny(
bindFlags,
RHI::BufferBindFlags::InputAssembly | RHI::BufferBindFlags::DynamicInputAssembly | RHI::BufferBindFlags::RayTracingShaderTable);
RHI::BufferBindFlags::InputAssembly | RHI::BufferBindFlags::DynamicInputAssembly | RHI::BufferBindFlags::RayTracingShaderTable | RHI::BufferBindFlags::RayTracingAccelerationStructure | RHI::BufferBindFlags::RayTracingScratchBuffer);
}
VkPipelineStageFlags GetSupportedPipelineStages(RHI::PipelineStateType type)
@@ -1154,15 +1154,20 @@ namespace AZ
return RHI::CheckBitsAny(usagesAndAccesses.front().m_access, RHI::ScopeAttachmentAccess::Write) ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
case RHI::ScopeAttachmentUsage::Shader:
case RHI::ScopeAttachmentUsage::SubpassInput:
// If we are reading from a depth/stencil texture, then we use the depth/stencil read optimal layout instead of the generic shader read one.
if (RHI::CheckBitsAny(imageAspects, RHI::ImageAspectFlags::DepthStencil))
{
return RHI::CheckBitsAny(usagesAndAccesses.front().m_access, RHI::ScopeAttachmentAccess::Write) ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
// always set VK_IMAGE_LAYOUT_GENERAL if the Image is ShaderWrite, even in a read scope
if (RHI::CheckBitsAny(usagesAndAccesses.front().m_access, RHI::ScopeAttachmentAccess::Write) ||
RHI::CheckBitsAny(imageView->GetImage().GetDescriptor().m_bindFlags, RHI::ImageBindFlags::ShaderWrite))
{
return VK_IMAGE_LAYOUT_GENERAL;
}
else
{
// if we are reading from a depth/stencil texture, then we use the depth/stencil read optimal layout instead of the generic shader read one
return RHI::CheckBitsAny(imageAspects, RHI::ImageAspectFlags::DepthStencil) ?
VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
}
}
else
{
return RHI::CheckBitsAny(usagesAndAccesses.front().m_access, RHI::ScopeAttachmentAccess::Write) ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
}
case RHI::ScopeAttachmentUsage::Copy:
return RHI::CheckBitsAny(usagesAndAccesses.front().m_access, RHI::ScopeAttachmentAccess::Write) ? VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL : VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
default:
Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp
+7 -6
View File
@@ -149,16 +149,17 @@ namespace AZ
{
imageInfo.imageView = imageView->GetNativeImageView();
// Depending on the access (read or readwrite) and if it's a depth/stencil image, we choose the expected layout.
switch (layout.GetDescriptorType(layoutIndex))
// always set VK_IMAGE_LAYOUT_GENERAL if the Image is ShaderWrite, even if the descriptor layout wants a read-only input
if (layout.GetDescriptorType(layoutIndex) == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE ||
RHI::CheckBitsAny(imageView->GetImage().GetDescriptor().m_bindFlags, RHI::ImageBindFlags::ShaderWrite))
{
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
imageInfo.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
break;
default:
}
else
{
// if we are reading from a depth/stencil texture, then we use the depth/stencil read optimal layout instead of the generic shader read one
imageInfo.imageLayout = RHI::CheckBitsAny(imageView->GetImage().GetAspectFlags(), RHI::ImageAspectFlags::DepthStencil) ?
VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
break;
}
}
Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
+15 -2
View File
@@ -216,11 +216,24 @@ namespace AZ
float16Int8.pNext = &separateDepthStencil;
robustness2.pNext = &float16Int8;
deviceInfo.pNext = &descriptorIndexingFeatures;
}
// set raytracing features if we are running Vulkan >= 1.2
VkPhysicalDeviceAccelerationStructureFeaturesKHR accelerationStructureFeatures = {};
VkPhysicalDeviceRayTracingPipelineFeaturesKHR rayTracingPipelineFeatures = {};
if (majorVersion >= 1 && minorVersion >= 2)
{
accelerationStructureFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR;
accelerationStructureFeatures.accelerationStructure = physicalDevice.GetPhysicalDeviceAccelerationStructureFeatures().accelerationStructure;
vulkan12Features.pNext = &accelerationStructureFeatures;
rayTracingPipelineFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR;
rayTracingPipelineFeatures.rayTracingPipeline = physicalDevice.GetPhysicalDeviceRayTracingPipelineFeatures().rayTracingPipeline;
accelerationStructureFeatures.pNext = &rayTracingPipelineFeatures;
}
deviceInfo.flags = 0;
deviceInfo.queueCreateInfoCount = static_cast<uint32_t>(queueCreationInfo.size());
deviceInfo.pQueueCreateInfos = queueCreationInfo.data();
Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp
+20
View File
@@ -111,11 +111,21 @@ namespace AZ
return m_accelerationStructureProperties;
}
const VkPhysicalDeviceAccelerationStructureFeaturesKHR& PhysicalDevice::GetPhysicalDeviceAccelerationStructureFeatures() const
{
return m_accelerationStructureFeatures;
}
const VkPhysicalDeviceRayTracingPipelinePropertiesKHR& PhysicalDevice::GetPhysicalDeviceRayTracingPipelineProperties() const
{
return m_rayTracingPipelineProperties;
}
const VkPhysicalDeviceRayTracingPipelineFeaturesKHR& PhysicalDevice::GetPhysicalDeviceRayTracingPipelineFeatures() const
{
return m_rayTracingPipelineFeatures;
}
const VkPhysicalDeviceShaderFloat16Int8FeaturesKHR& PhysicalDevice::GetPhysicalDeviceFloat16Int8Features() const
{
return m_float16Int8Features;
@@ -349,6 +359,16 @@ namespace AZ
vulkan12Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES;
separateDepthStencilFeatures.pNext = &vulkan12Features;
VkPhysicalDeviceAccelerationStructureFeaturesKHR& accelerationStructureFeatures = m_accelerationStructureFeatures;
accelerationStructureFeatures = {};
accelerationStructureFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR;
vulkan12Features.pNext = &accelerationStructureFeatures;
VkPhysicalDeviceRayTracingPipelineFeaturesKHR& rayTracingPipelineFeatures = m_rayTracingPipelineFeatures;
rayTracingPipelineFeatures = {};
rayTracingPipelineFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR;
accelerationStructureFeatures.pNext = &rayTracingPipelineFeatures;
VkPhysicalDeviceFeatures2 deviceFeatures2 = {};
deviceFeatures2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
deviceFeatures2.pNext = &descriptorIndexingFeatures;
Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.h
+4
View File
@@ -82,7 +82,9 @@ namespace AZ
const VkPhysicalDeviceVulkan12Features& GetPhysicalDeviceVulkan12Features() const;
const VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR& GetPhysicalDeviceSeparateDepthStencilFeatures() const;
const VkPhysicalDeviceAccelerationStructurePropertiesKHR& GetPhysicalDeviceAccelerationStructureProperties() const;
const VkPhysicalDeviceAccelerationStructureFeaturesKHR& GetPhysicalDeviceAccelerationStructureFeatures() const;
const VkPhysicalDeviceRayTracingPipelinePropertiesKHR& GetPhysicalDeviceRayTracingPipelineProperties() const;
const VkPhysicalDeviceRayTracingPipelineFeaturesKHR& GetPhysicalDeviceRayTracingPipelineFeatures() const;
VkFormatProperties GetFormatProperties(RHI::Format format, bool raiseAsserts = true) const;
StringList GetDeviceLayerNames() const;
StringList GetDeviceExtensionNames(const char* layerName = nullptr) const;
@@ -116,7 +118,9 @@ namespace AZ
VkPhysicalDeviceBufferDeviceAddressFeaturesEXT m_bufferDeviceAddressFeatures{};
VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR m_separateDepthStencilFeatures{};
VkPhysicalDeviceAccelerationStructurePropertiesKHR m_accelerationStructureProperties{};
VkPhysicalDeviceAccelerationStructureFeaturesKHR m_accelerationStructureFeatures{};
VkPhysicalDeviceRayTracingPipelinePropertiesKHR m_rayTracingPipelineProperties{};
VkPhysicalDeviceRayTracingPipelineFeaturesKHR m_rayTracingPipelineFeatures{};
VkPhysicalDeviceVulkan12Features m_vulkan12Features{};
};
}
Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ namespace AZ
// create scratch buffer
buffers.m_scratchBuffer = RHI::Factory::Get().CreateBuffer();
AZ::RHI::BufferDescriptor scratchBufferDescriptor;
scratchBufferDescriptor.m_bindFlags = RHI::BufferBindFlags::ShaderReadWrite;
scratchBufferDescriptor.m_bindFlags = RHI::BufferBindFlags::ShaderReadWrite | RHI::BufferBindFlags::RayTracingScratchBuffer;
scratchBufferDescriptor.m_byteCount = buildSizesInfo.buildScratchSize;
AZ::RHI::BufferInitRequest scratchBufferRequest;
Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ namespace AZ
// create scratch buffer
buffers.m_scratchBuffer = RHI::Factory::Get().CreateBuffer();
AZ::RHI::BufferDescriptor scratchBufferDescriptor;
scratchBufferDescriptor.m_bindFlags = RHI::BufferBindFlags::ShaderReadWrite;
scratchBufferDescriptor.m_bindFlags = RHI::BufferBindFlags::ShaderReadWrite | RHI::BufferBindFlags::RayTracingScratchBuffer;
scratchBufferDescriptor.m_byteCount = buildSizesInfo.buildScratchSize;
AZ::RHI::BufferInitRequest scratchBufferRequest;
Gems/Atom/RHI/Vulkan/External/glad/2.0.0-beta/include/glad/vulkan.h
Vendored
+18 -12
View File
@@ -8028,19 +8028,25 @@ typedef struct VkBindAccelerationStructureMemoryInfoKHR {
typedef struct VkBindAccelerationStructureMemoryInfoKHR VkBindAccelerationStructureMemoryInfoNV;
typedef struct VkPhysicalDeviceRayTracingFeaturesKHR {
typedef struct VkPhysicalDeviceRayTracingPipelineFeaturesKHR {
VkStructureType sType;
void * pNext;
VkBool32 rayTracing;
VkBool32 rayTracingShaderGroupHandleCaptureReplay;
VkBool32 rayTracingShaderGroupHandleCaptureReplayMixed;
VkBool32 rayTracingAccelerationStructureCaptureReplay;
VkBool32 rayTracingIndirectTraceRays;
VkBool32 rayTracingIndirectAccelerationStructureBuild;
VkBool32 rayTracingHostAccelerationStructureCommands;
VkBool32 rayQuery;
VkBool32 rayTracingPrimitiveCulling;
} VkPhysicalDeviceRayTracingFeaturesKHR;
void* pNext;
VkBool32 rayTracingPipeline;
VkBool32 rayTracingPipelineShaderGroupHandleCaptureReplay;
VkBool32 rayTracingPipelineShaderGroupHandleCaptureReplayMixed;
VkBool32 rayTracingPipelineTraceRaysIndirect;
VkBool32 rayTraversalPrimitiveCulling;
} VkPhysicalDeviceRayTracingPipelineFeaturesKHR;
typedef struct VkPhysicalDeviceAccelerationStructureFeaturesKHR {
VkStructureType sType;
void* pNext;
VkBool32 accelerationStructure;
VkBool32 accelerationStructureCaptureReplay;
VkBool32 accelerationStructureIndirectBuild;
VkBool32 accelerationStructureHostCommands;
VkBool32 descriptorBindingAccelerationStructureUpdateAfterBind;
} VkPhysicalDeviceAccelerationStructureFeaturesKHR;
typedef struct VkStridedBufferRegionKHR {
VkBuffer buffer;