backup - missing some

[demo] / src / vulkan / vkutil-pipeline.cc

diff --git a/src/vulkan/vkutil-pipeline.cc b/src/vulkan/vkutil-pipeline.cc
index 1d2620d..4be1d22 100644 (file)
--- a/src/vulkan/vkutil-pipeline.cc
+++ b/src/vulkan/vkutil-pipeline.cc
@@ -79,12 +79,12 @@ VkPipeline VkuPipelineGenerator::generate(VkuDynState dyn_flags) const
        VkPipelineLayoutCreateInfo linf;
        memset(&linf, 0, sizeof linf);
        linf.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
-       linf.setLayoutCount = dset_layouts.size();
-       linf.pSetLayouts = dset_layouts.data();
+       linf.setLayoutCount = res_layouts.size();
+       linf.pSetLayouts = res_layouts.data();
        //TODO find max num dsets vkGetPhysicalDeviceProperties
        //maxBoundDescriptorSets of VkPhysicalDeviceLimits
-       linf.pushConstantRangeCount = push_const_ranges.size();
-       linf.pPushConstantRanges = push_const_ranges.data();
+       //linf.pushConstantRangeCount = push_const_ranges.size();
+       //linf.pPushConstantRanges = push_const_ranges.data();
        //maxPushConstantsSize from VkPhysicalDeviceLimits
 
        VkPipelineLayout layout;
@@ -120,7 +120,7 @@ VkPipeline VkuPipelineGenerator::generate(VkuDynState dyn_flags) const
 
        VkPipeline gpipeline;
        if(vkCreateGraphicsPipelines(vk_device, pcache, 1, &gpinf, 0, &gpipeline) !=
-                       VK_SUCCESS) {
+               VK_SUCCESS) {
                fprintf(stderr, "Failed to create graphics pipeline.\n");
                return 0;
        }
@@ -129,14 +129,14 @@ VkPipeline VkuPipelineGenerator::generate(VkuDynState dyn_flags) const
 }
 
 void VkuPipelineGenerator::set_shader_modules(VkShaderModule vs,
-               VkShaderModule fs)
+        VkShaderModule fs)
 {
        sdri[0].module = vs;
        sdri[1].module = fs;
 }
 
 void VkuPipelineGenerator::set_attribute(uint32_t binding, uint32_t stride,
-               uint32_t location, VkFormat format)
+        uint32_t location, VkFormat format)
 {
        VkVertexInputBindingDescription bdsc;
        bdsc.binding = binding;
@@ -151,8 +151,3 @@ void VkuPipelineGenerator::set_attribute(uint32_t binding, uint32_t stride,
        adsc.binding = binding;
        adsc.format = format;
 }
-
-void VkuPipelineGenerator::set_descriptor_set_layout(const vku_descriptor &desc)
-{
-       dset_layouts.push_back(desc.layout);
-}