change all #includes to use quotes

kpentaris · kpentaris · commit e48ff51335b4 · 2023-05-15T20:16:08.000+03:00
diff --git a/include/nbl/builtin/hlsl/binops.hlsl b/include/nbl/builtin/hlsl/binops.hlsl
@@ -149,4 +149,5 @@ struct max
 }
 }
 }
+
 #endif
diff --git a/include/nbl/builtin/hlsl/bxdf/common.hlsl b/include/nbl/builtin/hlsl/bxdf/common.hlsl
@@ -4,9 +4,9 @@
 #ifndef _NBL_BUILTIN_HLSL_BXDF_COMMON_INCLUDED_
 #define _NBL_BUILTIN_HLSL_BXDF_COMMON_INCLUDED_
 
-#include <nbl/builtin/hlsl/limits.hlsl>
-#include <nbl/builtin/hlsl/numbers.hlsl>
-#include <nbl/builtin/hlsl/math/functions.glsl>
+#include "nbl/builtin/hlsl/limits.hlsl"
+#include "nbl/builtin/hlsl/numbers.hlsl"
+#include "nbl/builtin/hlsl/math/functions.glsl>
 
 namespace nbl
 {
diff --git a/include/nbl/builtin/hlsl/bxdf/reflection.hlsl b/include/nbl/builtin/hlsl/bxdf/reflection.hlsl
@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_BXDF_REFLECTION_INCLUDED_
 #define _NBL_BUILTIN_HLSL_BXDF_REFLECTION_INCLUDED_
 
-#include <nbl/builtin/hlsl/bxdf/common.hlsl>
+#include "nbl/builtin/hlsl/bxdf/common.hlsl"
 
 namespace nbl
 {
diff --git a/include/nbl/builtin/hlsl/bxdf/transmission.hlsl b/include/nbl/builtin/hlsl/bxdf/transmission.hlsl
@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_BXDF_TRANSMISSION_INCLUDED_
 #define _NBL_BUILTIN_HLSL_BXDF_TRANSMISSION_INCLUDED_
 
-#include <nbl/builtin/hlsl/bxdf/common.hlsl>
+#include "nbl/builtin/hlsl/bxdf/common.hlsl"
 
 namespace nbl
 {
diff --git a/include/nbl/builtin/hlsl/scan/declarations.hlsl b/include/nbl/builtin/hlsl/scan/declarations.hlsl
@@ -3,7 +3,7 @@
 
 // REVIEW: Not sure if this file is needed in HLSL implementation
 
-#include <nbl/builtin/hlsl/scan/parameters_struct.hlsl>
+#include "nbl/builtin/hlsl/scan/parameters_struct.hlsl"
 
 
 #ifndef _NBL_HLSL_SCAN_GET_PARAMETERS_DECLARED_
diff --git a/include/nbl/builtin/hlsl/scan/default_scheduler.hlsl b/include/nbl/builtin/hlsl/scan/default_scheduler.hlsl
@@ -1,7 +1,7 @@
 #ifndef _NBL_HLSL_SCAN_DEFAULT_SCHEDULER_INCLUDED_
 #define _NBL_HLSL_SCAN_DEFAULT_SCHEDULER_INCLUDED_
 
-#include <nbl/builtin/hlsl/scan/parameters_struct.hlsl>
+#include "nbl/builtin/hlsl/scan/parameters_struct.hlsl"
 
 #ifdef __cplusplus
 #define uint uint32_t
diff --git a/include/nbl/builtin/hlsl/scan/direct.hlsl b/include/nbl/builtin/hlsl/scan/direct.hlsl
@@ -2,9 +2,9 @@
 #define _NBL_HLSL_WORKGROUP_SIZE_ 256
 #endif
 
-#include <nbl/builtin/hlsl/scan/descriptors.hlsl>
-#include <nbl/builtin/hlsl/scan/virtual_workgroup.hlsl>
-#include <nbl/builtin/hlsl/scan/default_scheduler.hlsl>
+#include "nbl/builtin/hlsl/scan/descriptors.hlsl"
+#include "nbl/builtin/hlsl/scan/virtual_workgroup.hlsl"
+#include "nbl/builtin/hlsl/scan/default_scheduler.hlsl"
 
 namespace nbl
 {
diff --git a/include/nbl/builtin/hlsl/scan/indirect.hlsl b/include/nbl/builtin/hlsl/scan/indirect.hlsl
@@ -3,9 +3,9 @@
 #define _NBL_HLSL_WORKGROUP_SIZE_LOG2_ 8
 #endif
 
-#include <nbl/builtin/hlsl/scan/descriptors.hlsl>
-#include <nbl/builtin/hlsl/scan/virtual_workgroup.hlsl>
-#include <nbl/builtin/hlsl/scan/default_scheduler.hlsl>
+#include "nbl/builtin/hlsl/scan/descriptors.hlsl"
+#include "nbl/builtin/hlsl/scan/virtual_workgroup.hlsl"
+#include "nbl/builtin/hlsl/scan/default_scheduler.hlsl"
 
 namespace nbl
 {
diff --git a/include/nbl/builtin/hlsl/scan/virtual_workgroup.hlsl b/include/nbl/builtin/hlsl/scan/virtual_workgroup.hlsl
@@ -2,12 +2,12 @@
 #define _NBL_HLSL_SCAN_VIRTUAL_WORKGROUP_INCLUDED_
 
 // TODO (PentaKon): Decide if these are needed once we have a clearer picture of the refactor
-#include <nbl/builtin/hlsl/limits/numeric.hlsl>
-#include <nbl/builtin/hlsl/math/typeless_arithmetic.hlsl>
-#include <nbl/builtin/hlsl/workgroup/arithmetic.hlsl> // This is where all the nbl_glsl_workgroupOPs are defined
-#include <nbl/builtin/hlsl/scan/declarations.hlsl>
+#include "nbl/builtin/hlsl/limits/numeric.hlsl"
+#include "nbl/builtin/hlsl/math/typeless_arithmetic.hlsl"
+#include "nbl/builtin/hlsl/workgroup/arithmetic.hlsl" // This is where all the nbl_glsl_workgroupOPs are defined
+#include "nbl/builtin/hlsl/scan/declarations.hlsl"
 
-#include <nbl/builtin/hlsl/binops.hlsl>
+#include "nbl/builtin/hlsl/binops.hlsl"
 
 const uint gl_LocalInvocationIndex: SV_GroupIndex;
 
@@ -58,7 +58,7 @@ namespace scan
 }
 
 #ifndef _NBL_HLSL_SCAN_MAIN_DEFINED_ // TODO REVIEW: Are these needed, can this logic be refactored?
-#include <nbl/builtin/hlsl/scan/default_scheduler.hlsl>
+#include "nbl/builtin/hlsl/scan/default_scheduler.hlsl"
 namespace nbl
 {
 namespace hlsl
diff --git a/include/nbl/builtin/hlsl/shapes/aabb.hlsl b/include/nbl/builtin/hlsl/shapes/aabb.hlsl
@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_SHAPES_AABB_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SHAPES_AABB_INCLUDED_
 
-#include <nbl/builtin/hlsl/format/decode.hlsl>
+#include "nbl/builtin/hlsl/format/decode.hlsl"
 
 
 namespace nbl
diff --git a/include/nbl/builtin/hlsl/shapes/rounded_line.hlsl b/include/nbl/builtin/hlsl/shapes/rounded_line.hlsl
@@ -1,5 +1,5 @@
-#include <nbl/builtin/hlsl/shapes/line.hlsl>
-#include <nbl/builtin/hlsl/shapes/circle.hlsl>
+#include "nbl/builtin/hlsl/shapes/line.hlsl"
+#include "nbl/builtin/hlsl/shapes/circle.hlsl"
 
 namespace nbl
 {
diff --git a/include/nbl/builtin/hlsl/shared_memory_accessor.hlsl b/include/nbl/builtin/hlsl/shared_memory_accessor.hlsl
@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_SHARED_MEMORY_ACCESSOR_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SHARED_MEMORY_ACCESSOR_INCLUDED_
 
-#include <nbl/builtin/hlsl/atomics.hlsl>
+#include "nbl/builtin/hlsl/atomics.hlsl"
 
 // REVIEW: Where would _NBL_HLSL_WORKGROUP_SIZE_ be defined?
 
diff --git a/include/nbl/builtin/hlsl/subgroup/arithmetic_portability.hlsl b/include/nbl/builtin/hlsl/subgroup/arithmetic_portability.hlsl
@@ -5,7 +5,7 @@
 #define _NBL_BUILTIN_HLSL_SUBGROUP_ARITHMETIC_PORTABILITY_INCLUDED_
 
 #ifndef NBL_GL_KHR_shader_subgroup_arithmetic
-#include <nbl/builtin/hlsl/subgroup/basic_portability.hlsl>
+#include "nbl/builtin/hlsl/subgroup/basic_portability.hlsl"
 #endif
 
 namespace nbl
@@ -51,7 +51,7 @@ struct reduction
         native::reduction<T, Binop> reduce;
         return reduce(x);
     #else
-        return portability::reduction<Binop, ScratchAccessor>::create()(x);
+        return portability::reduction<T, Binop, ScratchAccessor>::create()(x);
     #endif
     }
 };
@@ -65,7 +65,7 @@ struct exclusive_scan
         native::exclusive_scan<T, Binop> scan;
         return scan(x);
     #else
-        portability::exclusive_scan<Binop, ScratchAccessor>::create()(x);
+        portability::exclusive_scan<T, Binop, ScratchAccessor>::create()(x);
     #endif
     }
 };
@@ -79,7 +79,7 @@ struct inclusive_scan
         native::inclusive_scan<T, Binop> scan;
         return scan(x);
     #else
-        portability::inclusive_scan<Binop, ScratchAccessor>::create()(x);
+        portability::inclusive_scan<T, Binop, ScratchAccessor>::create()(x);
     #endif
     }
 };
