Skip to content

Commit 39f5c4b

Browse files
committed
Resolved conflicts, merged cpp_compat_intrinsics_refactor
2 parents d42d7e1 + 3b9658b commit 39f5c4b

File tree

11 files changed

+426
-152
lines changed

11 files changed

+426
-152
lines changed

include/nbl/builtin/hlsl/cpp_compat.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <nbl/builtin/hlsl/cpp_compat/basic.h>
55
// it includes vector and matrix
6-
#include <nbl/builtin/hlsl/cpp_compat/intrinsics.h>
6+
#include <nbl/builtin/hlsl/cpp_compat/intrinsics.hlsl>
77
#include <nbl/builtin/hlsl/cpp_compat/promote.hlsl>
88

99
#endif

include/nbl/builtin/hlsl/cpp_compat/basic.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ namespace nbl::hlsl
5555

5656
// We need variadic macro in order to handle multi parameter templates because the
5757
// preprocessor parses the template parameters as different macro parameters.
58-
5958
#define NBL_REF_ARG(...) __VA_ARGS__&
6059
#define NBL_CONST_REF_ARG(...) const __VA_ARGS__&
6160

include/nbl/builtin/hlsl/cpp_compat/intrinsics.h

Lines changed: 0 additions & 133 deletions
This file was deleted.

0 commit comments

Comments
 (0)