fix splitting out subgroup params into separate file

keptsecret · keptsecret · commit f1c5a7701ce4 · 2025-06-18T15:54:55.000+07:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 3e910b55890aac6ccc3fcd9e1c43b5f5ee84b0df
+Subproject commit 0ba8eed179bd6a4d86a63625cb9254a6f4a9714c
diff --git a/include/nbl/builtin/hlsl/subgroup2/arithmetic_params.hlsl b/include/nbl/builtin/hlsl/subgroup2/arithmetic_params.hlsl
@@ -4,11 +4,12 @@
 #ifndef _NBL_BUILTIN_HLSL_SUBGROUP2_ARITHMETIC_PARAMS_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SUBGROUP2_ARITHMETIC_PARAMS_INCLUDED_
 
-
+#ifdef __HLSL_VERSION
 #include "nbl/builtin/hlsl/device_capabilities_traits.hlsl"
+#include "nbl/builtin/hlsl/subgroup2/ballot.hlsl"
+#endif
 #include "nbl/builtin/hlsl/concepts.hlsl"
 
-
 namespace nbl
 {
 namespace hlsl
diff --git a/include/nbl/builtin/hlsl/subgroup2/arithmetic_portability.hlsl b/include/nbl/builtin/hlsl/subgroup2/arithmetic_portability.hlsl
@@ -4,10 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_SUBGROUP2_ARITHMETIC_PORTABILITY_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SUBGROUP2_ARITHMETIC_PORTABILITY_INCLUDED_
 
-
 #include "nbl/builtin/hlsl/device_capabilities_traits.hlsl"
-
-#include "nbl/builtin/hlsl/subgroup2/ballot.hlsl"
 #include "nbl/builtin/hlsl/subgroup2/arithmetic_portability_impl.hlsl"
 
 namespace nbl
diff --git a/include/nbl/builtin/hlsl/workgroup2/shared_scan.hlsl b/include/nbl/builtin/hlsl/workgroup2/shared_scan.hlsl
@@ -7,6 +7,7 @@
 #include "nbl/builtin/hlsl/workgroup/broadcast.hlsl"
 #include "nbl/builtin/hlsl/glsl_compat/subgroup_basic.hlsl"
 #include "nbl/builtin/hlsl/subgroup2/ballot.hlsl"
+#include "nbl/builtin/hlsl/subgroup2/arithmetic_params.hlsl"
 #include "nbl/builtin/hlsl/subgroup2/arithmetic_portability.hlsl"
 #include "nbl/builtin/hlsl/mpl.hlsl"
 #include "nbl/builtin/hlsl/workgroup2/arithmetic_config.hlsl"
