create pipelineLayout util can takes mode, also create layout if missing in params struct

Author: keptsecret

include/nbl/ext/DebugDraw/CDrawAABB.h

@@ -52,23 +52,18 @@ namespace nbl::ext::debug_draw
 
             inline bool validate() const
             {
-                const auto validation = std::to_array
-                ({
-                    std::make_pair(bool(assetManager), "Invalid `creationParams.assetManager` is nullptr!"),
-                    std::make_pair(bool(assetManager->getSystem()), "Invalid `creationParams.assetManager->getSystem()` is nullptr!"),
-                    std::make_pair(bool(utilities), "Invalid `creationParams.utilities` is nullptr!"),
-                    std::make_pair(bool(transfer), "Invalid `creationParams.transfer` is nullptr!"),
-                    std::make_pair(bool(renderpass), "Invalid `creationParams.renderpass` is nullptr!"),
-                    (assetManager && utilities && transfer && renderpass) ? std::make_pair(bool(utilities->getLogicalDevice()->getPhysicalDevice()->getQueueFamilyProperties()[transfer->getFamilyIndex()].queueFlags.hasFlags(video::IQueue::FAMILY_FLAGS::TRANSFER_BIT)), "Invalid `creationParams.transfer` is not capable of transfer operations!") : std::make_pair(false, "Pass valid required DrawAABB::S_CREATION_PARAMETERS!")
-                    });
+                assert(bool(assetManager));
+                assert(bool(assetManager->getSystem()));
+                assert(bool(utilities));
+                assert(bool(transfer));
+                assert(bool(renderpass));
 
                 system::logger_opt_ptr logger = utilities->getLogger();
-                for (const auto& [ok, error] : validation)
-                    if (!ok)
-                    {
-                        logger.log(error, system::ILogger::ELL_ERROR);
-                        return false;
-                    }
+                if (!bool(utilities->getLogicalDevice()->getPhysicalDevice()->getQueueFamilyProperties()[transfer->getFamilyIndex()].queueFlags.hasFlags(video::IQueue::FAMILY_FLAGS::TRANSFER_BIT)))
+                {
+                    logger.log("Invalid `creationParams.transfer` is not capable of transfer operations!", system::ILogger::ELL_ERROR);
+                    return false;
+                }
 
                 return true;
             }
@@ -80,8 +75,8 @@ namespace nbl::ext::debug_draw
         // creates pipeline layout from push constant range
         static core::smart_refctd_ptr<video::IGPUPipelineLayout> createPipelineLayoutFromPCRange(video::ILogicalDevice* device, const asset::SPushConstantRange& pcRange);
 
-        // creates default pipeline layout for streaming version
-        static core::smart_refctd_ptr<video::IGPUPipelineLayout> createDefaultPipelineLayout(video::ILogicalDevice* device);
+        // creates default pipeline layout for pipeline specified by draw mode (note: if mode==BOTH, returns layout for BATCH mode)
+        static core::smart_refctd_ptr<video::IGPUPipelineLayout> createDefaultPipelineLayout(video::ILogicalDevice* device, DrawMode mode = ADM_DRAW_BATCH);
 
         //! mounts the extension's archive to given system - useful if you want to create your own shaders with common header included
         static const core::smart_refctd_ptr<system::IFileArchive> mount(core::smart_refctd_ptr<system::ILogger> logger, system::ISystem* system, const std::string_view archiveAlias = "");

src/nbl/ext/DebugDraw/CDrawAABB.cpp

@@ -31,7 +31,10 @@ core::smart_refctd_ptr<DrawAABB> DrawAABB::create(SCreationParameters&& params)
 	smart_refctd_ptr<IGPUGraphicsPipeline> singlePipeline = nullptr;
 	if (params.drawMode & ADM_DRAW_SINGLE)
 	{
-		singlePipeline = createPipeline(params, params.singlePipelineLayout.get(), "single.vertex.hlsl", "aabb_instances.fragment.hlsl");
+		auto pipelineLayout = params.singlePipelineLayout;
+		if (!pipelineLayout)
+			pipelineLayout = createDefaultPipelineLayout(params.utilities->getLogicalDevice(), ADM_DRAW_SINGLE);
+		singlePipeline = createPipeline(params, pipelineLayout.get(), "single.vertex.hlsl", "aabb_instances.fragment.hlsl");
 		if (!singlePipeline)
 		{
 			logger->log("Failed to create pipeline!", ILogger::ELL_ERROR);
@@ -42,7 +45,10 @@ core::smart_refctd_ptr<DrawAABB> DrawAABB::create(SCreationParameters&& params)
 	smart_refctd_ptr<IGPUGraphicsPipeline> batchPipeline = nullptr;
 	if (params.drawMode & ADM_DRAW_BATCH)
 	{
-		batchPipeline = createPipeline(params, params.batchPipelineLayout.get(), "aabb_instances.vertex.hlsl", "aabb_instances.fragment.hlsl");
+		auto pipelineLayout = params.batchPipelineLayout;
+		if (!pipelineLayout)
+			pipelineLayout = createDefaultPipelineLayout(params.utilities->getLogicalDevice(), ADM_DRAW_BATCH);
+		batchPipeline = createPipeline(params, pipelineLayout.get(), "aabb_instances.vertex.hlsl", "aabb_instances.fragment.hlsl");
 		if (!batchPipeline)
 		{
 			logger->log("Failed to create pipeline!", ILogger::ELL_ERROR);
@@ -287,14 +293,15 @@ core::smart_refctd_ptr<video::IGPUPipelineLayout> DrawAABB::createPipelineLayout
 	return device->createPipelineLayout({ &pcRange , 1 }, nullptr, nullptr, nullptr, nullptr);
 }
 
-core::smart_refctd_ptr<video::IGPUPipelineLayout> DrawAABB::createDefaultPipelineLayout(video::ILogicalDevice* device)
+core::smart_refctd_ptr<video::IGPUPipelineLayout> DrawAABB::createDefaultPipelineLayout(video::ILogicalDevice* device, DrawMode mode)
 {
+	const uint32_t pcSize = (mode & ADM_DRAW_BATCH) ? sizeof(SPushConstants) : sizeof(SSinglePushConstants);
 	SPushConstantRange pcRange = {
 		.stageFlags = IShader::E_SHADER_STAGE::ESS_VERTEX,
 		.offset = 0,
-		.size = sizeof(SPushConstants)
+		.size = pcSize
 	};
-	return device->createPipelineLayout({ &pcRange , 1 }, nullptr, nullptr, nullptr, nullptr);
+	return createPipelineLayoutFromPCRange(device, pcRange);
 }
 
 bool DrawAABB::renderSingle(IGPUCommandBuffer* commandBuffer, const hlsl::shapes::AABB<3, float>& aabb, const hlsl::float32_t4& color, const hlsl::float32_t4x4& cameraMat)
@@ -322,11 +329,6 @@ bool DrawAABB::renderSingle(IGPUCommandBuffer* commandBuffer, const hlsl::shapes
 	return true;
 }
 
-//bool DrawAABB::render(IGPUCommandBuffer* commandBuffer, ISemaphore::SWaitInfo waitInfo, std::span<const InstanceData> aabbInstances, const hlsl::float32_t4x4& cameraMat)
-//{
-//	
-//}
-
 hlsl::float32_t4x4 DrawAABB::getTransformFromAABB(const hlsl::shapes::AABB<3, float>& aabb)
 {
 	const auto diagonal = aabb.getExtent();