show how to rework examples to new SIntendedSubmitInfo

Author: devsh

07_StagingAndMultipleQueues/main.cpp

@@ -121,17 +121,14 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
 		}
 
 		core::smart_refctd_ptr<ISemaphore> imgFillSemaphore = m_device->createSemaphore(0);
-		IQueue::SSubmitInfo::SSemaphoreInfo imgFillSemaphoreInfo[] =
-		{
-			{
+		SIntendedSubmitInfo intendedSubmit = {
+			.queue = transferUpQueue,
+			.waitSemaphores = {},
+			.commandBuffers = {}, // fill later
+			.scratchSemaphore = {
 				.semaphore = imgFillSemaphore.get(),
-				.value = 1,
+				.value = 0,
 				.stageMask = PIPELINE_STAGE_FLAGS::ALL_TRANSFER_BITS
-			},
-			{
-				.semaphore = m_imagesLoadedSemaphore.get(),
-				.value = 0xdeadbeef,
-				.stageMask = PIPELINE_STAGE_FLAGS::ALL_COMMANDS_BITS
 			}
 		};
 
@@ -206,13 +203,7 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
 			}
 
 			IQueue::SSubmitInfo::SCommandBufferInfo imgFillCmdBuffInfo = { cmdBuff.get() };
-			
-			imgFillSemaphoreInfo[1].value = imageIdx + 1u;
-
-
-			SIntendedSubmitInfo intendedSubmit = {
-				.frontHalf = {.queue = transferUpQueue, .waitSemaphores = {}, .commandBuffers = {&imgFillCmdBuffInfo, 1}}, .signalSemaphores = imgFillSemaphoreInfo
-			};
+			intendedSubmit.commandBuffers = {&imgFillCmdBuffInfo,1};
 
 			cmdBuff->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT);
 
@@ -221,18 +212,18 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
 			if (!cmdBuff->pipelineBarrier(E_DEPENDENCY_FLAGS::EDF_NONE, pplnBarrierDepInfo0))
 				logFailAndTerminate("Failed to issue barrier!\n");
 
-
 			transferUpQueue->startCapture();
-			uint64_t oldCntr = imgFillSemaphoreInfo[0].value;
+			const uint64_t oldCntr = intendedSubmit.scratchSemaphore.value;
 			const bool uploadCommendRecorded = m_utils->updateImageViaStagingBuffer(
 				intendedSubmit, cpuImages[imageIdx]->getBuffer(), cpuImages[imageIdx]->getCreationParameters().format,
 				images[imageIdx].get(), IImage::LAYOUT::TRANSFER_DST_OPTIMAL, cpuImages[imageIdx]->getRegions()
 			);
 			if (!uploadCommendRecorded)
 				logFailAndTerminate("Couldn't update image data.\n");
 
-			if(imgFillSemaphoreInfo[0].value != oldCntr)
-				m_logger->log("%d overflows when uploading image %d!\n", ILogger::ELL_PERFORMANCE, imgFillSemaphoreInfo[0].value - oldCntr, imageIdx);
+			const auto newCntr = intendedSubmit.scratchSemaphore.value;
+			if (newCntr!=oldCntr)
+				m_logger->log("%d overflows when uploading image %d!\n", ILogger::ELL_PERFORMANCE, newCntr-oldCntr, imageIdx);
 
 			IGPUCommandBuffer::SPipelineBarrierDependencyInfo pplnBarrierDepInfo1;
 			pplnBarrierDepInfo1.imgBarriers = { &imageLayoutTransitionBarrier1, 1 };
@@ -242,9 +233,8 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
 
 			cmdBuff->end();
 
-			intendedSubmit.advanceScratchSemaphoreValue();
-			IQueue::SSubmitInfo submitInfo[1] = { intendedSubmit };
-			getTransferUpQueue()->submit(submitInfo);
+			const IQueue::SSubmitInfo::SSemaphoreInfo signalSemaphore = {.semaphore=m_imagesLoadedSemaphore.get(),.value=imageIdx+1u,.stageMask=PIPELINE_STAGE_FLAGS::COPY_BIT};
+			getTransferUpQueue()->submit(intendedSubmit.popSubmit({&signalSemaphore,1}));
 			transferUpQueue->endCapture();
 
 

23_ArithmeticUnitTest/main.cpp

