Add missing buffer usage flags to ray tracing acceleration structures (…

…#1022) Fixes #948
KhronosGroup · May 6, 2024 · 234bc13 · 234bc13
1 parent ec7fc61
commit 234bc13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/framework/core/acceleration_structure.cpp b/framework/core/acceleration_structure.cpp
@@ -179,7 +179,7 @@ void AccelerationStructure::build(VkQueue queue, VkBuildAccelerationStructureFla
 		buffer = std::make_unique<vkb::core::Buffer>(
 		    device,
 		    build_sizes_info.accelerationStructureSize,
-		    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
+		    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
 		    VMA_MEMORY_USAGE_GPU_ONLY);
 
 		VkAccelerationStructureCreateInfoKHR acceleration_structure_create_info{};

diff --git a/samples/extensions/ray_tracing_basic/ray_tracing_basic.cpp b/samples/extensions/ray_tracing_basic/ray_tracing_basic.cpp
@@ -272,7 +272,7 @@ void RaytracingBasic::create_bottom_level_acceleration_structure()
 	bottom_level_acceleration_structure.buffer = std::make_unique<vkb::core::Buffer>(
 	    get_device(),
 	    acceleration_structure_build_sizes_info.accelerationStructureSize,
-	    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
+	    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
 	    VMA_MEMORY_USAGE_GPU_ONLY);
 
 	// Create the acceleration structure
@@ -383,7 +383,7 @@ void RaytracingBasic::create_top_level_acceleration_structure()
 	top_level_acceleration_structure.buffer = std::make_unique<vkb::core::Buffer>(
 	    get_device(),
 	    acceleration_structure_build_sizes_info.accelerationStructureSize,
-	    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
+	    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
 	    VMA_MEMORY_USAGE_GPU_ONLY);
 
 	// Create the acceleration structure

diff --git a/samples/extensions/ray_tracing_extended/ray_tracing_extended.cpp b/samples/extensions/ray_tracing_extended/ray_tracing_extended.cpp
@@ -473,7 +473,7 @@ void RaytracingExtended::create_bottom_level_acceleration_structure(bool is_upda
 			bottom_level_acceleration_structure.buffer = std::make_unique<vkb::core::Buffer>(
 			    get_device(),
 			    model_buffer.buildSize.accelerationStructureSize,
-			    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
+			    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
 			    VMA_MEMORY_USAGE_GPU_ONLY);
 		}
 		if (!is_update && bottom_level_acceleration_structure.handle == nullptr)
@@ -698,7 +698,7 @@ void RaytracingExtended::create_top_level_acceleration_structure(bool print_time
 		top_level_acceleration_structure.buffer = std::make_unique<vkb::core::Buffer>(
 		    get_device(),
 		    acceleration_structure_build_sizes_info.accelerationStructureSize,
-		    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
+		    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
 		    VMA_MEMORY_USAGE_GPU_ONLY);
 	}
 

diff --git a/samples/extensions/ray_tracing_reflection/ray_tracing_reflection.cpp b/samples/extensions/ray_tracing_reflection/ray_tracing_reflection.cpp
@@ -257,7 +257,7 @@ void RaytracingReflection::create_bottom_level_acceleration_structure(ObjModelGp
 
 	// Create a buffer to hold the acceleration structure
 	AccelerationStructure blas;
-	blas.buffer = std::make_unique<vkb::core::Buffer>(get_device(), acceleration_structure_build_sizes_info.accelerationStructureSize, VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR, VMA_MEMORY_USAGE_GPU_ONLY);
+	blas.buffer = std::make_unique<vkb::core::Buffer>(get_device(), acceleration_structure_build_sizes_info.accelerationStructureSize, VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VMA_MEMORY_USAGE_GPU_ONLY);
 
 	// Create the acceleration structure
 	VkAccelerationStructureCreateInfoKHR acceleration_structure_create_info{VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR};
@@ -348,7 +348,7 @@ void RaytracingReflection::create_top_level_acceleration_structure(std::vector<V
 	top_level_acceleration_structure.buffer = std::make_unique<vkb::core::Buffer>(
 	    get_device(),
 	    acceleration_structure_build_sizes_info.accelerationStructureSize,
-	    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
+	    VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
 	    VMA_MEMORY_USAGE_GPU_ONLY);
 
 	// Create the acceleration structure