@@ -88,6 +88,6 @@ struct inclusive_scan
 }
 }
 
-#include <nbl/builtin/hlsl/subgroup/arithmetic_portability_impl.hlsl>
+#include "nbl/builtin/hlsl/subgroup/arithmetic_portability_impl.hlsl"
 
 #endif
diff --git a/include/nbl/builtin/hlsl/subgroup/arithmetic_portability_impl.hlsl b/include/nbl/builtin/hlsl/subgroup/arithmetic_portability_impl.hlsl
@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_SUBGROUP_ARITHMETIC_PORTABILITY_IMPL_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SUBGROUP_ARITHMETIC_PORTABILITY_IMPL_INCLUDED_
 
-#include <nbl/builtin/hlsl/subgroup/scratch.hlsl>
+#include "nbl/builtin/hlsl/subgroup/scratch.hlsl"
 
 // REVIEW:  Location and need of these. They need to be over a function but
 //          there's no need to have them over every subgroup func.
diff --git a/include/nbl/builtin/hlsl/subgroup/scratch.hlsl b/include/nbl/builtin/hlsl/subgroup/scratch.hlsl
@@ -4,8 +4,8 @@
 #ifndef _NBL_BUILTIN_HLSL_SUBGROUP_SCRATCH_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SUBGROUP_SCRATCH_INCLUDED_
 
