Moved output_structs.hlsl

Przemog1 · Przemog1 · commit fb5ec5d9928a · 2025-02-04T11:22:51.000+01:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 99cb3cf0ab8ca156498ebe44786eee53894e3840
+Subproject commit ccc637adce9140f28de52274205aaee5f00adfa7
diff --git a/include/nbl/builtin/hlsl/cpp_compat/impl/intrinsics_impl.hlsl b/include/nbl/builtin/hlsl/cpp_compat/impl/intrinsics_impl.hlsl
@@ -15,7 +15,7 @@
 #include <boost/preprocessor/comparison/not_equal.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
 #include <boost/preprocessor/seq/for_each_i.hpp>
-#include <nbl/builtin/hlsl/spirv_intrinsics/output_structs.hlsl>
+#include <nbl/builtin/hlsl/cpp_compat/output_structs.hlsl>
 
 namespace nbl
 {
diff --git a/include/nbl/builtin/hlsl/cpp_compat/output_structs.hlsl b/include/nbl/builtin/hlsl/cpp_compat/output_structs.hlsl
diff --git a/include/nbl/builtin/hlsl/spirv_intrinsics/glsl.std.450.hlsl b/include/nbl/builtin/hlsl/spirv_intrinsics/glsl.std.450.hlsl
@@ -6,7 +6,7 @@
 #include <nbl/builtin/hlsl/matrix_utils/matrix_traits.hlsl>
 #include <nbl/builtin/hlsl/cpp_compat/basic.h>
 #include <nbl/builtin/hlsl/concepts.hlsl>
-#include <nbl/builtin/hlsl/spirv_intrinsics/output_structs.hlsl>
+#include <nbl/builtin/hlsl/cpp_compat/output_structs.hlsl>
 #include "spirv/unified1/GLSL.std.450.h"
 
 namespace nbl
diff --git a/src/nbl/builtin/CMakeLists.txt b/src/nbl/builtin/CMakeLists.txt
@@ -243,6 +243,7 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/glsl.std.450
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/basic.h")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/intrinsics.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/output_structs.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/matrix.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/promote.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/vector.hlsl")

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#include <boost/preprocessor/comparison/not_equal.hpp>`
`16`	`16`	`#include <boost/preprocessor/punctuation/comma_if.hpp>`
`17`	`17`	`#include <boost/preprocessor/seq/for_each_i.hpp>`
`18`		`-#include <nbl/builtin/hlsl/spirv_intrinsics/output_structs.hlsl>`
	`18`	`+#include <nbl/builtin/hlsl/cpp_compat/output_structs.hlsl>`
`19`	`19`
`20`	`20`	`namespace nbl`
`21`	`21`	`{`