@@ -77,11 +77,11 @@ class ArithmeticUnitTestApp final : public application_templates::BasicMultiQueu
 			IGPUBuffer::SCreationParams inputDataBufferCreationParams = {};
 			inputDataBufferCreationParams.size = sizeof(Output<>::data[0]) * elementCount;
 			inputDataBufferCreationParams.usage = IGPUBuffer::EUF_STORAGE_BUFFER_BIT | IGPUBuffer::EUF_TRANSFER_DST_BIT;
-			gpuinputDataBuffer = m_utils->createFilledDeviceLocalBufferOnDedMem(
-				{.queue=getTransferUpQueue()},
+			m_utils->createFilledDeviceLocalBufferOnDedMem(
+				SIntendedSubmitInfo{.queue=getTransferUpQueue()},
 				std::move(inputDataBufferCreationParams),
 				inputData
-			);
+			).move_into(gpuinputDataBuffer);
 		}
 
 		// create 8 buffers for 8 operations
@@ -380,7 +380,7 @@ class ArithmeticUnitTestApp final : public application_templates::BasicMultiQueu
 
 		// download data
 		const SBufferRange<IGPUBuffer> bufferRange = {0u, resultsBuffer->getSize(), outputBuffers[Binop::BindingIndex]};
-		m_utils->downloadBufferRangeViaStagingBufferAutoSubmit({.queue=transferDownQueue},bufferRange,resultsBuffer->getPointer());
+		m_utils->downloadBufferRangeViaStagingBufferAutoSubmit(SIntendedSubmitInfo{.queue=transferDownQueue},bufferRange,resultsBuffer->getPointer());
 
 		using type_t = typename Binop::type_t;
 		const auto dataFromBuffer = reinterpret_cast<const uint32_t*>(resultsBuffer->getPointer());

62_CAD/DrawBuffers.cpp

@@ -31,14 +31,12 @@ void DrawBuffersFiller::allocateIndexBuffer(ILogicalDevice* logicalDevice, uint3
 		indices[i * 6 + 4u] = objIndex * 4u + 2u;
 		indices[i * 6 + 5u] = objIndex * 4u + 3u;
 	}
-	
+
 	IGPUBuffer::SCreationParams indexBufferCreationParams = {};
 	indexBufferCreationParams.size = indexBufferSize;
 	indexBufferCreationParams.usage = IGPUBuffer::EUF_INDEX_BUFFER_BIT | IGPUBuffer::EUF_TRANSFER_DST_BIT;
 
-	SIntendedSubmitInfo::SFrontHalf intendedNextSubmit; 
-	intendedNextSubmit.queue = m_copyQueue;
-	gpuDrawBuffers.indexBuffer = m_utilities->createFilledDeviceLocalBufferOnDedMem(intendedNextSubmit, std::move(indexBufferCreationParams), indices);
+	m_utilities->createFilledDeviceLocalBufferOnDedMem(SIntendedSubmitInfo{.queue=m_copyQueue}, std::move(indexBufferCreationParams), indices).move_into(gpuDrawBuffers.indexBuffer);
 	gpuDrawBuffers.indexBuffer->setObjectDebugName("indexBuffer");
 }
 

62_CAD/main.cpp

@@ -446,7 +446,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 			return logFail("Failed to Create Semaphores!");
 
 		m_overflowSubmitsScratchSemaphoreInfo.semaphore = m_overflowSubmitScratchSemaphore.get();
-		m_overflowSubmitsScratchSemaphoreInfo.value = 1ull;
+		m_overflowSubmitsScratchSemaphoreInfo.value = 0ull;
 
 		// Let's just use the same queue since there's no need for async present
 		if (!m_surface)
@@ -777,21 +777,15 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 			.stageMask = asset::PIPELINE_STAGE_FLAGS::ALL_COMMANDS_BITS
 		};
 
-		const IQueue::SSubmitInfo::SSemaphoreInfo thisFrameRendered = {
-			.semaphore = m_renderSemaphore.get(),
-			.value = m_realFrameIx + 1u,
-			.stageMask = asset::PIPELINE_STAGE_FLAGS::ALL_COMMANDS_BITS
-		};
-
 		IQueue::SSubmitInfo::SCommandBufferInfo cmdbufs[1u] = { {.cmdbuf = m_commandBuffers[resourceIx].get() } };
 		IQueue::SSubmitInfo::SSemaphoreInfo waitSems[2u] = { acquired, prevFrameRendered };
-		IQueue::SSubmitInfo::SSemaphoreInfo singalSems[2u] = { m_overflowSubmitsScratchSemaphoreInfo, thisFrameRendered };
 
