diff --git a/include/vkcv/Core.hpp b/include/vkcv/Core.hpp index decf51ae8c546814b93a87aac42bb9e60c3471e0..3fb2759949c195d2a9bf33eed265e81482f2e987 100644 --- a/include/vkcv/Core.hpp +++ b/include/vkcv/Core.hpp @@ -15,6 +15,7 @@ #include "Buffer.hpp" #include "Image.hpp" #include "PipelineConfig.hpp" +#include "ComputePipelineConfig.hpp" #include "CommandResources.hpp" #include "SyncResources.hpp" #include "Result.hpp" @@ -159,14 +160,11 @@ namespace vkcv * Creates a basic vulkan compute pipeline using @p shader program and returns it using the @p handle. * Fixed Functions for pipeline are set with standard values. * - * @param shader program that hold the compiles compute shader - * @param handle a handle to return the created vulkan handle + * @param config Contains the compiles compute shader and the corresponding descriptor set layout * @return True if pipeline creation was successful, False if not */ [[nodiscard]] - ComputePipelineHandle createComputePipeline( - const ShaderProgram &shaderProgram, - const std::vector<vk::DescriptorSetLayout> &descriptorSetLayouts); + ComputePipelineHandle createComputePipeline(const ComputePipelineConfig &config); /** * Creates a basic vulkan render pass using @p config from the render pass config class and returns it using the @p handle. diff --git a/src/vkcv/Core.cpp b/src/vkcv/Core.cpp index 6585c0bb6cba55920593c0e85a6d40d729d77011..8abf178437c12613b652ff3db38f7661951fc5e4 100644 --- a/src/vkcv/Core.cpp +++ b/src/vkcv/Core.cpp @@ -141,11 +141,9 @@ namespace vkcv return m_PipelineManager->createPipeline(config, *m_PassManager); } - ComputePipelineHandle Core::createComputePipeline( - const ShaderProgram &shaderProgram, - const std::vector<vk::DescriptorSetLayout>& descriptorSetLayouts) + ComputePipelineHandle Core::createComputePipeline(const ComputePipelineConfig &config) { - return m_ComputePipelineManager->createComputePipeline(shaderProgram, descriptorSetLayouts); + return m_ComputePipelineManager->createComputePipeline(config); } PassHandle Core::createPass(const PassConfig &config)