Skip to content

Commit 1d9ce20

Browse files
author
kevyuu
committed
Rename NBL_CONSTEXPR_INLINE to NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR
1 parent 7f6d8b8 commit 1d9ce20

File tree

9 files changed

+74
-74
lines changed

9 files changed

+74
-74
lines changed

‎include/nbl/builtin/hlsl/bxdf/ndf/ggx.hlsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ template<class T>
406406
struct is_ggx : impl::is_ggx<T, typename T::scalar_type> {};
407407

408408
template<typename T>
409-
NBL_CONSTEXPR bool is_ggx_v = is_ggx<T>::value;
409+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR bool is_ggx_v = is_ggx<T>::value;
410410

411411
}
412412
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
#define ARROW ->
1111
#define NBL_CONSTEXPR constexpr // TODO: rename to NBL_CONSTEXPR_VAR
12-
#define NBL_CONSTEXPR_INLINE constexpr inline
1312
#define NBL_CONSTEXPR_FUNC constexpr
1413
#define NBL_CONSTEXPR_STATIC constexpr static
1514
#define NBL_CONSTEXPR_STATIC_INLINE constexpr static inline
1615
#define NBL_CONSTEXPR_INLINE_FUNC constexpr inline
1716
#define NBL_CONSTEXPR_INLINE_VAR constexpr inline
1817
#define NBL_CONSTEXPR_FORCED_INLINE_FUNC NBL_FORCE_INLINE constexpr
1918
#define NBL_CONST_MEMBER_FUNC const
19+
#define NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR constexpr inline
2020
#define NBL_CONSTEXPR_FUNC_SCOPE_VAR constexpr
2121
#define NBL_CONSTEXPR_OOL_MEMBER constexpr
2222
#define NBL_CONSTEXPR_INLINE_OOL_MEMBER constexpr inline
@@ -45,14 +45,14 @@ namespace nbl::hlsl
4545

4646
#define ARROW .arrow().
4747
#define NBL_CONSTEXPR const static // TODO: rename to NBL_CONSTEXPR_VAR
48-
#define NBL_CONSTEXPR_INLINE const static
4948
#define NBL_CONSTEXPR_FUNC
5049
#define NBL_CONSTEXPR_STATIC const static
5150
#define NBL_CONSTEXPR_STATIC_INLINE const static
5251
#define NBL_CONSTEXPR_INLINE_FUNC inline
5352
#define NBL_CONSTEXPR_INLINE_VAR static const
5453
#define NBL_CONSTEXPR_FORCED_INLINE_FUNC inline
5554
#define NBL_CONST_MEMBER_FUNC
55+
#define NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR const static
5656
#define NBL_CONSTEXPR_FUNC_SCOPE_VAR const
5757
#define NBL_CONSTEXPR_OOL_MEMBER const
5858
#define NBL_CONSTEXPR_INLINE_OOL_MEMBER const

