Merge pull request #646 from Devsh-Graphics-Programming/vulkan_1_3_example_06_fix

Vulkan_1_3 example 06 fix

Author: devshgraphicsprogramming

examples_tests

@@ -102,20 +102,14 @@ class IImageView : public IDescriptor
 				return false;
 
 			const auto& imgParams = _params.image->getCreationParameters();
-			/* TODO: LAter
-			image must have been created with a usage value containing at least one of VK_IMAGE_USAGE_SAMPLED_BIT,
-			VK_IMAGE_USAGE_STORAGE_BIT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
-			VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT, VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV, or VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT
-			if (imgParams.)
-				return false;
-			*/
-
+			#if 0 // extremely annoying
 			const auto kValidUsages = IImage::EUF_SAMPLED_BIT|IImage::EUF_STORAGE_BIT|
 				IImage::EUF_RENDER_ATTACHMENT_BIT|IImage::EUF_TRANSIENT_ATTACHMENT_BIT|IImage::EUF_INPUT_ATTACHMENT_BIT|
 				IImage::EUF_SHADING_RATE_ATTACHMENT_BIT|IImage::EUF_FRAGMENT_DENSITY_MAP_BIT;
 			// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkImageViewCreateInfo.html#VUID-VkImageViewCreateInfo-image-04441
 			if ((imgParams.usage.value&kValidUsages)==0u)
 				return false;
+			#endif
 
 			const auto& subresourceRange = _params.subresourceRange;
 			// declared some usages but they are not a subset

include/nbl/asset/IImageView.h

@@ -1068,14 +1068,14 @@ inline bool ILogicalDevice::validateMemoryBarrier(const uint32_t queueFamilyInde
                 // https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkImageMemoryBarrier2-aspectMask-08703
                 // and we check the following all at once:
                 case IGPUImage::LAYOUT::ATTACHMENT_OPTIMAL:
-                    if (srcStageIsHost)
+                    if (!dst && srcStageIsHost)
                         return true;
                     // https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkImageMemoryBarrier2-srcQueueFamilyIndex-03938
                     if (aspectMask && !params.usage.hasFlags(IGPUImage::E_USAGE_FLAGS::EUF_RENDER_ATTACHMENT_BIT))
                         return true;
                     break;
                 case IGPUImage::LAYOUT::READ_ONLY_OPTIMAL:
-                    if (srcStageIsHost)
+                    if (!dst && srcStageIsHost)
                         return true;
                     {
                         constexpr auto ValidUsages = IGPUImage::E_USAGE_FLAGS::EUF_SAMPLED_BIT|IGPUImage::E_USAGE_FLAGS::EUF_INPUT_ATTACHMENT_BIT;
@@ -1091,12 +1091,12 @@ inline bool ILogicalDevice::validateMemoryBarrier(const uint32_t queueFamilyInde
                     break;
                 // https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkImageMemoryBarrier2-oldLayout-01212
                 case IGPUImage::LAYOUT::TRANSFER_SRC_OPTIMAL:
-                    if (srcStageIsHost || !params.usage.hasFlags(IGPUImage::E_USAGE_FLAGS::EUF_TRANSFER_SRC_BIT))
+                    if (!dst && srcStageIsHost || !params.usage.hasFlags(IGPUImage::E_USAGE_FLAGS::EUF_TRANSFER_SRC_BIT))
                         return true;
                     break;
                 // https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkImageMemoryBarrier2-oldLayout-01213
                 case IGPUImage::LAYOUT::TRANSFER_DST_OPTIMAL:
-                    if (srcStageIsHost || !params.usage.hasFlags(IGPUImage::E_USAGE_FLAGS::EUF_TRANSFER_DST_BIT))
+                    if (!dst && srcStageIsHost || !params.usage.hasFlags(IGPUImage::E_USAGE_FLAGS::EUF_TRANSFER_DST_BIT))
                         return true;
                     break;
                 // https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkImageMemoryBarrier2-oldLayout-01198

include/nbl/video/ILogicalDevice.h

@@ -1236,17 +1236,25 @@ bool IGPUCommandBuffer::drawMeshBuffer(const IGPUMeshBuffer* const meshBuffer)
     }
 }
 */
-
+template<bool dst>
 static bool disallowedLayoutForBlitAndResolve(const IGPUImage::LAYOUT layout)
 {
     switch (layout)
     {
         case IGPUImage::LAYOUT::GENERAL:
+            return false;
         case IGPUImage::LAYOUT::TRANSFER_SRC_OPTIMAL:
-        case IGPUImage::LAYOUT::SHARED_PRESENT:
+            if (!dst)
+                return false;
             break;
-        default:
+        case IGPUImage::LAYOUT::TRANSFER_DST_OPTIMAL:
+            if (dst)
+                return false;
+            break;
+        case IGPUImage::LAYOUT::SHARED_PRESENT:
             return false;
+        default:
+            break;
     }
     return true;
 }
@@ -1256,7 +1264,7 @@ bool IGPUCommandBuffer::blitImage(const IGPUImage* const srcImage, const IGPUIma
     if (!checkStateBeforeRecording(queue_flags_t::GRAPHICS_BIT,RENDERPASS_SCOPE::OUTSIDE))
         return false;
 
-    if (regionCount==0u || !pRegions || disallowedLayoutForBlitAndResolve(srcImageLayout) || disallowedLayoutForBlitAndResolve(dstImageLayout))
+    if (regionCount==0u || !pRegions || disallowedLayoutForBlitAndResolve<false>(srcImageLayout) || disallowedLayoutForBlitAndResolve<true>(dstImageLayout))
         return false;
 
     const auto* physDev = getOriginDevice()->getPhysicalDevice();
@@ -1289,7 +1297,7 @@ bool IGPUCommandBuffer::resolveImage(const IGPUImage* const srcImage, const IGPU
     if (!checkStateBeforeRecording(queue_flags_t::GRAPHICS_BIT,RENDERPASS_SCOPE::OUTSIDE))
         return false;
 
-    if (regionCount==0u || !pRegions || disallowedLayoutForBlitAndResolve(srcImageLayout) || disallowedLayoutForBlitAndResolve(dstImageLayout))
+    if (regionCount==0u || !pRegions || disallowedLayoutForBlitAndResolve<false>(srcImageLayout) || disallowedLayoutForBlitAndResolve<true>(dstImageLayout))
         return false;
 
     const auto* physDev = getOriginDevice()->getPhysicalDevice();