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

Removed no longer required pipeline duplicatiion

Browse source
This commit is contained in:
Sascha Willems 2023-10-14 14:31:59 +02:00
parent f27a032570
commit b481b63c78
3 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
examples/variablerateshading/variablerateshading.cpp
View file

@ -25,10 +25,8 @@ VulkanExample::VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
VulkanExample::~VulkanExample()
{
vkDestroyPipeline(device, basePipelines.masked, nullptr);
vkDestroyPipeline(device, basePipelines.opaque, nullptr);
vkDestroyPipeline(device, shadingRatePipelines.masked, nullptr);
vkDestroyPipeline(device, shadingRatePipelines.opaque, nullptr);
vkDestroyPipeline(device, pipelines.masked, nullptr);
vkDestroyPipeline(device, pipelines.opaque, nullptr);
vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
vkDestroyImageView(device, shadingRateImage.view, nullptr);
@ -263,7 +261,6 @@ void VulkanExample::buildCommandBuffers()
vkCmdSetFragmentShadingRateKHR(drawCmdBuffers[i], &fragmentSize, combinerOps);
// Render the scene
Pipelines& pipelines = enableShadingRate ? shadingRatePipelines : basePipelines;
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.opaque);
scene.draw(drawCmdBuffers[i], vkglTF::RenderFlags::BindImages | vkglTF::RenderFlags::RenderOpaqueNodes, pipelineLayout);
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.masked);
@ -543,17 +540,12 @@ void VulkanExample::preparePipelines()
shaderStages[1].pSpecializationInfo = &specializationInfo;
// Create pipeline without shading rate
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &basePipelines.opaque));
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.opaque));
specializationData.alphaMask = true;
rasterizationStateCI.cullMode = VK_CULL_MODE_NONE;
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &basePipelines.masked));
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.masked));
rasterizationStateCI.cullMode = VK_CULL_MODE_BACK_BIT;
specializationData.alphaMask = false;
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &shadingRatePipelines.opaque));
specializationData.alphaMask = true;
rasterizationStateCI.cullMode = VK_CULL_MODE_NONE;
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &shadingRatePipelines.masked));
}
void VulkanExample::prepareUniformBuffers()

5
examples/variablerateshading/variablerateshading.h
View file

@ -40,10 +40,7 @@ public:
struct Pipelines {
VkPipeline opaque;
VkPipeline masked;
};
Pipelines basePipelines;
Pipelines shadingRatePipelines;
} pipelines;
VkPipelineLayout pipelineLayout;
VkDescriptorSet descriptorSet;