claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Remove acceleration structure host commands usage
This commit is contained in:
Sascha Willems 2021-05-31 19:35:24 +02:00 • committed by GitHub
commit 2735ea213e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 90 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

60
examples/rayquery/rayquery.cpp
View file

@ -125,27 +125,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkBuildAccelerationStructuresKHR( vkCmdBuildAccelerationStructuresKHR(
device, commandBuffer,
VK_NULL_HANDLE, 1,
1, &accelerationBuildGeometryInfo,
&accelerationBuildGeometryInfo, accelerationBuildStructureRangeInfos.data());
accelerationBuildStructureRangeInfos.data()); vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
deleteScratchBuffer(scratchBuffer); deleteScratchBuffer(scratchBuffer);
} }
@ -225,27 +213,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkBuildAccelerationStructuresKHR( vkCmdBuildAccelerationStructuresKHR(
device, commandBuffer,
VK_NULL_HANDLE, 1,
1, &accelerationBuildGeometryInfo,
&accelerationBuildGeometryInfo, accelerationBuildStructureRangeInfos.data());
accelerationBuildStructureRangeInfos.data()); vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
deleteScratchBuffer(scratchBuffer); deleteScratchBuffer(scratchBuffer);
instancesBuffer.destroy(); instancesBuffer.destroy();

60
examples/raytracingbasic/raytracingbasic.cpp
View file

@ -373,27 +373,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkBuildAccelerationStructuresKHR( vkCmdBuildAccelerationStructuresKHR(
device, commandBuffer,
VK_NULL_HANDLE, 1,
1, &accelerationBuildGeometryInfo,
&accelerationBuildGeometryInfo, accelerationBuildStructureRangeInfos.data());
accelerationBuildStructureRangeInfos.data()); vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
VkAccelerationStructureDeviceAddressInfoKHR accelerationDeviceAddressInfo{}; VkAccelerationStructureDeviceAddressInfoKHR accelerationDeviceAddressInfo{};
accelerationDeviceAddressInfo.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR; accelerationDeviceAddressInfo.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR;
@ -492,27 +480,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkBuildAccelerationStructuresKHR( vkCmdBuildAccelerationStructuresKHR(
device, commandBuffer,
VK_NULL_HANDLE, 1,
1, &accelerationBuildGeometryInfo,
&accelerationBuildGeometryInfo, accelerationBuildStructureRangeInfos.data());
accelerationBuildStructureRangeInfos.data()); vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
VkAccelerationStructureDeviceAddressInfoKHR accelerationDeviceAddressInfo{}; VkAccelerationStructureDeviceAddressInfoKHR accelerationDeviceAddressInfo{};
accelerationDeviceAddressInfo.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR; accelerationDeviceAddressInfo.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR;

60
examples/raytracingcallable/raytracingcallable.cpp
View file

@ -199,27 +199,15 @@ public:
} }
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfos[0], &accelerationStructureBuildRangeInfos[1], &accelerationStructureBuildRangeInfos[2] }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkBuildAccelerationStructuresKHR( vkCmdBuildAccelerationStructuresKHR(
device, commandBuffer,
VK_NULL_HANDLE, 1,
1, &accelerationBuildGeometryInfo,
&accelerationBuildGeometryInfo, accelerationBuildStructureRangeInfos.data());
accelerationBuildStructureRangeInfos.data()); vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
deleteScratchBuffer(scratchBuffer); deleteScratchBuffer(scratchBuffer);
} }
@ -299,27 +287,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkBuildAccelerationStructuresKHR( vkCmdBuildAccelerationStructuresKHR(
device, commandBuffer,
VK_NULL_HANDLE, 1,
1, &accelerationBuildGeometryInfo,
&accelerationBuildGeometryInfo, accelerationBuildStructureRangeInfos.data());
accelerationBuildStructureRangeInfos.data()); vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
deleteScratchBuffer(scratchBuffer); deleteScratchBuffer(scratchBuffer);
instancesBuffer.destroy(); instancesBuffer.destroy();

60
examples/raytracingreflections/raytracingreflections.cpp
View file

@ -137,27 +137,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkBuildAccelerationStructuresKHR( vkCmdBuildAccelerationStructuresKHR(
device, commandBuffer,
VK_NULL_HANDLE, 1,
1, &accelerationBuildGeometryInfo,
&accelerationBuildGeometryInfo, accelerationBuildStructureRangeInfos.data());
accelerationBuildStructureRangeInfos.data()); vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
deleteScratchBuffer(scratchBuffer); deleteScratchBuffer(scratchBuffer);
} }
@ -237,27 +225,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkBuildAccelerationStructuresKHR( vkCmdBuildAccelerationStructuresKHR(
device, commandBuffer,
VK_NULL_HANDLE, 1,
1, &accelerationBuildGeometryInfo,
&accelerationBuildGeometryInfo, accelerationBuildStructureRangeInfos.data());
accelerationBuildStructureRangeInfos.data()); vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
deleteScratchBuffer(scratchBuffer); deleteScratchBuffer(scratchBuffer);
instancesBuffer.destroy(); instancesBuffer.destroy();

62
examples/raytracingshadows/raytracingshadows.cpp
View file

@ -136,28 +136,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
// Implementation supports building acceleration structure building on host vkCmdBuildAccelerationStructuresKHR(
vkBuildAccelerationStructuresKHR( commandBuffer,
device, 1,
VK_NULL_HANDLE, &accelerationBuildGeometryInfo,
1, accelerationBuildStructureRangeInfos.data());
&accelerationBuildGeometryInfo, vulkanDevice->flushCommandBuffer(commandBuffer, queue);
accelerationBuildStructureRangeInfos.data());
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
deleteScratchBuffer(scratchBuffer); deleteScratchBuffer(scratchBuffer);
} }
@ -238,28 +225,15 @@ public:
accelerationStructureBuildRangeInfo.transformOffset = 0; accelerationStructureBuildRangeInfo.transformOffset = 0;
std::vector<VkAccelerationStructureBuildRangeInfoKHR*> accelerationBuildStructureRangeInfos = { &accelerationStructureBuildRangeInfo }; 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 VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
// Implementation supports building acceleration structure building on host vkCmdBuildAccelerationStructuresKHR(
vkBuildAccelerationStructuresKHR( commandBuffer,
device, 1,
VK_NULL_HANDLE, &accelerationBuildGeometryInfo,
1, accelerationBuildStructureRangeInfos.data());
&accelerationBuildGeometryInfo, vulkanDevice->flushCommandBuffer(commandBuffer, queue);
accelerationBuildStructureRangeInfos.data());
}
else
{
// Acceleration structure needs to be build on the device
VkCommandBuffer commandBuffer = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
vkCmdBuildAccelerationStructuresKHR(
commandBuffer,
1,
&accelerationBuildGeometryInfo,
accelerationBuildStructureRangeInfos.data());
vulkanDevice->flushCommandBuffer(commandBuffer, queue);
}
deleteScratchBuffer(scratchBuffer); deleteScratchBuffer(scratchBuffer);
instancesBuffer.destroy(); instancesBuffer.destroy();