Fix compilation errors in screenshot.

Author: theoreticalphysicsftw

include/nbl/ext/ScreenShot/ScreenShot.h

@@ -21,12 +21,12 @@ using namespace nbl::video;
 inline core::smart_refctd_ptr<ICPUImageView> createScreenShot(
 	ILogicalDevice* logicalDevice,
 	IQueue* queue,
-	IGPUSemaphore* semaphore,
+	ISemaphore* semaphore,
 	const IGPUImageView* gpuImageView,
 	const ACCESS_FLAGS accessMask,
 	const IImage::LAYOUT imageLayout)
 {
-	assert(logicalDevice->getPhysicalDevice()->getQueueFamilyProperties().begin()[queue->getFamilyIndex()].queueFlags.value&IQueue::FAMILY_FLAGS::TRANSFER_BIT);
+	assert(bool(logicalDevice->getPhysicalDevice()->getQueueFamilyProperties().begin()[queue->getFamilyIndex()].queueFlags.value & IQueue::FAMILY_FLAGS::TRANSFER_BIT));
 
 	auto fetchedImageViewParmas = gpuImageView->getCreationParameters();
 	auto gpuImage = fetchedImageViewParmas.image;
@@ -47,7 +47,7 @@ inline core::smart_refctd_ptr<ICPUImageView> createScreenShot(
 	{
 		// commandbuffer should refcount the pool, so it should be 100% legal to drop at the end of the scope
 		auto gpuCommandPool = logicalDevice->createCommandPool(queue->getFamilyIndex(),IGPUCommandPool::CREATE_FLAGS::TRANSIENT_BIT);
-		logicalDevice->createCommandBuffers(gpuCommandPool.get(), IGPUCommandBuffer::LEVEL::PRIMARY, 1u, &gpuCommandBuffer);
+		gpuCommandPool->createCommandBuffers(IGPUCommandPool::BUFFER_LEVEL::PRIMARY, 1u, &gpuCommandBuffer);
 		assert(gpuCommandBuffer);
 	}
 	gpuCommandBuffer->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT);
@@ -83,7 +83,7 @@ inline core::smart_refctd_ptr<ICPUImageView> createScreenShot(
 			barrier.barrier.dep.dstAccessMask = ACCESS_FLAGS::TRANSFER_READ_BIT;
 			barrier.oldLayout = imageLayout;
 			barrier.newLayout = IImage::LAYOUT::TRANSFER_SRC_OPTIMAL;
-			barrier.image = gpuImage;
+			barrier.image = gpuImage.get();
 			barrier.subresourceRange.aspectMask = fetchedImageViewParmas.subresourceRange.aspectMask;
 			barrier.subresourceRange.baseMipLevel = mipLevelToScreenshot;
 			barrier.subresourceRange.levelCount = 1u;
@@ -104,29 +104,39 @@ inline core::smart_refctd_ptr<ICPUImageView> createScreenShot(
 	}
 	gpuCommandBuffer->end();
 
-	auto fence = logicalDevice->createFence(static_cast<IGPUFence::E_CREATE_FLAGS>(0));
+	auto signalSemaphore = logicalDevice->createSemaphore(0);
 
 	IQueue::SSubmitInfo info;
-	info.commandBufferCount = 1u;
-	info.commandBuffers = &gpuCommandBuffer.get();
-	info.pSignalSemaphores = nullptr;
-	info.signalSemaphoreCount = 0u;
-	info.pWaitSemaphores = &semaphore;
-	info.waitSemaphoreCount = semaphore ? 1u:0u;
-	auto stageflags = PIPELINE_STAGE_FLAGS::ALL_COMMANDS_BITS; // assume the image we're trying to download could be touched by anything before (host manipulation is implicitly visibile because of submit's guarantees)
-	info.pWaitDstStageMask = &stageflags;
-	queue->submit(1u, &info, fence.get());
-
-	if (!logicalDevice->blockForFences(1u, &fence.get()))
+	IQueue::SSubmitInfo::SCommandBufferInfo cmdBufferInfo{ gpuCommandBuffer.get() };
+	IQueue::SSubmitInfo::SSemaphoreInfo signalSemaphoreInfo;
+	IQueue::SSubmitInfo::SSemaphoreInfo waitSemaphoreInfo;
+	signalSemaphoreInfo.semaphore = signalSemaphore.get();
+	signalSemaphoreInfo.value = 1;
+	signalSemaphoreInfo.stageMask = PIPELINE_STAGE_FLAGS::ALL_COMMANDS_BITS;
+	info.commandBuffers = { &cmdBufferInfo, &cmdBufferInfo + 1 };
+	info.signalSemaphores = { &signalSemaphoreInfo, &signalSemaphoreInfo + 1 };
+
+	if (semaphore)
+	{
+		waitSemaphoreInfo.semaphore = semaphore;
+		waitSemaphoreInfo.value = 1;
+		waitSemaphoreInfo.stageMask = PIPELINE_STAGE_FLAGS::ALL_COMMANDS_BITS;
+		info.waitSemaphores = { &waitSemaphoreInfo, &waitSemaphoreInfo + 1 };
+	}
+
+	queue->submit({ &info, &info + 1});
+
+	ILogicalDevice::SSemaphoreWaitInfo waitInfo{ signalSemaphore.get(), 1u};
+
+	if (logicalDevice->blockForSemaphores({&waitInfo, &waitInfo + 1}) != ILogicalDevice::WAIT_RESULT::SUCCESS)
 		return nullptr;
 
 	core::smart_refctd_ptr<ICPUImageView> cpuImageView;
 	{
 		const auto gpuTexelBufferSize = gpuTexelBuffer->getSize(); // If you get validation errors from the `invalidateMappedMemoryRanges` we need to expose VK_WHOLE_BUFFER equivalent constant
-		IDeviceMemoryAllocation::MappedMemoryRange mappedMemoryRange(gpuTexelBuffer->getBoundMemory(),0u,gpuTexelBufferSize);
-		logicalDevice->mapMemory(mappedMemoryRange, IDeviceMemoryAllocation::EMCAF_READ);
+		ILogicalDevice::MappedMemoryRange mappedMemoryRange(gpuTexelBuffer->getBoundMemory().memory,0u,gpuTexelBufferSize);
 
-		if (gpuTexelBuffer->getBoundMemory()->haveToMakeVisible())
+		if (gpuTexelBuffer->getBoundMemory().memory->haveToMakeVisible())
 			logicalDevice->invalidateMappedMemoryRanges(1u,&mappedMemoryRange);
 
 		auto cpuNewImage = ICPUImage::create(std::move(fetchedGpuImageParams));
@@ -146,10 +156,9 @@ inline core::smart_refctd_ptr<ICPUImageView> createScreenShot(
 
 		auto cpuNewTexelBuffer = core::make_smart_refctd_ptr<ICPUBuffer>(gpuTexelBufferSize);
 		{
-			memcpy(cpuNewTexelBuffer->getPointer(), gpuTexelBuffer->getBoundMemory()->getMappedPointer(), gpuTexelBuffer->getSize());
+			memcpy(cpuNewTexelBuffer->getPointer(), gpuTexelBuffer->getBoundMemory().memory->getMappedPointer(), gpuTexelBuffer->getSize());
 		}
 		cpuNewImage->setBufferAndRegions(core::smart_refctd_ptr(cpuNewTexelBuffer), regions);
-		logicalDevice->unmapMemory(gpuTexelBuffer->getBoundMemory());
 		{
 			auto newCreationParams = cpuNewImage->getCreationParameters();
 
@@ -172,7 +181,7 @@ inline core::smart_refctd_ptr<ICPUImageView> createScreenShot(
 inline bool createScreenShot(
 	ILogicalDevice* logicalDevice,
 	IQueue* queue,
-	IGPUSemaphore* semaphore,
+	ISemaphore* semaphore,
 	const IGPUImageView* gpuImageView,
 	IAssetManager* assetManager,
 	system::IFile* outFile,
@@ -188,7 +197,7 @@ inline bool createScreenShot(
 inline bool createScreenShot(
 	ILogicalDevice* logicalDevice,
 	IQueue* queue,
-	IGPUSemaphore* semaphore,
+	ISemaphore* semaphore,
 	const IGPUImageView* gpuImageView,
 	IAssetManager* assetManager,
 	const std::filesystem::path& filename,