-#include <nbl/builtin/hlsl/workgroup/basic.hlsl>
-#include <nbl/builtin/hlsl/subgroup/basic_portability.hlsl>
+#include "nbl/builtin/hlsl/workgroup/basic.hlsl"
+#include "nbl/builtin/hlsl/subgroup/basic_portability.hlsl"
 
 #ifndef _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
 #define _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
diff --git a/include/nbl/builtin/hlsl/subgroup/shuffle_portability.hlsl b/include/nbl/builtin/hlsl/subgroup/shuffle_portability.hlsl
@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_SUBGROUP_SHUFFLE_PORTABILITY_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SUBGROUP_SHUFFLE_PORTABILITY_INCLUDED_
 
-#include <nbl/builtin/hlsl/subgroup/basic_portability.hlsl>
+#include "nbl/builtin/hlsl/subgroup/basic_portability.hlsl"
 
 #ifndef _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
 #define _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
diff --git a/include/nbl/builtin/hlsl/workgroup/arithmetic.hlsl b/include/nbl/builtin/hlsl/workgroup/arithmetic.hlsl
@@ -4,9 +4,9 @@
 #ifndef _NBL_BUILTIN_HLSL_WORKGROUP_ARITHMETIC_INCLUDED_
 #define _NBL_BUILTIN_HLSL_WORKGROUP_ARITHMETIC_INCLUDED_
 
