From 8fc72e2715644079dd704157f91fad28ef33ecb2 Mon Sep 17 00:00:00 2001 From: Sebastian Gaida <gaida@ca-digit.com> Date: Sun, 13 Jun 2021 13:18:42 +0200 Subject: [PATCH] [#69][Fix] fix descriptor bindings after merge --- projects/particle_simulation/src/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/particle_simulation/src/main.cpp b/projects/particle_simulation/src/main.cpp index 5c48c52f..98c597db 100644 --- a/projects/particle_simulation/src/main.cpp +++ b/projects/particle_simulation/src/main.cpp @@ -56,6 +56,12 @@ int main(int argc, const char** argv) { particleShaderProgram.reflectShader(vkcv::ShaderStage::VERTEX); particleShaderProgram.reflectShader(vkcv::ShaderStage::FRAGMENT); + std::vector<vkcv::DescriptorBinding> descriptorBindings = { + vkcv::DescriptorBinding(0, vkcv::DescriptorType::UNIFORM_BUFFER, 1, vkcv::ShaderStage::FRAGMENT), + vkcv::DescriptorBinding(1, vkcv::DescriptorType::UNIFORM_BUFFER, 1, vkcv::ShaderStage::FRAGMENT)}; + + vkcv::DescriptorSetHandle descriptorSet = core.createDescriptorSet(descriptorBindings); + vkcv::Buffer<glm::vec3> vertexbuffer = core.createBuffer<glm::vec3>( vkcv::BufferType::VERTEX, 3 @@ -76,12 +82,6 @@ int main(int argc, const char** argv) { 5126, 3}; - - std::vector<vkcv::DescriptorBinding> descriptorBindings = { - vkcv::DescriptorBinding(vkcv::DescriptorType::UNIFORM_BUFFER, 1, vkcv::ShaderStage::FRAGMENT), - vkcv::DescriptorBinding(vkcv::DescriptorType::UNIFORM_BUFFER, 1, vkcv::ShaderStage::FRAGMENT)}; - vkcv::DescriptorSetHandle descriptorSet = core.createDescriptorSet(descriptorBindings); - const vkcv::PipelineConfig particlePipelineDefinition( particleShaderProgram, UINT32_MAX, @@ -109,7 +109,7 @@ int main(int argc, const char** argv) { vkcv::DescriptorWrites setWrites; setWrites.uniformBufferWrites = {vkcv::UniformBufferDescriptorWrite(0,color.getHandle()), vkcv::UniformBufferDescriptorWrite(1,position.getHandle())}; - core.writeResourceDescription(descriptorSet,0,setWrites); + core.writeDescriptorSet(descriptorSet, setWrites); if (!particlePipeline) { -- GitLab