diff --git a/projects/particle_simulation/src/BloomAndFlares.hpp b/projects/particle_simulation/src/BloomAndFlares.hpp index 756b1ca154ea5232df04eb09a88bb743c5bd28aa..0f12f8fbce86ec14ac67690f7e43240cf3845c89 100644 --- a/projects/particle_simulation/src/BloomAndFlares.hpp +++ b/projects/particle_simulation/src/BloomAndFlares.hpp @@ -25,16 +25,16 @@ private: vkcv::Image m_LensFeatures; - vkcv::PipelineHandle m_DownsamplePipe; + vkcv::ComputePipelineHandle m_DownsamplePipe; std::vector<vkcv::DescriptorSetHandle> m_DownsampleDescSets; // per mip desc set - vkcv::PipelineHandle m_UpsamplePipe; + vkcv::ComputePipelineHandle m_UpsamplePipe; std::vector<vkcv::DescriptorSetHandle> m_UpsampleDescSets; // per mip desc set - vkcv::PipelineHandle m_LensFlarePipe; + vkcv::ComputePipelineHandle m_LensFlarePipe; vkcv::DescriptorSetHandle m_LensFlareDescSet; - vkcv::PipelineHandle m_CompositePipe; + vkcv::ComputePipelineHandle m_CompositePipe; vkcv::DescriptorSetHandle m_CompositeDescSet; void execDownsamplePipe(const vkcv::CommandStreamHandle &cmdStream, const vkcv::ImageHandle &colorAttachment); diff --git a/projects/particle_simulation/src/main.cpp b/projects/particle_simulation/src/main.cpp index 4de016aefd345a4231ea2dae0818b0839b163729..a3e34e70128179aa6be93accb24de97efcaae51f 100644 --- a/projects/particle_simulation/src/main.cpp +++ b/projects/particle_simulation/src/main.cpp @@ -137,7 +137,7 @@ int main(int argc, const char **argv) { vkcv::PipelineHandle particlePipeline = core.createGraphicsPipeline(particlePipelineDefinition); - vkcv::PipelineHandle computePipeline = core.createComputePipeline(computeShaderProgram, {core.getDescriptorSet(computeDescriptorSet).layout} ); + vkcv::ComputePipelineHandle computePipeline = core.createComputePipeline(computeShaderProgram, {core.getDescriptorSet(computeDescriptorSet).layout} ); vkcv::Buffer<glm::vec4> color = core.createBuffer<glm::vec4>( vkcv::BufferType::UNIFORM, @@ -228,7 +228,7 @@ int main(int argc, const char **argv) { }); vkcv::DescriptorSetHandle tonemappingDescriptor = core.createDescriptorSet(tonemappingShader.getReflectedDescriptors()[0]); - vkcv::PipelineHandle tonemappingPipe = core.createComputePipeline( + vkcv::ComputePipelineHandle tonemappingPipe = core.createComputePipeline( tonemappingShader, { core.getDescriptorSet(tonemappingDescriptor).layout }); diff --git a/src/vkcv/PipelineManager.hpp b/src/vkcv/PipelineManager.hpp index 18a59d38538143da7e8f8361acd46bf25489e488..ae25e768f27d5bf21aa1224c1f9fefda41dde9ea 100644 --- a/src/vkcv/PipelineManager.hpp +++ b/src/vkcv/PipelineManager.hpp @@ -1,7 +1,7 @@ #pragma once /** - * * @authors Mark Mints + * @authors Mark Mints * @file src/vkcv/PipelineManager.hpp * @brief Creation and handling of Graphic Pipelines */