diff --git a/src/vkcv/DescriptorSetManager.cpp b/src/vkcv/DescriptorSetManager.cpp index 76f36e4702c996ee770f407d9cf50a73c67342a9..605e5d3c05e032770a2d38ad569b42564c6f20ba 100644 --- a/src/vkcv/DescriptorSetManager.cpp +++ b/src/vkcv/DescriptorSetManager.cpp @@ -54,17 +54,16 @@ namespace vkcv { } } - vk::DescriptorPool DescriptorSetManager::allocateDescriptorPool() { + bool DescriptorSetManager::allocateDescriptorPool() { vk::DescriptorPool pool; if (getCore().getContext().getDevice().createDescriptorPool(&m_PoolInfo, nullptr, &pool) != vk::Result::eSuccess) { vkcv_log(LogLevel::WARNING, "Failed to allocate descriptor pool"); - pool = nullptr; + return false; } else { m_Pools.push_back(pool); + return true; } - - return pool; } DescriptorSetManager::DescriptorSetManager() noexcept : diff --git a/src/vkcv/DescriptorSetManager.hpp b/src/vkcv/DescriptorSetManager.hpp index ae3f879ce4ef9d3b16f687bc237060c98591bd65..06ea6dd78313627bb2fc77ea6b8e5f3f992db7cb 100644 --- a/src/vkcv/DescriptorSetManager.hpp +++ b/src/vkcv/DescriptorSetManager.hpp @@ -59,9 +59,9 @@ namespace vkcv { * constructor is called initially in the constructor and then every time the pool runs * out memory. * - * @return a DescriptorPool object + * @return whether a DescriptorPool object could be created */ - vk::DescriptorPool allocateDescriptorPool(); + bool allocateDescriptorPool(); public: /** diff --git a/src/vkcv/GraphicsPipelineManager.cpp b/src/vkcv/GraphicsPipelineManager.cpp index 767616f704fe8e3a75e369089828aac7bb03dc45..4f8a217dc36441ad001762f5360705b04313f8bf 100644 --- a/src/vkcv/GraphicsPipelineManager.cpp +++ b/src/vkcv/GraphicsPipelineManager.cpp @@ -706,15 +706,6 @@ namespace vkcv { 0 ); - vkcv_log(LogLevel::RAW_INFO, "STAGES: %lu", shaderStages.size()); - for (const auto& shaderStage : shaderStages) { - vkcv_log(LogLevel::RAW_INFO, "STAGE: %s %s %s", - shaderStage.pName, - vk::to_string(shaderStage.stage).c_str(), - vk::to_string(shaderStage.flags).c_str() - ); - } - auto pipelineResult = getCore().getContext().getDevice().createGraphicsPipeline( nullptr, graphicsPipelineCreateInfo );