Skip to content

Commit ee32a83

Browse files
committed
Fix pending, want to merge master
1 parent 74b978a commit ee32a83

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

include/nbl/builtin/hlsl/workgroup/fft.hlsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ struct FFT<2,false, Scalar, device_capabilities>
9292
complex_t<Scalar> hi = {hiVec.x, hiVec.y};
9393

9494
// special first iteration - only if workgroupsize > subgroupsize
95-
if (_NBL_HLSL_WORKGROUP_SIZE_ ^ glsl::gl_SubgroupSize())
95+
if (_NBL_HLSL_WORKGROUP_SIZE_ > glsl::gl_SubgroupSize())
9696
fft::DIF<Scalar>::radix2(fft::twiddle<false, Scalar>(threadID, _NBL_HLSL_WORKGROUP_SIZE_), lo, hi);
9797

9898
// Run bigger steps until Subgroup-sized
@@ -105,7 +105,7 @@ struct FFT<2,false, Scalar, device_capabilities>
105105
}
106106

107107
// special last workgroup-shuffle - only if workgroupsize > subgroupsize
108-
if (_NBL_HLSL_WORKGROUP_SIZE_ ^ glsl::gl_SubgroupSize())
108+
if (_NBL_HLSL_WORKGROUP_SIZE_ > glsl::gl_SubgroupSize())
109109
{
110110
// Wait for all threads to be done with reads in the last loop before writing to shared mem
111111
sharedmemAdaptor.workgroupExecutionAndMemoryBarrier();
@@ -168,7 +168,7 @@ struct FFT<2,true, Scalar, device_capabilities>
168168
subgroup::FFT<true, Scalar, device_capabilities>::__call(lo, hi);
169169

170170
// special first workgroup-shuffle - only if workgroupsize > subgroupsize
171-
if (_NBL_HLSL_WORKGROUP_SIZE_ ^ glsl::gl_SubgroupSize())
171+
if (_NBL_HLSL_WORKGROUP_SIZE_ > glsl::gl_SubgroupSize())
172172
{
173173
exchangeValues<SharedMemoryAccessor, Scalar>(lo, hi, threadID, glsl::gl_SubgroupSize(), sharedmemAdaptor);
174174
}
@@ -182,7 +182,7 @@ struct FFT<2,true, Scalar, device_capabilities>
182182
}
183183

184184
// special last iteration - only if workgroupsize > subgroupsize
185-
if (_NBL_HLSL_WORKGROUP_SIZE_ ^ glsl::gl_SubgroupSize())
185+
if (_NBL_HLSL_WORKGROUP_SIZE_ > glsl::gl_SubgroupSize())
186186
{
187187
fft::DIT<Scalar>::radix2(fft::twiddle<true, Scalar>(threadID, _NBL_HLSL_WORKGROUP_SIZE_), lo, hi);
188188
divides_assign< complex_t<Scalar> > divAss;

0 commit comments

Comments
 (0)