-#include <nbl/builtin/hlsl/workgroup/shared_arithmetic.hlsl>
-#include <nbl/builtin/hlsl/workgroup/shared_scan.hlsl>
-#include <nbl/builtin/hlsl/workgroup/clustered.hlsl>
+#include "nbl/builtin/hlsl/workgroup/shared_arithmetic.hlsl"
+#include "nbl/builtin/hlsl/workgroup/shared_scan.hlsl"
+#include "nbl/builtin/hlsl/workgroup/clustered.hlsl"
 
 #ifndef _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
 #define _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
diff --git a/include/nbl/builtin/hlsl/workgroup/ballot.hlsl b/include/nbl/builtin/hlsl/workgroup/ballot.hlsl
@@ -4,12 +4,12 @@
 #ifndef _NBL_BUILTIN_HLSL_WORKGROUP_BALLOT_INCLUDED_
 #define _NBL_BUILTIN_HLSL_WORKGROUP_BALLOT_INCLUDED_
 
-#include <nbl/builtin/hlsl/atomics.hlsl>
-#include <nbl/builtin/hlsl/workgroup/basic.hlsl>
-#include <nbl/builtin/hlsl/workgroup/shared_ballot.hlsl>
-#include <nbl/builtin/hlsl/workgroup/shared_scan.hlsl>
-#include <nbl/builtin/hlsl/subgroup/basic_portability.hlsl>
-#include <nbl/builtin/hlsl/subgroup/arithmetic_portability.hlsl>
+#include "nbl/builtin/hlsl/atomics.hlsl"
+#include "nbl/builtin/hlsl/workgroup/basic.hlsl"
+#include "nbl/builtin/hlsl/workgroup/shared_ballot.hlsl"
+#include "nbl/builtin/hlsl/workgroup/shared_scan.hlsl"
+#include "nbl/builtin/hlsl/subgroup/basic_portability.hlsl"
+#include "nbl/builtin/hlsl/subgroup/arithmetic_portability.hlsl"
 
 #ifndef _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
 #define _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
diff --git a/include/nbl/builtin/hlsl/workgroup/basic.hlsl b/include/nbl/builtin/hlsl/workgroup/basic.hlsl
@@ -5,8 +5,8 @@
 #define _NBL_BUILTIN_HLSL_WORKGROUP_BASIC_INCLUDED_
 
 
-#include <nbl/builtin/hlsl/math/typeless_arithmetic.hlsl>
-#include <nbl/builtin/hlsl/subgroup/basic_portability.hlsl>
+//#include "nbl/builtin/hlsl/math/typeless_arithmetic.hlsl"
+#include "nbl/builtin/hlsl/subgroup/basic_portability.hlsl"
 
 #ifndef _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
 #define _NBL_GL_LOCAL_INVOCATION_IDX_DECLARED_
