Skip to content

Commit 3e443b1

Browse files
author
kevyuu
committed
Add nbl prefix to hlsl::select
1 parent 30b4f52 commit 3e443b1

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

28_FFTBloom/app_resources/fft_convolve_ifft.hlsl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,17 @@ struct PreloadedSecondAxisAccessor : PreloadedAccessorMirrorTradeBase
9191

9292
if (glsl::gl_WorkGroupID().x)
9393
{
94-
complex_t<scalar_t> lo = hlsl::select(oddThread, otherThreadLoOrHi, loOrHi);
95-
complex_t<scalar_t> hi = hlsl::select(oddThread, loOrHi, otherThreadLoOrHi);
94+
complex_t<scalar_t> lo = nbl::hlsl::select(oddThread, otherThreadLoOrHi, loOrHi);
95+
complex_t<scalar_t> hi = nbl::hlsl::select(oddThread, loOrHi, otherThreadLoOrHi);
9696
fft::unpack<scalar_t>(lo, hi);
9797

9898
// --------------------------------------------------- MIRROR PADDING -------------------------------------------------------------------------------------------
9999
#ifdef MIRROR_PADDING
100-
preloaded[localElementIndex] = hlsl::select(_static_cast<bool>(oddThread ^ invert), hi, lo);
100+
preloaded[localElementIndex] = nbl::hlsl::select(_static_cast<bool>(oddThread ^ invert), hi, lo);
101101
// ----------------------------------------------------- ZERO PADDING -------------------------------------------------------------------------------------------
102102
#else
103103
const complex_t<scalar_t> Zero = { scalar_t(0), scalar_t(0) };
104-
preloaded[localElementIndex] = hlsl::select(invert, Zero, hlsl::select(oddThread, hi, lo));
104+
preloaded[localElementIndex] = nbl::hlsl::select(invert, Zero, nbl::hlsl::select(oddThread, hi, lo));
105105
#endif
106106
// ------------------------------------------------ END PADDING DIVERGENCE ----------------------------------------------------------------------------------------
107107
}
@@ -114,7 +114,7 @@ struct PreloadedSecondAxisAccessor : PreloadedAccessorMirrorTradeBase
114114
const complex_t<scalar_t> evenThreadLo = { loOrHi.real(), otherThreadLoOrHi.real() };
115115
// Odd thread writes `hi = Z1 + iN1`
116116
const complex_t<scalar_t> oddThreadHi = { otherThreadLoOrHi.imag(), loOrHi.imag() };
117-
preloaded[localElementIndex] = hlsl::select(_static_cast<bool>(oddThread ^ invert), oddThreadHi, evenThreadLo);
117+
preloaded[localElementIndex] = nbl::hlsl::select(_static_cast<bool>(oddThread ^ invert), oddThreadHi, evenThreadLo);
118118
}
119119
paddedIndex += WorkgroupSize / 2;
120120
}

28_FFTBloom/app_resources/kernel_fft_second_axis.hlsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ struct PreloadedSecondAxisAccessor : MultiChannelPreloadedAccessorMirrorTradeBas
7070
const vector <scalar_t, 2> loOrHiVector = vector <scalar_t, 2>(loOrHi.real(), loOrHi.imag());
7171
const vector <scalar_t, 2> otherThreadloOrHiVector = glsl::subgroupShuffleXor< vector <scalar_t, 2> >(loOrHiVector, 1u);
7272
const complex_t<scalar_t> otherThreadLoOrHi = { otherThreadloOrHiVector.x, otherThreadloOrHiVector.y };
73-
complex_t<scalar_t> lo = hlsl::select(oddThread, otherThreadLoOrHi, loOrHi);
74-
complex_t<scalar_t> hi = hlsl::select(oddThread, loOrHi, otherThreadLoOrHi);
73+
complex_t<scalar_t> lo = nbl::hlsl::select(oddThread, otherThreadLoOrHi, loOrHi);
74+
complex_t<scalar_t> hi = nbl::hlsl::select(oddThread, loOrHi, otherThreadLoOrHi);
7575
fft::unpack<scalar_t>(lo, hi);
76-
preloaded[channel][localElementIndex] = hlsl::select(oddThread, hi, lo);
76+
preloaded[channel][localElementIndex] = nbl::hlsl::select(oddThread, hi, lo);
7777

7878
packedColumnIndex += WorkgroupSize / 2;
7979
}
@@ -110,7 +110,7 @@ struct PreloadedSecondAxisAccessor : MultiChannelPreloadedAccessorMirrorTradeBas
110110
const complex_t<scalar_t> evenThreadLo = { loOrHi.real(), otherThreadLoOrHi.real() };
111111
// Odd thread writes `hi = Z1 + iN1`
112112
const complex_t<scalar_t> oddThreadHi = { otherThreadLoOrHi.imag(), loOrHi.imag() };
113-
preloaded[channel][localElementIndex] = hlsl::select(oddThread, oddThreadHi, evenThreadLo);
113+
preloaded[channel][localElementIndex] = nbl::hlsl::select(oddThread, oddThreadHi, evenThreadLo);
114114

115115
packedColumnIndex += WorkgroupSize / 2;
116116
}

0 commit comments

Comments
 (0)