-		SIntendedSubmitInfo intendedNextSubmit;
-		intendedNextSubmit.frontHalf.queue = getGraphicsQueue();
-		intendedNextSubmit.frontHalf.commandBuffers = cmdbufs;
-		intendedNextSubmit.frontHalf.waitSemaphores = waitSems;
-		intendedNextSubmit.signalSemaphores = singalSems;
+		SIntendedSubmitInfo intendedNextSubmit = {
+			.queue = getGraphicsQueue(),
+			.waitSemaphores = waitSems,
+			.commandBuffers = cmdbufs,
+			.scratchSemaphore = m_overflowSubmitsScratchSemaphoreInfo
+		};
 
 		addObjects(intendedNextSubmit);
 
@@ -919,7 +913,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 	void submitDraws(SIntendedSubmitInfo& intendedSubmitInfo, bool inBetweenSubmit)
 	{
 		const auto resourceIx = m_realFrameIx%m_framesInFlight;
-		auto* cb = intendedSubmitInfo.frontHalf.getScratchCommandBuffer();
+		auto* cb = intendedSubmitInfo.getScratchCommandBuffer();
 		auto&r = drawBuffer;
 
 		asset::SViewport vp =
@@ -1099,23 +1093,26 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 		else
 		{
 			cb->end();
-			IQueue::SSubmitInfo submitInfo = static_cast<IQueue::SSubmitInfo>(intendedSubmitInfo);
-			if (getGraphicsQueue()->submit({ &submitInfo, 1u }) == IQueue::RESULT::SUCCESS)
+			
+			const auto nextFrameIx = m_realFrameIx+1u;
+			const IQueue::SSubmitInfo::SSemaphoreInfo thisFrameRendered = {
+				.semaphore = m_renderSemaphore.get(),
+				.value = nextFrameIx,
+				.stageMask = asset::PIPELINE_STAGE_FLAGS::ALL_COMMANDS_BITS
+			};
+			if (getGraphicsQueue()->submit(intendedSubmitInfo.popSubmit({&thisFrameRendered,1})) == IQueue::RESULT::SUCCESS)
 			{
-				m_realFrameIx++;
-				intendedSubmitInfo.advanceScratchSemaphoreValue(); // last submits needs to also advance scratch sema value like overflowSubmit() does
+				m_realFrameIx = nextFrameIx;
 
-				IQueue::SSubmitInfo::SSemaphoreInfo renderFinished =
-				{
-					.semaphore = m_renderSemaphore.get(),
-					.value = m_realFrameIx,
-					.stageMask = PIPELINE_STAGE_FLAGS::COLOR_ATTACHMENT_OUTPUT_BIT
-				};
-				m_surface->present(m_currentImageAcquire.imageIndex, { &renderFinished, 1u });
+				IQueue::SSubmitInfo::SSemaphoreInfo presentWait = thisFrameRendered;
+				// the stages for a wait semaphore operation are about what stage you WAIT in, not what stage you wait for
+				presentWait.stageMask = PIPELINE_STAGE_FLAGS::NONE; // top of pipe, there's no explicit presentation engine stage
+				m_surface->present(m_currentImageAcquire.imageIndex,{&presentWait,1});
 			}
 		}
 
-		m_overflowSubmitsScratchSemaphoreInfo.value = intendedSubmitInfo.getScratchSemaphoreNextWait().value; // because we need this info consistent within frames
+		// NOTE: one can just make `m_overflowSubmitsScratchSemaphoreInfo` a reference tied to `intendedSubmitInfo.scratchSemaphore
+		m_overflowSubmitsScratchSemaphoreInfo.value = intendedSubmitInfo.scratchSemaphore.value; // because we need this info consistent within frames
 	}
 
 	void endFrameRender(SIntendedSubmitInfo& intendedSubmitInfo)
@@ -1163,7 +1160,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 		}
 
 		// Use the last command buffer in intendedNextSubmit, it should be in recording state
-		auto* cmdbuf = intendedNextSubmit.frontHalf.getScratchCommandBuffer();
+		auto* cmdbuf = intendedNextSubmit.getScratchCommandBuffer();
 
 		assert(cmdbuf->getState() == video::IGPUCommandBuffer::STATE::RECORDING && cmdbuf->isResettable());
 		assert(cmdbuf->getRecordingFlags().hasFlags(video::IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT));