try out barrier construction utils

Author: devshgraphicsprogramming

include/nbl/asset/ECommonEnums.h

@@ -145,14 +145,15 @@ NBL_ENUM_ADD_BITWISE_OPERATORS(ACCESS_FLAGS)
 
 struct SMemoryBarrier
 {
+    // TODO: pack these up into just `src` and `dst` with another struct
     core::bitflag<PIPELINE_STAGE_FLAGS> srcStageMask = PIPELINE_STAGE_FLAGS::NONE;
     core::bitflag<ACCESS_FLAGS> srcAccessMask = ACCESS_FLAGS::NONE;
     core::bitflag<PIPELINE_STAGE_FLAGS> dstStageMask = PIPELINE_STAGE_FLAGS::NONE;
     core::bitflag<ACCESS_FLAGS> dstAccessMask = ACCESS_FLAGS::NONE;
 
     auto operator<=>(const SMemoryBarrier&) const = default;
 
-    // utilities
+    // Make the immediately previous barrier after this one
     inline SMemoryBarrier prevBarrier(const core::bitflag<PIPELINE_STAGE_FLAGS> prevStageMask, const core::bitflag<ACCESS_FLAGS> prevAccessMask) const
     {
         return {
@@ -162,6 +163,12 @@ struct SMemoryBarrier
             .dstAccessMask = srcAccessMask
         };
     }
+    // Make the immediately previous barrier if you know the penultimate, as in one before the last (previous)
+    inline SMemoryBarrier prevBarrier(const SMemoryBarrier& penultimate) const
+    {
+        return prevBarrier(penultimate.dstStageMask,penultimate.dstAccessMask);
+    }
+    // Make the immediately next barrier after this one
     inline SMemoryBarrier nextBarrier(const core::bitflag<PIPELINE_STAGE_FLAGS> nextStageMask, const core::bitflag<ACCESS_FLAGS> nextAccessMask) const
     {
         return {
@@ -171,6 +178,11 @@ struct SMemoryBarrier
             .dstAccessMask = nextAccessMask
         };
     }
+    // Make the immediately next barrier, if you know the barrier thats after the immediately next one
+    inline SMemoryBarrier nextBarrier(const SMemoryBarrier& twoAhead) const
+    {
+        return prevBarrier(twoAhead.srcStageMask,twoAhead.srcAccessMask);
+    }
 };
 
 inline core::bitflag<ACCESS_FLAGS> allAccessesFromStages(core::bitflag<PIPELINE_STAGE_FLAGS> stages)

src/nbl/video/utilities/ISimpleManagedSurface.cpp

@@ -122,12 +122,7 @@ bool ISimpleManagedSurface::immediateBlit(const image_barrier_t& contents, IQueu
 					// When transitioning the image to VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR or VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, there is no need to delay subsequent processing,
 					// or perform any visibility operations (as vkQueuePresentKHR performs automatic visibility operations).
 					// To achieve this, the dstAccessMask member of the VkImageMemoryBarrier should be set to 0, and the dstStageMask parameter should be set to VK_PIPELINE_STAGE_2_NONE
-					.dep = {
-						.srcStageMask = preBarriers[0].barrier.dep.dstStageMask,
-						.srcAccessMask = preBarriers[0].barrier.dep.dstAccessMask,
-						.dstStageMask = asset::PIPELINE_STAGE_FLAGS::NONE, // Present isn't a stage
-						.dstAccessMask = asset::ACCESS_FLAGS::NONE // it doesn't perform accesses known to VK
-					}
+					.dep = preBarriers[0].barrier.dep.nextBarrier(asset::PIPELINE_STAGE_FLAGS::NONE,asset::ACCESS_FLAGS::NONE)
 				},
 				.image = preBarriers[0].image,
 				.subresourceRange = preBarriers[0].subresourceRange,
@@ -136,12 +131,7 @@ bool ISimpleManagedSurface::immediateBlit(const image_barrier_t& contents, IQueu
 			},
 			{
 				.barrier = {
-					.dep = {
-						.srcStageMask = preBarriers[1].barrier.dep.dstStageMask,
-						.srcAccessMask = preBarriers[1].barrier.dep.dstAccessMask,
-						.dstStageMask = contents.barrier.dep.dstStageMask,
-						.dstAccessMask = contents.barrier.dep.dstAccessMask
-					},
+					.dep = preBarriers[1].barrier.dep.nextBarrier(contents.barrier.dep.dstStageMask,contents.barrier.dep.dstAccessMask),
 					.ownershipOp = IGPUCommandBuffer::SOwnershipTransferBarrier::OWNERSHIP_OP::RELEASE,
 					.otherQueueFamilyIndex = contents.barrier.otherQueueFamilyIndex
 				},