Skip to content

Commit e1db3ed

Browse files
committed
Replace scratch with histogram
1 parent 29cb3f2 commit e1db3ed

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

CountingSort/app_resources/common.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct CountingPushData
99
{
1010
uint64_t inputKeyAddress;
1111
uint64_t inputValueAddress;
12-
uint64_t scratchAddress;
12+
uint64_t histogramAddress;
1313
uint64_t outputKeyAddress;
1414
uint64_t outputValueAddress;
1515
uint32_t dataElementCount;

CountingSort/app_resources/prefix_sum_shader.comp.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
4747

4848
nbl::hlsl::sort::counting <WorkgroupSize, BucketCount, uint32_t, PtrAccessor, PtrAccessor, PtrAccessor, SharedAccessor> counter;
4949
PtrAccessor input_accessor = PtrAccessor::create(pushData.inputKeyAddress);
50-
PtrAccessor scratch_accessor = PtrAccessor::create(pushData.scratchAddress);
50+
PtrAccessor histogram_accessor = PtrAccessor::create(pushData.histogramAddress);
5151
SharedAccessor shared_accessor;
5252
counter.histogram(
5353
input_accessor,
54-
scratch_accessor,
54+
histogram_accessor,
5555
shared_accessor,
5656
params
5757
);

CountingSort/app_resources/scatter_shader.comp.hlsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
7777
PtrAccessor::create(pushData.inputValueAddress),
7878
PtrAccessor::create(pushData.outputValueAddress)
7979
);
80-
PtrAccessor scratch_accessor = PtrAccessor::create(pushData.scratchAddress);
80+
PtrAccessor histogram_accessor = PtrAccessor::create(pushData.histogramAddress);
8181
SharedAccessor shared_accessor;
8282
counter.scatter(
8383
key_accessor,
8484
value_accessor,
85-
scratch_accessor,
85+
histogram_accessor,
8686
shared_accessor,
8787
params
8888
);

CountingSort/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class CountingSortApp final : public application_templates::MonoDeviceApplicatio
205205
auto pc = CountingPushData {
206206
.inputKeyAddress = buffer_device_address[0],
207207
.inputValueAddress = buffer_device_address[1],
208-
.scratchAddress = buffer_device_address[2],
208+
.histogramAddress = buffer_device_address[2],
209209
.outputKeyAddress = buffer_device_address[3],
210210
.outputValueAddress = buffer_device_address[4],
211211
.dataElementCount = element_count,

0 commit comments

Comments
 (0)