small ports of some other scan module components

Author: kpentaris

include/nbl/builtin/hlsl/scan/declarations.hlsl

@@ -0,0 +1,66 @@
+#ifndef _NBL_HLSL_SCAN_DECLARATIONS_INCLUDED_
+#define _NBL_HLSL_SCAN_DECLARATIONS_INCLUDED_
+
+// REVIEW: Not sure if this file is needed in HLSL implementation
+
+#include <nbl/builtin/hlsl/scan/parameters_struct.hlsl>
+
+
+#ifndef _NBL_HLSL_SCAN_GET_PARAMETERS_DECLARED_
+namespace nbl
+{
+namespace hlsl
+{
+namespace scan
+{
+	Parameters_t getParameters();
+}
+}
+}
+#define _NBL_HLSL_SCAN_GET_PARAMETERS_DECLARED_
+#endif
+
+#ifndef _NBL_HLSL_SCAN_GET_PADDED_DATA_DECLARED_
+namespace nbl
+{
+namespace hlsl
+{
+namespace scan
+{
+	template<typename Storage_t>
+	void getData(
+		inout Storage_t data,
+		in uint levelInvocationIndex,
+		in uint localWorkgroupIndex,
+		in uint treeLevel,
+		in uint pseudoLevel
+	);
+}
+}
+}
+#define _NBL_HLSL_SCAN_GET_PADDED_DATA_DECLARED_
+#endif
+
+#ifndef _NBL_HLSL_SCAN_SET_DATA_DECLARED_
+namespace nbl
+{
+namespace hlsl
+{
+namespace scan
+{
+	template<typename Storage_t>
+	void setData(
+		in Storage_t data,
+		in uint levelInvocationIndex,
+		in uint localWorkgroupIndex,
+		in uint treeLevel,
+		in uint pseudoLevel,
+		in bool inRange
+	);
+}
+}
+}
+#define _NBL_HLSL_SCAN_SET_DATA_DECLARED_
+#endif
+
+#endif

include/nbl/builtin/hlsl/scan/default_scheduler.hlsl

@@ -1,7 +1,7 @@
-#ifndef _NBL_GLSL_SCAN_DEFAULT_SCHEDULER_INCLUDED_
-#define _NBL_GLSL_SCAN_DEFAULT_SCHEDULER_INCLUDED_
+#ifndef _NBL_HLSL_SCAN_DEFAULT_SCHEDULER_INCLUDED_
+#define _NBL_HLSL_SCAN_DEFAULT_SCHEDULER_INCLUDED_
 
-#include <nbl/builtin/glsl/scan/parameters_struct.hlsl>
+#include <nbl/builtin/hlsl/scan/parameters_struct.hlsl>
 
 #ifdef __cplusplus
 #define uint uint32_t
@@ -139,7 +139,7 @@ namespace scheduler
 		if(gl_LocalInvocationIndex == 0u) 
 		{
 			uint64_t original;
-			InterlockedAdd(scanScratch.workgroupsStarted, 1u, original); // TODO (PentaKon): Refactor this when the ScanScratch descriptor set is declared
+			InterlockedAdd(scanScratch.workgroupsStarted, 1u, original); // REVIEW: Refactor InterlockedAdd with GLSL terminology? // TODO (PentaKon): Refactor this when the ScanScratch descriptor set is declared
 			sharedScratch.set(gl_LocalInvocationIndex, original);
 		}
 		else if (gl_LocalInvocationIndex == 1u) 
@@ -189,16 +189,16 @@ namespace scheduler
 					dependentsFinishedFlagOffset /= _NBL_HLSL_WORKGROUP_SIZE_;
 				dependentsFinishedFlagOffset += params.finishedFlagOffset[prevLevel];
 				while (scanScratch.data[dependentsFinishedFlagOffset]!=dependentsCount) // TODO (PentaKon): Refactor this when the ScanScratch descriptor set is declared
-					GroupMemoryBarrierWithGroupSync();
+					GroupMemoryBarrierWithGroupSync(); // TODO (PentaKon): Possibly refactor?
 			}
 		}
-		GroupMemoryBarrierWithGroupSync();
+		GroupMemoryBarrierWithGroupSync(); // TODO (PentaKon): Possibly refactor?
 		return false;
 	}
 
 	void markComplete(in DefaultSchedulerParameters_t params, in uint topLevel, in uint treeLevel, in uint localWorkgroupIndex)
 	{
-		GroupMemoryBarrierWithGroupSync(); // must complete writing the data before flags itself as complete
+		GroupMemoryBarrierWithGroupSync(); // must complete writing the data before flags itself as complete  // TODO (PentaKon): Possibly refactor?
 		if (gl_LocalInvocationIndex==0u)
 		{
 			uint finishedFlagOffset = params.finishedFlagOffset[treeLevel];