‎include/nbl/builtin/hlsl/cpp_compat/impl/intrinsics_impl.hlsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ template<typename UnsignedInteger NBL_FUNC_REQUIRES(hlsl::is_integral_v<Unsigned
2727
inline bool isnan_uint_impl(UnsignedInteger val)
2828
{
2929
using AsFloat = typename float_of_size<sizeof(UnsignedInteger)>::type;
30-
NBL_CONSTEXPR UnsignedInteger Mask = (UnsignedInteger(0) - 1) >> 1;
30+
NBL_CONSTEXPR_FUNC_SCOPE_VAR UnsignedInteger Mask = (UnsignedInteger(0) - 1) >> 1;
3131
UnsignedInteger absVal = val & Mask;
3232
return absVal > (ieee754::traits<AsFloat>::specialValueExp << ieee754::traits<AsFloat>::mantissaBitCnt);
3333
}

‎include/nbl/builtin/hlsl/math/functions.hlsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ void frisvad(NBL_CONST_REF_ARG(T) normal, NBL_REF_ARG(T) tangent, NBL_REF_ARG(T)
123123
bool partitionRandVariable(float leftProb, NBL_REF_ARG(float) xi, NBL_REF_ARG(float) rcpChoiceProb)
124124
{
125125
#ifdef __HLSL_VERSION
126-
NBL_CONSTEXPR float NEXT_ULP_AFTER_UNITY = asfloat(0x3f800001u);
126+
NBL_CONSTEXPR_FUNC_SCOPE_VAR float NEXT_ULP_AFTER_UNITY = asfloat(0x3f800001u);
127127
#else
128-
NBL_CONSTEXPR float32_t NEXT_ULP_AFTER_UNITY = bit_cast<float32_t>(0x3f800001u);
128+
NBL_CONSTEXPR_FUNC_SCOPE_VAR float32_t NEXT_ULP_AFTER_UNITY = bit_cast<float32_t>(0x3f800001u);
129129
#endif
130130
const bool pickRight = xi >= leftProb * NEXT_ULP_AFTER_UNITY;
131131

‎include/nbl/builtin/hlsl/math/quadrature/gauss_legendre/impl.hlsl‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,33 @@
1414

1515
namespace float_t_namespace
1616
{
17-
NBL_CONSTEXPR float_t xi_2[2] = {
17+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_2[2] = {
1818
TYPED_NUMBER(-0.5773502691896257),
1919
TYPED_NUMBER(0.5773502691896257)
2020
};
2121

22-
NBL_CONSTEXPR float_t xi_3[3] = {
22+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_3[3] = {
2323
TYPED_NUMBER(0.0),
2424
TYPED_NUMBER(-0.7745966692414833),
2525
TYPED_NUMBER(0.7745966692414833)
2626
};
2727

28-
NBL_CONSTEXPR float_t xi_4[4] = {
28+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_4[4] = {
2929
TYPED_NUMBER(-0.3399810435848562),
3030
TYPED_NUMBER(0.3399810435848562),
3131
TYPED_NUMBER(-0.8611363115940525),
3232
TYPED_NUMBER(0.8611363115940525)
3333
};
3434

35-
NBL_CONSTEXPR float_t xi_5[5] = {
35+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_5[5] = {
3636
TYPED_NUMBER(0.0),
3737
TYPED_NUMBER(-0.5384693101056830),
3838
TYPED_NUMBER(0.5384693101056830),
3939
TYPED_NUMBER(-0.9061798459386639),
4040
TYPED_NUMBER(0.9061798459386639)
4141
};
4242

43-
NBL_CONSTEXPR float_t xi_6[6] = {
43+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_6[6] = {
4444
TYPED_NUMBER(0.6612093864662645),
4545
TYPED_NUMBER(-0.6612093864662645),
4646
TYPED_NUMBER(-0.2386191860831969),
@@ -49,7 +49,7 @@ NBL_CONSTEXPR float_t xi_6[6] = {
4949
TYPED_NUMBER(0.9324695142031520)
5050
};
5151

52-
NBL_CONSTEXPR float_t xi_7[7] = {
52+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_7[7] = {
5353
TYPED_NUMBER(0.0),
5454
TYPED_NUMBER(0.4058451513773971),
5555
TYPED_NUMBER(-0.4058451513773971),
@@ -59,7 +59,7 @@ NBL_CONSTEXPR float_t xi_7[7] = {
5959
TYPED_NUMBER(0.9491079123427585)
6060
};
6161

62-
NBL_CONSTEXPR float_t xi_8[8] = {
62+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_8[8] = {
6363
TYPED_NUMBER(-0.1834346424956498),
6464
TYPED_NUMBER(0.1834346424956498),
6565
TYPED_NUMBER(-0.5255324099163289),
@@ -70,7 +70,7 @@ NBL_CONSTEXPR float_t xi_8[8] = {
7070
TYPED_NUMBER(0.9602898564975362)
7171
};
7272

73-
NBL_CONSTEXPR float_t xi_9[9] = {
73+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_9[9] = {
7474
TYPED_NUMBER(0.0),
7575
TYPED_NUMBER(-0.8360311073266357),
7676
TYPED_NUMBER(0.8360311073266357),
@@ -82,7 +82,7 @@ NBL_CONSTEXPR float_t xi_9[9] = {
8282
TYPED_NUMBER(0.6133714327005903)
8383
};
8484

85-
NBL_CONSTEXPR float_t xi_10[10] = {
85+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_10[10] = {
8686
TYPED_NUMBER(-0.1488743389816312),
8787
TYPED_NUMBER(0.1488743389816312),
8888
TYPED_NUMBER(-0.4333953941292471),
@@ -95,7 +95,7 @@ NBL_CONSTEXPR float_t xi_10[10] = {
9595
TYPED_NUMBER(0.9739065285171717)
9696
};
9797

98-
NBL_CONSTEXPR float_t xi_11[11] = {
98+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_11[11] = {
9999
TYPED_NUMBER(0.0),
100100
TYPED_NUMBER(-0.2695431559523449),
101101
TYPED_NUMBER(0.2695431559523449),
@@ -109,7 +109,7 @@ NBL_CONSTEXPR float_t xi_11[11] = {
109109
TYPED_NUMBER(0.9782286581460569)
110110
};
111111

112-
NBL_CONSTEXPR float_t xi_12[12] = {
112+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_12[12] = {
113113
TYPED_NUMBER(-0.1252334085114689),
114114
TYPED_NUMBER(0.1252334085114689),
115115
TYPED_NUMBER(-0.3678314989981801),
@@ -124,7 +124,7 @@ NBL_CONSTEXPR float_t xi_12[12] = {
124124
TYPED_NUMBER(0.9815606342467192)
125125
};
126126

127-
NBL_CONSTEXPR float_t xi_13[13] = {
127+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_13[13] = {
128128
TYPED_NUMBER(0.0),
129129
TYPED_NUMBER(-0.2304583159551347),
130130
TYPED_NUMBER(0.2304583159551347),
@@ -140,7 +140,7 @@ NBL_CONSTEXPR float_t xi_13[13] = {
140140
TYPED_NUMBER(0.9841830547185881)
141141
};
142142

143-
NBL_CONSTEXPR float_t xi_14[14] = {
143+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_14[14] = {
144144
TYPED_NUMBER(-0.1080549487073436),
145145
TYPED_NUMBER(0.1080549487073436),
146146
TYPED_NUMBER(-0.3191123689278897),
@@ -157,7 +157,7 @@ NBL_CONSTEXPR float_t xi_14[14] = {
157157
TYPED_NUMBER(0.9862838086968123)
158158
};
159159

160-
NBL_CONSTEXPR float_t xi_15[15] = {
160+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t xi_15[15] = {
161161
TYPED_NUMBER(0.0),
162162
TYPED_NUMBER(-0.2011940939974345),
163163
TYPED_NUMBER(0.2011940939974345),
@@ -175,33 +175,33 @@ NBL_CONSTEXPR float_t xi_15[15] = {
175175
TYPED_NUMBER(0.9879925180204854)
176176
};
177177

178-
NBL_CONSTEXPR float_t wi_2[2] = {
178+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_2[2] = {
179179
TYPED_NUMBER(1.0000000000000000),
180180
TYPED_NUMBER(1.0000000000000000)
181181
};
182182

183-
NBL_CONSTEXPR float_t wi_3[3] = {
183+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_3[3] = {
184184
TYPED_NUMBER(0.8888888888888888),
185185
TYPED_NUMBER(0.5555555555555555),
186186
TYPED_NUMBER(0.5555555555555555)
187187
};
188188

189-
NBL_CONSTEXPR float_t wi_4[4] = {
189+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_4[4] = {
190190
TYPED_NUMBER(0.6521451548625461),
191191
TYPED_NUMBER(0.6521451548625461),
192192
TYPED_NUMBER(0.3478548451374538),
193193
TYPED_NUMBER(0.3478548451374538)
194194
};
195195

196-
NBL_CONSTEXPR float_t wi_5[5] = {
196+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_5[5] = {
197197
TYPED_NUMBER(0.5688888888888888),
198198
TYPED_NUMBER(0.4786286704993664),
199199
TYPED_NUMBER(0.4786286704993664),
200200
TYPED_NUMBER(0.2369268850561890),
201201
TYPED_NUMBER(0.2369268850561890)
202202
};
203203

204-
NBL_CONSTEXPR float_t wi_6[6] = {
204+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_6[6] = {
205205
TYPED_NUMBER(0.3607615730481386),
206206
TYPED_NUMBER(0.3607615730481386),
207207
TYPED_NUMBER(0.4679139345726910),
@@ -210,7 +210,7 @@ NBL_CONSTEXPR float_t wi_6[6] = {
210210
TYPED_NUMBER(0.1713244923791703)
211211
};
212212

213-
NBL_CONSTEXPR float_t wi_7[7] = {
213+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_7[7] = {
214214
TYPED_NUMBER(0.4179591836734693),
215215
TYPED_NUMBER(0.3818300505051189),
216216
TYPED_NUMBER(0.3818300505051189),
@@ -220,7 +220,7 @@ NBL_CONSTEXPR float_t wi_7[7] = {
220220
TYPED_NUMBER(0.1294849661688696)
221221
};
222222

223-
NBL_CONSTEXPR float_t wi_8[8] = {
223+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_8[8] = {
224224
TYPED_NUMBER(0.3626837833783619),
225225
TYPED_NUMBER(0.3626837833783619),
226226
TYPED_NUMBER(0.3137066458778872),
@@ -231,7 +231,7 @@ NBL_CONSTEXPR float_t wi_8[8] = {
231231
TYPED_NUMBER(0.1012285362903762)
232232
};
233233

234-
NBL_CONSTEXPR float_t wi_9[9] = {
234+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_9[9] = {
235235
TYPED_NUMBER(0.3302393550012597),
236236
TYPED_NUMBER(0.1806481606948574),
237237
TYPED_NUMBER(0.1806481606948574),
@@ -243,7 +243,7 @@ NBL_CONSTEXPR float_t wi_9[9] = {
243243
TYPED_NUMBER(0.2606106964029354)
244244
};
245245

246-
NBL_CONSTEXPR float_t wi_10[10] = {
246+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_10[10] = {
247247
TYPED_NUMBER(0.2955242247147528),
248248
TYPED_NUMBER(0.2955242247147528),
249249
TYPED_NUMBER(0.2692667193099963),
@@ -256,7 +256,7 @@ NBL_CONSTEXPR float_t wi_10[10] = {
256256
TYPED_NUMBER(0.0666713443086881)
257257
};
258258

259-
NBL_CONSTEXPR float_t wi_11[11] = {
259+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_11[11] = {
260260
TYPED_NUMBER(0.2729250867779006),
261261
TYPED_NUMBER(0.2628045445102466),
262262
TYPED_NUMBER(0.2628045445102466),
@@ -270,7 +270,7 @@ NBL_CONSTEXPR float_t wi_11[11] = {
270270
TYPED_NUMBER(0.0556685671161736)
271271
};
272272

273-
NBL_CONSTEXPR float_t wi_12[12] = {
273+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_12[12] = {
274274
TYPED_NUMBER(0.2491470458134027),
275275
TYPED_NUMBER(0.2491470458134027),
276276
TYPED_NUMBER(0.2334925365383548),
@@ -285,7 +285,7 @@ NBL_CONSTEXPR float_t wi_12[12] = {
285285
TYPED_NUMBER(0.0471753363865118)
286286
};
287287

288-
NBL_CONSTEXPR float_t wi_13[13] = {
288+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_13[13] = {
289289
TYPED_NUMBER(0.2325515532308739),
290290
TYPED_NUMBER(0.2262831802628972),
291291
TYPED_NUMBER(0.2262831802628972),
@@ -301,7 +301,7 @@ NBL_CONSTEXPR float_t wi_13[13] = {
301301
TYPED_NUMBER(0.0404840047653158)
302302
};
303303

304-
NBL_CONSTEXPR float_t wi_14[14] = {
304+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_14[14] = {
305305
TYPED_NUMBER(0.2152638534631577),
306306
TYPED_NUMBER(0.2152638534631577),
307307
TYPED_NUMBER(0.2051984637212956),
@@ -318,7 +318,7 @@ NBL_CONSTEXPR float_t wi_14[14] = {
318318
TYPED_NUMBER(0.0351194603317518)
319319
};
320320

321-
NBL_CONSTEXPR float_t wi_15[15] = {
321+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR float_t wi_15[15] = {
322322
TYPED_NUMBER(0.2025782419255612),
323323
TYPED_NUMBER(0.1984314853271115),
324324
TYPED_NUMBER(0.1984314853271115),

‎include/nbl/builtin/hlsl/mpl.hlsl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,25 @@ struct countl_zero : impl::countl_zero<uint64_t(N), (sizeof(T) * 8)>
4141
static_assert(is_integral<T>::value, "countl_zero type parameter must be an integral type");
4242
};
4343
template<class T, T N>
44-
NBL_CONSTEXPR T countl_zero_v = countl_zero<T,N>::value;
44+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR T countl_zero_v = countl_zero<T,N>::value;
4545

4646
template<uint64_t N>
4747
struct is_pot : bool_constant< (N > 0 && !(N & (N - 1))) > {};
4848
template<uint64_t N>
49-
NBL_CONSTEXPR bool is_pot_v = is_pot<N>::value;
49+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR bool is_pot_v = is_pot<N>::value;
5050

5151
template<uint64_t X>
5252
struct log2
5353
{
5454
NBL_CONSTEXPR_STATIC_INLINE uint16_t value = X ? (1ull<<6)-countl_zero<uint64_t, X>::value-1 : -1ull;
5555
};
5656
template<uint64_t X>
57-
NBL_CONSTEXPR uint16_t log2_v = log2<X>::value;
57+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR uint16_t log2_v = log2<X>::value;
5858

5959
template<uint64_t X>
6060
struct log2_ceil : integral_constant<uint16_t, log2_v<X> + uint16_t(!is_pot_v<X>)> {};
6161
template<uint64_t X>
62-
NBL_CONSTEXPR uint16_t log2_ceil_v = log2_ceil<X>::value;
62+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR uint16_t log2_ceil_v = log2_ceil<X>::value;
6363

6464
template<typename T, T X, int32_t S>
6565
struct rotl
@@ -69,7 +69,7 @@ struct rotl
6969
NBL_CONSTEXPR_STATIC_INLINE T value = (S >= 0) ? ((X << r) | (X >> (N - r))) : (X >> (-r)) | (X << (N - (-r)));
7070
};
7171
template<typename T, T X, int32_t S>
72-
NBL_CONSTEXPR T rotl_v = rotl<T,X,S>::value;
72+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR T rotl_v = rotl<T,X,S>::value;
7373

7474
template<typename T, T X, int32_t S>
7575
struct rotr
@@ -79,50 +79,50 @@ struct rotr
7979
NBL_CONSTEXPR_STATIC_INLINE T value = (S >= 0) ? ((X >> r) | (X << (N - r))) : (X << (-r)) | (X >> (N - (-r)));
8080
};
8181
template<typename T, T X, int32_t S>
82-
NBL_CONSTEXPR T rotr_v = rotr<T,X,S>::value;
82+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR T rotr_v = rotr<T,X,S>::value;
8383

8484
template<uint64_t X, uint64_t M>
8585
struct align_up
8686
{
8787
NBL_CONSTEXPR_STATIC_INLINE uint64_t value = X ? (((X-1)/M+1)*M):0;
8888
};
8989
template<uint64_t X, uint64_t M>
90-
NBL_CONSTEXPR uint64_t align_up_v = align_up<X,M>::value;
90+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR uint64_t align_up_v = align_up<X,M>::value;
9191

9292
template<typename T, T X, T Y>
9393
struct max
9494
{
9595
NBL_CONSTEXPR_STATIC_INLINE T value = X<Y ? Y:X;
9696
};
9797
template<typename T, T X, T Y>
98-
NBL_CONSTEXPR T max_v = max<T,X,Y>::value;
98+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR T max_v = max<T,X,Y>::value;
9999

100100
template<typename T, T X, T Y>
101101
struct min
102102
{
103103
NBL_CONSTEXPR_STATIC_INLINE T value = X<Y ? X:Y;
104104
};
105105
template<typename T, T X, T Y>
106-
NBL_CONSTEXPR T min_v = min<T,X,Y>::value;
106+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR T min_v = min<T,X,Y>::value;
107107

108108
template<uint64_t X>
109109
struct round_up_to_pot : integral_constant<uint64_t, uint64_t(1) << log2_ceil_v<X> > {};
110110
template<uint64_t X>
111-
NBL_CONSTEXPR uint64_t round_up_to_pot_v = round_up_to_pot<X>::value;
111+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR uint64_t round_up_to_pot_v = round_up_to_pot<X>::value;
112112

113113
// TODO: should rename log2 to log2_floor
114114
template<uint64_t X>
115115
struct round_down_to_pot : integral_constant<uint64_t, uint64_t(1) << log2_v<X> > {};
116116
template<uint64_t X>
117-
NBL_CONSTEXPR uint64_t round_down_to_pot_v = round_down_to_pot<X>::value;
117+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR uint64_t round_down_to_pot_v = round_down_to_pot<X>::value;
118118

119119
template<uint64_t X>
120120
struct find_lsb
121121
{
122122
NBL_CONSTEXPR_STATIC_INLINE uint16_t value = log2<X & -X>::value;
123123
};
124124
template<uint64_t X>
125-
NBL_CONSTEXPR uint64_t find_lsb_v = find_lsb<X>::value;
125+
NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR uint64_t find_lsb_v = find_lsb<X>::value;
126126
}
127127
}
128128
}

0 commit comments

Comments
 (0)