Merge pull request #812 from tangmi/remove-host-commands

Remove acceleration structure host commands usage

examples/rayquery/rayquery.cpp

@@ -125,19 +125,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -145,7 +134,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		deleteScratchBuffer(scratchBuffer);
 	}
@@ -225,19 +213,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -245,7 +222,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		deleteScratchBuffer(scratchBuffer);
 		instancesBuffer.destroy();

examples/raytracingbasic/raytracingbasic.cpp

@@ -373,19 +373,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -393,7 +382,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		VkAccelerationStructureDeviceAddressInfoKHR accelerationDeviceAddressInfo{};
 		accelerationDeviceAddressInfo.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR;
@@ -492,19 +480,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -512,7 +489,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		VkAccelerationStructureDeviceAddressInfoKHR accelerationDeviceAddressInfo{};
 		accelerationDeviceAddressInfo.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR;

examples/raytracingcallable/raytracingcallable.cpp

@@ -199,19 +199,8 @@ public:
 		}
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfos[0], &accelerationStructureBuildRangeInfos[1], &accelerationStructureBuildRangeInfos[2] };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -219,7 +208,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		deleteScratchBuffer(scratchBuffer);
 	}
@@ -299,19 +287,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -319,7 +296,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		deleteScratchBuffer(scratchBuffer);
 		instancesBuffer.destroy();

examples/raytracingreflections/raytracingreflections.cpp

@@ -137,19 +137,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -157,7 +146,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		deleteScratchBuffer(scratchBuffer);
 	}
@@ -237,19 +225,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -257,7 +234,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		deleteScratchBuffer(scratchBuffer);
 		instancesBuffer.destroy();

examples/raytracingshadows/raytracingshadows.cpp

@@ -136,20 +136,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -157,7 +145,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		deleteScratchBuffer(scratchBuffer);
 	}
@@ -238,20 +225,8 @@ public:
 		accelerationStructureBuildRangeInfo.transformOffset = 0;
 		std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo };
 
-		if (accelerationStructureFeatures.accelerationStructureHostCommands)
+		// Build the acceleration structure on the device via a one-time command buffer submission
-		{
+		// Some implementations may support acceleration structure building on the host (VkPhysicalDeviceAccelerationStructureFeaturesKHR->accelerationStructureHostCommands), but we prefer device builds
-			// Implementation supports building acceleration structure building on host
-			// Implementation supports building acceleration structure building on host
-			vkBuildAccelerationStructuresKHR(
-				device,
-				VK_NULL_HANDLE,
-				1,
-				&accelerationBuildGeometryInfo,
-				accelerationBuildStructureRangeInfos.data());
-		}
-		else
-		{
-			// Acceleration structure needs to be build on the device
 		VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
 		vkCmdBuildAccelerationStructuresKHR(
 			commandBuffer,
@@ -259,7 +234,6 @@ public:
 			&accelerationBuildGeometryInfo,
 			accelerationBuildStructureRangeInfos.data());
 		vulkanDevice->flushCommandBuffer(commandBuffer, queue);
-		}
 
 		deleteScratchBuffer(scratchBuffer);
 		instancesBuffer.destroy();