Ported Example 23, and fixed a few bugs here and there

devshgraphicsprogramming · devshgraphicsprogramming · commit 4d303d64ccd2 · 2024-01-14T01:08:03.000+01:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 6ec293bfc60f4f0b05c2c89278e4a6a65cd263d2
+Subproject commit 558f9724b4aef1cf8119607ac6e692120ac6c38f
diff --git a/include/nbl/video/IGPUCommandBuffer.h b/include/nbl/video/IGPUCommandBuffer.h
@@ -667,7 +667,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
             BOTH = OUTSIDE|INSIDE
         };
         using queue_flags_t = IQueue::FAMILY_FLAGS;
-        bool checkStateBeforeRecording(const core::bitflag<queue_flags_t> allowedQueueFlags=queue_flags_t::NONE, const core::bitflag<RENDERPASS_SCOPE> renderpassScope=RENDERPASS_SCOPE::BOTH);
+        bool checkStateBeforeRecording(const core::bitflag<queue_flags_t> allowedQueueFlags=~queue_flags_t::NONE, const core::bitflag<RENDERPASS_SCOPE> renderpassScope=RENDERPASS_SCOPE::BOTH);
 
         template<typename ResourceBarrier>
         bool invalidDependency(const SDependencyInfo<ResourceBarrier>& depInfo) const;
diff --git a/include/nbl/video/utilities/SIntendedSubmitInfo.h b/include/nbl/video/utilities/SIntendedSubmitInfo.h
@@ -28,7 +28,7 @@ struct SIntendedSubmitInfo final
             // frees have already been latched on the scratch semaphore you must signal anyway.
             if (!scratch->getRecordingFlags().hasFlags(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT))
                 return false;
-            if (scratch->getState()!=IGPUCommandBuffer::STATE::INITIAL)
+            if (scratch->getState()!=IGPUCommandBuffer::STATE::RECORDING)
                 return false;
             return true;
         }
@@ -93,7 +93,8 @@ struct SIntendedSubmitInfo final
                 public:
                     inline ~CRAIISpanPatch()
                     {
-                        toNullify->commandBuffers = {};
+                        if (toNullify)
+                            toNullify->commandBuffers = {};
                     }
                     inline CRAIISpanPatch(CRAIISpanPatch&& other) : CRAIISpanPatch() {operator=(std::move(other));}
                     inline CRAIISpanPatch& operator=(CRAIISpanPatch&& rhs)

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ struct SIntendedSubmitInfo final`
`28`	`28`	`// frees have already been latched on the scratch semaphore you must signal anyway.`
`29`	`29`	`if (!scratch->getRecordingFlags().hasFlags(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT))`
`30`	`30`	`return false;`
`31`		`- if (scratch->getState()!=IGPUCommandBuffer::STATE::INITIAL)`
	`31`	`+ if (scratch->getState()!=IGPUCommandBuffer::STATE::RECORDING)`
`32`	`32`	`return false;`
`33`	`33`	`return true;`
`34`	`34`	`}`
`@@ -93,7 +93,8 @@ struct SIntendedSubmitInfo final`
`93`	`93`	`public:`
`94`	`94`	`inline ~CRAIISpanPatch()`
`95`	`95`	`{`
`96`		`- toNullify->commandBuffers = {};`
	`96`	`+ if (toNullify)`
	`97`	`+ toNullify->commandBuffers = {};`
`97`	`98`	`}`
`98`	`99`	`inline CRAIISpanPatch(CRAIISpanPatch&& other) : CRAIISpanPatch() {operator=(std::move(other));}`
`99`	`100`	`inline CRAIISpanPatch& operator=(CRAIISpanPatch&& rhs)`