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-06 18:04:37 +01:00
parent 9ccb7cbd54
commit e67d73fbd9
1 changed files with 40 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

105
examples/indirectdraw/indirectdraw.cpp
View file

@ -1,7 +1,7 @@
/* /*
* Vulkan Example - Indirect drawing * Vulkan Example - Indirect drawing
* *
* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de * Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de
* *
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
* *
@ -61,28 +61,25 @@ public:
vks::Buffer instanceBuffer; vks::Buffer instanceBuffer;
// Contains the indirect drawing commands // Contains the indirect drawing commands
vks::Buffer indirectCommandsBuffer; vks::Buffer indirectCommandsBuffer;
uint32_t indirectDrawCount; uint32_t indirectDrawCount{ 0 };
struct { struct UniformData {
glm::mat4 projection; glm::mat4 projection;
glm::mat4 view; glm::mat4 view;
} uboVS;
struct {
vks::Buffer scene;
} uniformData; } uniformData;
vks::Buffer uniformBuffer;
struct { struct {
VkPipeline plants; VkPipeline plants{ VK_NULL_HANDLE };
VkPipeline ground; VkPipeline ground{ VK_NULL_HANDLE };
VkPipeline skysphere; VkPipeline skysphere{ VK_NULL_HANDLE };
} pipelines; } pipelines;
VkPipelineLayout pipelineLayout; VkPipelineLayout pipelineLayout{ VK_NULL_HANDLE };
VkDescriptorSet descriptorSet; VkDescriptorSet descriptorSet{ VK_NULL_HANDLE };
VkDescriptorSetLayout descriptorSetLayout; VkDescriptorSetLayout descriptorSetLayout{ VK_NULL_HANDLE };
VkSampler samplerRepeat; VkSampler samplerRepeat{ VK_NULL_HANDLE };
uint32_t objectCount = 0; uint32_t objectCount = 0;
@ -101,16 +98,18 @@ public:
~VulkanExample() ~VulkanExample()
{ {
vkDestroyPipeline(device, pipelines.plants, nullptr); if (device) {
vkDestroyPipeline(device, pipelines.ground, nullptr); vkDestroyPipeline(device, pipelines.plants, nullptr);
vkDestroyPipeline(device, pipelines.skysphere, nullptr); vkDestroyPipeline(device, pipelines.ground, nullptr);
vkDestroyPipelineLayout(device, pipelineLayout, nullptr); vkDestroyPipeline(device, pipelines.skysphere, nullptr);
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
textures.plants.destroy(); vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
textures.ground.destroy(); textures.plants.destroy();
instanceBuffer.destroy(); textures.ground.destroy();
indirectCommandsBuffer.destroy(); instanceBuffer.destroy();
uniformData.scene.destroy(); indirectCommandsBuffer.destroy();
uniformBuffer.destroy();
}
} }
// Enable physical device features required for this example // Enable physical device features required for this example
@ -245,7 +244,7 @@ public:
std::vector<VkWriteDescriptorSet> writeDescriptorSets = { std::vector<VkWriteDescriptorSet> writeDescriptorSets = {
// Binding 0: Vertex shader uniform buffer // Binding 0: Vertex shader uniform buffer
vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &uniformData.scene.descriptor), vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &uniformBuffer.descriptor),
// Binding 1: Plants texture array combined // Binding 1: Plants texture array combined
vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &textures.plants.descriptor), vks::initializers::writeDescriptorSet(descriptorSet, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &textures.plants.descriptor),
// Binding 2: Ground texture combined // Binding 2: Ground texture combined
@ -433,40 +432,15 @@ public:
void prepareUniformBuffers() void prepareUniformBuffers()
{ {
VK_CHECK_RESULT(vulkanDevice->createBuffer( VK_CHECK_RESULT(vulkanDevice->createBuffer(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, &uniformBuffer, sizeof(uniformData)));
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_CHECK_RESULT(uniformBuffer.map());
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
&uniformData.scene,
sizeof(uboVS)));
VK_CHECK_RESULT(uniformData.scene.map());
updateUniformBuffer(true);
} }
void updateUniformBuffer(bool viewChanged) void updateUniformBuffer()
{ {
if (viewChanged) uniformData.projection = camera.matrices.perspective;
{ uniformData.view = camera.matrices.view;
uboVS.projection = camera.matrices.perspective; memcpy(uniformBuffer.mapped, &uniformData, sizeof(uniformData));
uboVS.view = camera.matrices.view;
}
memcpy(uniformData.scene.mapped, &uboVS, sizeof(uboVS));
}
void draw()
{
VulkanExampleBase::prepareFrame();
// Command buffer to be submitted to the queue
submitInfo.commandBufferCount = 1;
submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer];
// Submit to queue
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE));
VulkanExampleBase::submitFrame();
} }
void prepare() void prepare()
@ -484,22 +458,23 @@ public:
prepared = true; prepared = true;
} }
void draw()
{
VulkanExampleBase::prepareFrame();
submitInfo.commandBufferCount = 1;
submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer];
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE));
VulkanExampleBase::submitFrame();
}
virtual void render() virtual void render()
{ {
if (!prepared) if (!prepared)
{ {
return; return;
} }
updateUniformBuffer();
draw(); draw();
if (camera.updated)
{
updateUniformBuffer(true);
}
}
virtual void viewChanged()
{
updateUniformBuffer(true);
} }
virtual void OnUpdateUIOverlay(vks::UIOverlay *overlay) virtual void OnUpdateUIOverlay(vks::UIOverlay *overlay)