diff --git a/include/nbl/builtin/hlsl/workgroup/clustered.hlsl b/include/nbl/builtin/hlsl/workgroup/clustered.hlsl
@@ -4,8 +4,8 @@
 #ifndef _NBL_BUILTIN_HLSL_WORKGROUP_CLUSTERED_INCLUDED_
 #define _NBL_BUILTIN_HLSL_WORKGROUP_CLUSTERED_INCLUDED_
 
-#include <nbl/builtin/hlsl/workgroup/shared_clustered.hlsl>
-#include <nbl/builtin/hlsl/workgroup/ballot.hlsl>
+#include "nbl/builtin/hlsl/workgroup/shared_clustered.hlsl"
+#include "nbl/builtin/hlsl/workgroup/ballot.hlsl"
 
 /** TODO: @Hazardu or @Przemog or lets have it as a recruitment task
 // `clusterSize` needs to be Power of Two, but the workgroup size does not!
diff --git a/include/nbl/builtin/hlsl/workgroup/shared_arithmetic.hlsl b/include/nbl/builtin/hlsl/workgroup/shared_arithmetic.hlsl
@@ -4,6 +4,6 @@
 #ifndef _NBL_BUILTIN_HLSL_WORKGROUP_SHARED_ARITHMETIC_INCLUDED_
 #define _NBL_BUILTIN_HLSL_WORKGROUP_SHARED_ARITHMETIC_INCLUDED_
 
-#include <nbl/builtin/hlsl/workgroup/shared_clustered.hlsl>
+#include "nbl/builtin/hlsl/workgroup/shared_clustered.hlsl"
 
 #endif
diff --git a/include/nbl/builtin/hlsl/workgroup/shared_ballot.hlsl b/include/nbl/builtin/hlsl/workgroup/shared_ballot.hlsl
@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_WORKGROUP_SHARED_BALLOT_INCLUDED_
 #define _NBL_BUILTIN_HLSL_WORKGROUP_SHARED_BALLOT_INCLUDED_
 
-#include <nbl/builtin/hlsl/workgroup/basic.hlsl>
-#include <nbl/builtin/hlsl/subgroup/shared_arithmetic_portability.hlsl>
+#include "nbl/builtin/hlsl/workgroup/basic.hlsl"
+#include "nbl/builtin/hlsl/subgroup/shared_arithmetic_portability.hlsl"
 
 #endif
diff --git a/include/nbl/builtin/hlsl/workgroup/shared_clustered.hlsl b/include/nbl/builtin/hlsl/workgroup/shared_clustered.hlsl
@@ -4,6 +4,6 @@
 #ifndef _NBL_BUILTIN_HLSL_WORKGROUP_SHARED_CLUSTERED_INCLUDED_
 #define _NBL_BUILTIN_HLSL_WORKGROUP_SHARED_CLUSTERED_INCLUDED_
 
-#include <nbl/builtin/hlsl/workgroup/shared_ballot.hlsl>
+#include "nbl/builtin/hlsl/workgroup/shared_ballot.hlsl"
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -149,4 +149,5 @@ struct max`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`}`
	`152`	`+`
`152`	`153`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#ifndef _NBL_BUILTIN_HLSL_BXDF_REFLECTION_INCLUDED_`
`5`	`5`	`#define _NBL_BUILTIN_HLSL_BXDF_REFLECTION_INCLUDED_`
`6`	`6`
`7`		`-#include <nbl/builtin/hlsl/bxdf/common.hlsl>`
	`7`	`+#include "nbl/builtin/hlsl/bxdf/common.hlsl"`
`8`	`8`
`9`	`9`	`namespace nbl`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#ifndef _NBL_BUILTIN_HLSL_BXDF_TRANSMISSION_INCLUDED_`
`5`	`5`	`#define _NBL_BUILTIN_HLSL_BXDF_TRANSMISSION_INCLUDED_`
`6`	`6`
`7`		`-#include <nbl/builtin/hlsl/bxdf/common.hlsl>`
	`7`	`+#include "nbl/builtin/hlsl/bxdf/common.hlsl"`
`8`	`8`
`9`	`9`	`namespace nbl`
`10`	`10`	`{`