Fixed Example 5 even under Vulkan!

(still gives validation error about fences)

Plus a small vulkan fix.

Author: devshgraphicsprogramming

examples_tests/05.NablaTutorialExample/main.cpp

@@ -167,7 +167,7 @@ class NablaTutorialExampleApp : public ApplicationBase
 		const auto swapchainImageUsage = static_cast<asset::IImage::E_USAGE_FLAGS>(asset::IImage::EUF_COLOR_ATTACHMENT_BIT);
 		const video::ISurface::SFormat surfaceFormat(asset::EF_R8G8B8A8_SRGB, asset::ECP_COUNT, asset::EOTF_UNKNOWN);
 
-        CommonAPI::InitWithDefaultExt(initOutput, video::EAT_OPENGL_ES, "NablaTutorialExample", WIN_W, WIN_H, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, nbl::asset::EF_D32_SFLOAT);
+        CommonAPI::InitWithDefaultExt(initOutput, video::EAT_VULKAN, "NablaTutorialExample", WIN_W, WIN_H, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, nbl::asset::EF_D32_SFLOAT);
 		window = std::move(initOutput.window);
 		windowCb = std::move(initOutput.windowCb);
 		apiConnection = std::move(initOutput.apiConnection);
@@ -202,13 +202,19 @@ class NablaTutorialExampleApp : public ApplicationBase
 		Loading an asset bundle. You can specify some flags
 		and parameters to have an impact on extraordinary
 		tasks while loading for example.
-	*/
+		*/
 
 		asset::IAssetLoader::SAssetLoadParams loadingParams;
 		auto images_bundle = assetManager->getAsset("../../media/color_space_test/R8G8B8A8_1.png", loadingParams);
 		assert(!images_bundle.getContents().empty());
 		auto image = images_bundle.getContents().begin()[0];
+
+		/*
+		By default an image that comes out of an image loader will only have the TRANSFER_DST usage flag.
+		We need to add more usages, as only we know what we'll do with the image farther along in the pipeline.
+		*/
 		auto image_raw = static_cast<asset::ICPUImage*>(image.get());
+		image_raw->addImageUsageFlags(asset::IImage::EUF_SAMPLED_BIT);
 
 		/*
 			Specifing gpu image view parameters to create a gpu
@@ -220,7 +226,16 @@ class NablaTutorialExampleApp : public ApplicationBase
 		cpu2gpuParams.waitForCreationToComplete();
 		auto& gpuParams = gpuImage->getCreationParameters();
 
-		IImageView<IGPUImage>::SCreationParams gpuImageViewParams = { static_cast<IGPUImageView::E_CREATE_FLAGS>(0), gpuImage, IImageView<IGPUImage>::ET_2D, gpuParams.format, {}, {static_cast<IImage::E_ASPECT_FLAGS>(0u), 0, gpuParams.mipLevels, 0, gpuParams.arrayLayers} };
+		IImageView<IGPUImage>::SCreationParams gpuImageViewParams = {
+			IGPUImageView::ECF_NONE,
+			gpuImage,
+			IImageView<IGPUImage>::ET_2D,
+			gpuParams.format,
+			{},
+			{
+				IImage::EAF_COLOR_BIT, 0, gpuParams.mipLevels, 0, gpuParams.arrayLayers
+			}
+		};
 		auto gpuImageView = logicalDevice->createGPUImageView(std::move(gpuImageViewParams));
 
 		/*
@@ -279,15 +294,18 @@ class NablaTutorialExampleApp : public ApplicationBase
 				We know ahead of time that `SBasicViewParameters` struct is the expected structure of the only UBO block in the descriptor set nr. 1 of the shader.
 			*/
 
-			IGPUBuffer::SCreationParams creationParams;
+			IGPUBuffer::SCreationParams creationParams = {};
 			creationParams.canUpdateSubRange = true;
 			creationParams.usage = asset::IBuffer::EUF_UNIFORM_BUFFER_BIT;
-			creationParams.sharingMode = asset::E_SHARING_MODE::ESM_CONCURRENT;
-			creationParams.queueFamilyIndexCount = 0u;
-			creationParams.queueFamilyIndices = nullptr;
 			IDriverMemoryBacked::SDriverMemoryRequirements memReq;
 			memReq.vulkanReqs.size = sizeof(SBasicViewParameters);
-			gpuubo = logicalDevice->createGPUBufferOnDedMem(creationParams, memReq);
+			memReq.vulkanReqs.alignment = physicalDevice->getLimits().UBOAlignment;
+			memReq.vulkanReqs.memoryTypeBits = 0xffffffffu;
+			memReq.memoryHeapLocation = IDriverMemoryAllocation::ESMT_DEVICE_LOCAL;
+			memReq.mappingCapability = IDriverMemoryAllocation::EMAF_NONE;
+			memReq.prefersDedicatedAllocation = true;
+			memReq.requiresDedicatedAllocation = true;
+			gpuubo = logicalDevice->createGPUBufferOnDedMem(creationParams,memReq);
 
 			/*
 				Creating descriptor sets - texture (sampler) and basic view parameters (UBO).
@@ -380,6 +398,7 @@ class NablaTutorialExampleApp : public ApplicationBase
 			if (cpuindexbuffer)
 				cpubuffers.push_back(cpuindexbuffer);
 
+			cpu2gpuParams.beginCommandBuffers();
 			auto gpubuffers = cpu2gpu.getGPUObjectsFromAssets(cpubuffers.data(), cpubuffers.data() + cpubuffers.size(), cpu2gpuParams);
 			cpu2gpuParams.waitForCreationToComplete();
 

include/nbl/asset/IImageView.h

@@ -22,6 +22,7 @@ class IImageView : public IDescriptor
 		// no flags for now, yet
 		enum E_CREATE_FLAGS
 		{
+			ECF_NONE = 0
 		};
 		enum E_TYPE
 		{

src/nbl/video/CVulkanLogicalDevice.h

@@ -1276,7 +1276,7 @@ class CVulkanLogicalDevice final : public ILogicalDevice
             vkDescSetLayoutBinding.stageFlags = static_cast<VkShaderStageFlags>(binding->stageFlags);
             vkDescSetLayoutBinding.pImmutableSamplers = nullptr;
 
-            if (binding->samplers && binding->count > 0u)
+            if (binding->type==asset::ESRT_SAMPLED_IMAGE && binding->samplers && binding->count > 0u)
             {
                 // If descriptorType is VK_DESCRIPTOR_TYPE_SAMPLER or VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, and descriptorCount is not 0 and pImmutableSamplers is not NULL:
                 // pImmutableSamplers must be a valid pointer to an array of descriptorCount valid VkSampler handles.