Skip to content

Commit 961757b

Browse files
committed
Pass workGroupIndex separate from the global uniforms
1 parent 059fbf9 commit 961757b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

10_CountingSort/app_resources/prefix_sum_shader.comp.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
4343
nbl::hlsl::sort::CountingParameters < uint32_t > params;
4444
params.dataElementCount = pushData.dataElementCount;
4545
params.elementsPerWT = pushData.elementsPerWT;
46-
params.workGroupIndex = nbl::hlsl::glsl::gl_WorkGroupID().x;
4746
params.minimum = pushData.minimum;
4847
params.maximum = pushData.maximum;
4948

50-
nbl::hlsl::sort::counting <WorkgroupSize, BucketCount, uint32_t, PtrAccessor, PtrAccessor, PtrAccessor, SharedAccessor> counter;
49+
using Counter = nbl::hlsl::sort::counting < WorkgroupSize, BucketCount, PtrAccessor, PtrAccessor, PtrAccessor, SharedAccessor>;
50+
Counter counter = Counter::create(nbl::hlsl::glsl::gl_WorkGroupID().x);
5151

5252
const Ptr input_ptr = Ptr::create(pushData.inputKeyAddress);
5353
const Ptr histogram_ptr = Ptr::create(pushData.histogramAddress);

10_CountingSort/app_resources/scatter_shader.comp.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
6666
nbl::hlsl::sort::CountingParameters < uint32_t > params;
6767
params.dataElementCount = pushData.dataElementCount;
6868
params.elementsPerWT = pushData.elementsPerWT;
69-
params.workGroupIndex = nbl::hlsl::glsl::gl_WorkGroupID().x;
7069
params.minimum = pushData.minimum;
7170
params.maximum = pushData.maximum;
7271

73-
nbl::hlsl::sort::counting <WorkgroupSize, BucketCount, uint32_t, DoublePtrAccessor, DoublePtrAccessor, PtrAccessor, SharedAccessor > counter;
72+
using Counter = nbl::hlsl::sort::counting < WorkgroupSize, BucketCount, DoublePtrAccessor, DoublePtrAccessor, PtrAccessor, SharedAccessor>;
73+
Counter counter = Counter::create(nbl::hlsl::glsl::gl_WorkGroupID().x);
7474

7575
const Ptr input_key_ptr = Ptr::create(pushData.inputKeyAddress);
7676
const Ptr input_value_ptr = Ptr::create(pushData.inputValueAddress);

0 commit comments

Comments
 (0)