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

Code cleanup

Browse source
This commit is contained in:
Sascha Willems 2024-01-13 19:15:42 +01:00
parent f6abda6cca
commit 8143b2d9e5
1 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

60
examples/raytracinggltf/raytracinggltf.cpp
View file

@ -18,7 +18,7 @@ public:
vks::Buffer vertexBuffer; vks::Buffer vertexBuffer;
vks::Buffer indexBuffer; vks::Buffer indexBuffer;
uint32_t indexCount; uint32_t indexCount{ 0 };
vks::Buffer transformBuffer; vks::Buffer transformBuffer;
struct GeometryNode { struct GeometryNode {
@ -43,12 +43,12 @@ public:
glm::mat4 projInverse; glm::mat4 projInverse;
uint32_t frame{ 0 }; uint32_t frame{ 0 };
} uniformData; } uniformData;
vks::Buffer ubo; vks::Buffer uniformBuffer;
VkPipeline pipeline; VkPipeline pipeline{ VK_NULL_HANDLE };
VkPipelineLayout pipelineLayout; VkPipelineLayout pipelineLayout{ VK_NULL_HANDLE };
VkDescriptorSet descriptorSet; VkDescriptorSet descriptorSet{ VK_NULL_HANDLE };
VkDescriptorSetLayout descriptorSetLayout; VkDescriptorSetLayout descriptorSetLayout{ VK_NULL_HANDLE };
vkglTF::Model model; vkglTF::Model model;
@ -75,20 +75,22 @@ public:
~VulkanExample() ~VulkanExample()
{ {
vkDestroyPipeline(device, pipeline, nullptr); if (device) {
vkDestroyPipelineLayout(device, pipelineLayout, nullptr); vkDestroyPipeline(device, pipeline, nullptr);
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
deleteStorageImage(); vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
deleteAccelerationStructure(bottomLevelAS); deleteStorageImage();
deleteAccelerationStructure(topLevelAS); deleteAccelerationStructure(bottomLevelAS);
vertexBuffer.destroy(); deleteAccelerationStructure(topLevelAS);
indexBuffer.destroy(); vertexBuffer.destroy();
transformBuffer.destroy(); indexBuffer.destroy();
shaderBindingTables.raygen.destroy(); transformBuffer.destroy();
shaderBindingTables.miss.destroy(); shaderBindingTables.raygen.destroy();
shaderBindingTables.hit.destroy(); shaderBindingTables.miss.destroy();
ubo.destroy(); shaderBindingTables.hit.destroy();
geometryNodesBuffer.destroy(); uniformBuffer.destroy();
geometryNodesBuffer.destroy();
}
} }
void createAccelerationStructureBuffer(AccelerationStructure &accelerationStructure, VkAccelerationStructureBuildSizesInfoKHR buildSizeInfo) void createAccelerationStructureBuffer(AccelerationStructure &accelerationStructure, VkAccelerationStructureBuildSizesInfoKHR buildSizeInfo)
@ -561,7 +563,7 @@ public:
// Binding 1: Ray tracing result image // Binding 1: Ray tracing result image
vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1, &storageImageDescriptor), vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1, &storageImageDescriptor),
// Binding 2: Uniform data // Binding 2: Uniform data
vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 2, &ubo.descriptor), vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 2, &uniformBuffer.descriptor),
// Binding 4: Geometry node information SSBO // Binding 4: Geometry node information SSBO
vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 4, &geometryNodesBuffer.descriptor), vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 4, &geometryNodesBuffer.descriptor),
}; };
@ -596,10 +598,10 @@ public:
VK_CHECK_RESULT(vulkanDevice->createBuffer( VK_CHECK_RESULT(vulkanDevice->createBuffer(
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
&ubo, &uniformBuffer,
sizeof(uniformData), sizeof(uniformData),
&uniformData)); &uniformData));
VK_CHECK_RESULT(ubo.map()); VK_CHECK_RESULT(uniformBuffer.map());
updateUniformBuffers(); updateUniformBuffers();
} }
@ -710,7 +712,7 @@ public:
// In this sample we use noise offset by this frame index to shoot rays for transparency into different directions // In this sample we use noise offset by this frame index to shoot rays for transparency into different directions
// Once enough frames with random ray directions have been accumulated, it looks like proper transparency // Once enough frames with random ray directions have been accumulated, it looks like proper transparency
uniformData.frame++; uniformData.frame++;
memcpy(ubo.mapped, &uniformData, sizeof(uniformData)); memcpy(uniformBuffer.mapped, &uniformData, sizeof(uniformData));
} }
void getEnabledFeatures() void getEnabledFeatures()
@ -777,13 +779,13 @@ public:
if (!prepared) if (!prepared)
return; return;
updateUniformBuffers(); updateUniformBuffers();
if (camera.updated) {
// If the camera's view has been updated we reset the frame accumulation
std::cout << "Cam updated\n";
uniformData.frame = -1;
}
draw(); draw();
} }
virtual void viewChanged()
{
uniformData.frame = -1;
}
}; };
VULKAN_EXAMPLE_MAIN() VULKAN_EXAMPLE_MAIN()