Skip to content

Commit 92cd9e7

Browse files
author
kevyuu
committed
Redefine some macro
1 parent 8dcdfdd commit 92cd9e7

File tree

1 file changed

+9
-1
lines changed
  • include/nbl/builtin/hlsl/cpp_compat

1 file changed

+9
-1
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99

1010
#define ARROW ->
1111
#define NBL_CONSTEXPR constexpr // TODO: rename to NBL_CONSTEXPR_VAR
12+
#define NBL_CONSTEXPR_INLINE constexpr inline
1213
#define NBL_CONSTEXPR_FUNC constexpr
1314
#define NBL_CONSTEXPR_STATIC constexpr static
1415
#define NBL_CONSTEXPR_STATIC_INLINE constexpr static inline
1516
#define NBL_CONSTEXPR_INLINE_FUNC constexpr inline
1617
#define NBL_CONSTEXPR_INLINE_VAR constexpr inline
1718
#define NBL_CONSTEXPR_FORCED_INLINE_FUNC NBL_FORCE_INLINE constexpr
1819
#define NBL_CONST_MEMBER_FUNC const
20+
#define NBL_CONSTEXPR_FUNC_SCOPE_VAR constexpr
21+
#define NBL_CONSTEXPR_OOL_MEMBER constexpr
22+
#define NBL_CONSTEXPR_INLINE_OOL_MEMBER constexpr inline
1923
#define NBL_IF_CONSTEXPR(...) if constexpr (__VA_ARGS__)
2024

2125
namespace nbl::hlsl
@@ -41,13 +45,17 @@ namespace nbl::hlsl
4145

4246
#define ARROW .arrow().
4347
#define NBL_CONSTEXPR const static // TODO: rename to NBL_CONSTEXPR_VAR
48+
#define NBL_CONSTEXPR_INLINE const static
4449
#define NBL_CONSTEXPR_FUNC
4550
#define NBL_CONSTEXPR_STATIC const static
4651
#define NBL_CONSTEXPR_STATIC_INLINE const static
4752
#define NBL_CONSTEXPR_INLINE_FUNC inline
48-
#define NBL_CONSTEXPR_INLINE_VAR inline
53+
#define NBL_CONSTEXPR_INLINE_VAR static const
4954
#define NBL_CONSTEXPR_FORCED_INLINE_FUNC inline
5055
#define NBL_CONST_MEMBER_FUNC
56+
#define NBL_CONSTEXPR_FUNC_SCOPE_VAR const
57+
#define NBL_CONSTEXPR_OOL_MEMBER const
58+
#define NBL_CONSTEXPR_INLINE_OOL_MEMBER const
5159
#define NBL_IF_CONSTEXPR(...) if (__VA_ARGS__)
5260

5361
namespace nbl

0 commit comments

Comments
 (0)