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

Enable drawIndirectFirstInstance feature

Browse source 
Code cleanup
Fixes #1198
This commit is contained in:
Sascha Willems 2025-04-04 17:12:30 +02:00
parent 9a562a5426
commit b56067bd03
1 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

52
examples/computecullandlod/computecullandlod.cpp
View file

@ -1,7 +1,7 @@
/* /*
* Vulkan Example - Compute shader culling and LOD using indirect rendering * Vulkan Example - Compute shader culling and LOD using indirect rendering
* *
* Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de * Copyright (C) 2016-2025 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)
* *
@ -14,12 +14,12 @@
// Total number of objects (^3) in the scene // Total number of objects (^3) in the scene
#if defined(__ANDROID__) #if defined(__ANDROID__)
#define OBJECT_COUNT 32 constexpr auto OBJECT_COUNT 32;
#else #else
#define OBJECT_COUNT 64 constexpr auto OBJECT_COUNT = 64;
#endif #endif
#define MAX_LOD_LEVEL 5 constexpr auto MAX_LOD_LEVEL = 5;
class VulkanExample : public VulkanExampleBase class VulkanExample : public VulkanExampleBase
{ {
@ -31,8 +31,8 @@ public:
// Per-instance data block // Per-instance data block
struct InstanceData { struct InstanceData {
glm::vec3 pos; glm::vec3 pos{ 0.0f };
float scale; float scale{ 1.0f };
}; };
// Contains the instanced data // Contains the instanced data
@ -61,13 +61,10 @@ public:
vks::Buffer scene; vks::Buffer scene;
} uniformData; } uniformData;
struct { VkPipelineLayout pipelineLayout{ VK_NULL_HANDLE };
VkPipeline plants; VkPipeline pipeline{ VK_NULL_HANDLE };
} pipelines; VkDescriptorSetLayout descriptorSetLayout{ VK_NULL_HANDLE };
VkDescriptorSet descriptorSet{ VK_NULL_HANDLE };
VkPipelineLayout pipelineLayout;
VkDescriptorSet descriptorSet;
VkDescriptorSetLayout descriptorSetLayout;
// Resources for the compute part of the example // Resources for the compute part of the example
struct { struct {
@ -81,7 +78,7 @@ public:
VkDescriptorSet descriptorSet; // Compute shader bindings VkDescriptorSet descriptorSet; // Compute shader bindings
VkPipelineLayout pipelineLayout; // Layout of the compute pipeline VkPipelineLayout pipelineLayout; // Layout of the compute pipeline
VkPipeline pipeline; // Compute pipeline for updating particle positions VkPipeline pipeline; // Compute pipeline for updating particle positions
} compute; } compute{};
// View frustum for culling invisible objects // View frustum for culling invisible objects
vks::Frustum frustum; vks::Frustum frustum;
@ -101,7 +98,7 @@ public:
~VulkanExample() ~VulkanExample()
{ {
if (device) { if (device) {
vkDestroyPipeline(device, pipelines.plants, nullptr); vkDestroyPipeline(device, pipeline, nullptr);
vkDestroyPipelineLayout(device, pipelineLayout, nullptr); vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
instanceBuffer.destroy(); instanceBuffer.destroy();
@ -124,13 +121,15 @@ public:
if (deviceFeatures.multiDrawIndirect) { if (deviceFeatures.multiDrawIndirect) {
enabledFeatures.multiDrawIndirect = VK_TRUE; enabledFeatures.multiDrawIndirect = VK_TRUE;
} }
// This is required for for using firstInstance
enabledFeatures.drawIndirectFirstInstance = VK_TRUE;
} }
void buildCommandBuffers() void buildCommandBuffers()
{ {
VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo(); VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
VkClearValue clearValues[2]; VkClearValue clearValues[2]{};
clearValues[0].color = { { 0.18f, 0.27f, 0.5f, 0.0f } }; clearValues[0].color = { { 0.18f, 0.27f, 0.5f, 0.0f } };
clearValues[1].depthStencil = { 1.0f, 0 }; clearValues[1].depthStencil = { 1.0f, 0 };
@ -186,7 +185,7 @@ public:
vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, NULL); vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, NULL);
// Mesh containing the LODs // Mesh containing the LODs
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.plants); vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
vkCmdBindVertexBuffers(drawCmdBuffers[i], 0, 1, &lodModel.vertices.buffer, offsets); vkCmdBindVertexBuffers(drawCmdBuffers[i], 0, 1, &lodModel.vertices.buffer, offsets);
vkCmdBindVertexBuffers(drawCmdBuffers[i], 1, 1, &instanceBuffer.buffer, offsets); vkCmdBindVertexBuffers(drawCmdBuffers[i], 1, 1, &instanceBuffer.buffer, offsets);
@ -400,6 +399,7 @@ public:
inputState.vertexBindingDescriptionCount = static_cast<uint32_t>(bindingDescriptions.size()); inputState.vertexBindingDescriptionCount = static_cast<uint32_t>(bindingDescriptions.size());
inputState.vertexAttributeDescriptionCount = static_cast<uint32_t>(attributeDescriptions.size()); inputState.vertexAttributeDescriptionCount = static_cast<uint32_t>(attributeDescriptions.size());
// Indirect (and instanced) pipeline
VkPipelineInputAssemblyStateCreateInfo inputAssemblyState = vks::initializers::pipelineInputAssemblyStateCreateInfo(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, 0, VK_FALSE); VkPipelineInputAssemblyStateCreateInfo inputAssemblyState = vks::initializers::pipelineInputAssemblyStateCreateInfo(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, 0, VK_FALSE);
VkPipelineRasterizationStateCreateInfo rasterizationState = vks::initializers::pipelineRasterizationStateCreateInfo(VK_POLYGON_MODE_FILL, VK_CULL_MODE_BACK_BIT, VK_FRONT_FACE_COUNTER_CLOCKWISE, 0); VkPipelineRasterizationStateCreateInfo rasterizationState = vks::initializers::pipelineRasterizationStateCreateInfo(VK_POLYGON_MODE_FILL, VK_CULL_MODE_BACK_BIT, VK_FRONT_FACE_COUNTER_CLOCKWISE, 0);
VkPipelineColorBlendAttachmentState blendAttachmentState = vks::initializers::pipelineColorBlendAttachmentState(0xf, VK_FALSE); VkPipelineColorBlendAttachmentState blendAttachmentState = vks::initializers::pipelineColorBlendAttachmentState(0xf, VK_FALSE);
@ -409,9 +409,11 @@ public:
VkPipelineMultisampleStateCreateInfo multisampleState = vks::initializers::pipelineMultisampleStateCreateInfo(VK_SAMPLE_COUNT_1_BIT, 0); VkPipelineMultisampleStateCreateInfo multisampleState = vks::initializers::pipelineMultisampleStateCreateInfo(VK_SAMPLE_COUNT_1_BIT, 0);
std::vector<VkDynamicState> dynamicStateEnables = {VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR}; std::vector<VkDynamicState> dynamicStateEnables = {VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR};
VkPipelineDynamicStateCreateInfo dynamicState = vks::initializers::pipelineDynamicStateCreateInfo(dynamicStateEnables); VkPipelineDynamicStateCreateInfo dynamicState = vks::initializers::pipelineDynamicStateCreateInfo(dynamicStateEnables);
std::array<VkPipelineShaderStageCreateInfo, 2> shaderStages;
VkGraphicsPipelineCreateInfo pipelineCreateInfo = vks::initializers::pipelineCreateInfo(pipelineLayout, renderPass); VkGraphicsPipelineCreateInfo pipelineCreateInfo = vks::initializers::pipelineCreateInfo(pipelineLayout, renderPass);
std::array<VkPipelineShaderStageCreateInfo, 2> shaderStages = {
loadShader(getShadersPath() + "computecullandlod/indirectdraw.vert.spv", VK_SHADER_STAGE_VERTEX_BIT),
loadShader(getShadersPath() + "computecullandlod/indirectdraw.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT)
};
pipelineCreateInfo.pVertexInputState = &inputState; pipelineCreateInfo.pVertexInputState = &inputState;
pipelineCreateInfo.pInputAssemblyState = &inputAssemblyState; pipelineCreateInfo.pInputAssemblyState = &inputAssemblyState;
pipelineCreateInfo.pRasterizationState = &rasterizationState; pipelineCreateInfo.pRasterizationState = &rasterizationState;
@ -422,11 +424,7 @@ public:
pipelineCreateInfo.pDynamicState = &dynamicState; pipelineCreateInfo.pDynamicState = &dynamicState;
pipelineCreateInfo.stageCount = static_cast<uint32_t>(shaderStages.size()); pipelineCreateInfo.stageCount = static_cast<uint32_t>(shaderStages.size());
pipelineCreateInfo.pStages = shaderStages.data(); pipelineCreateInfo.pStages = shaderStages.data();
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipeline));
// Indirect (and instanced) pipeline for the plants
shaderStages[0] = loadShader(getShadersPath() + "computecullandlod/indirectdraw.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
shaderStages[1] = loadShader(getShadersPath() + "computecullandlod/indirectdraw.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.plants));
} }
void prepareBuffers() void prepareBuffers()
@ -555,7 +553,7 @@ public:
uint32_t n = 0; uint32_t n = 0;
for (auto node : lodModel.nodes) for (auto node : lodModel.nodes)
{ {
LOD lod; LOD lod{};
lod.firstIndex = node->mesh->primitives[0]->firstIndex; // First index for this LOD lod.firstIndex = node->mesh->primitives[0]->firstIndex; // First index for this LOD
lod.indexCount = node->mesh->primitives[0]->indexCount; // Index count for this LOD lod.indexCount = node->mesh->primitives[0]->indexCount; // Index count for this LOD
lod.distance = 5.0f + n * 5.0f; // Starting distance (to viewer) for this LOD lod.distance = 5.0f + n * 5.0f; // Starting distance (to viewer) for this LOD
@ -675,7 +673,7 @@ public:
&compute.lodLevelsBuffers.descriptor) &compute.lodLevelsBuffers.descriptor)
}; };
vkUpdateDescriptorSets(device, static_cast<uint32_t>(computeWriteDescriptorSets.size()), computeWriteDescriptorSets.data(), 0, NULL); vkUpdateDescriptorSets(device, static_cast<uint32_t>(computeWriteDescriptorSets.size()), computeWriteDescriptorSets.data(), 0, nullptr);
// Create pipeline // Create pipeline
VkComputePipelineCreateInfo computePipelineCreateInfo = vks::initializers::computePipelineCreateInfo(compute.pipelineLayout, 0); VkComputePipelineCreateInfo computePipelineCreateInfo = vks::initializers::computePipelineCreateInfo(compute.pipelineLayout, 0);
@ -689,7 +687,7 @@ public:
uint32_t specializationData = static_cast<uint32_t>(lodModel.nodes.size()) - 1; uint32_t specializationData = static_cast<uint32_t>(lodModel.nodes.size()) - 1;
VkSpecializationInfo specializationInfo; VkSpecializationInfo specializationInfo{};
specializationInfo.mapEntryCount = 1; specializationInfo.mapEntryCount = 1;
specializationInfo.pMapEntries = &specializationEntry; specializationInfo.pMapEntries = &specializationEntry;
specializationInfo.dataSize = sizeof(specializationData); specializationInfo.dataSize = sizeof(specializationData);