Skip to content

Commit 76443fd

Browse files
b0nes164b0nes164
committed
Style fixes
1 parent 28193eb commit 76443fd

File tree

6 files changed

+61
-61
lines changed

6 files changed

+61
-61
lines changed

‎vello/src/render.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ impl Render {
200200
);
201201
let reduced_buf = BufferProxy::new(
202202
buffer_sizes.path_reduced.size_in_bytes().into(),
203-
"reduced_buf",
203+
"vello.reduced_buf",
204204
);
205205
let path_scan_bump_buf = BufferProxy::new(
206206
buffer_sizes.path_scan_bump.size_in_bytes().into(),
207-
"path_scan_bump_buf",
207+
"vello.path_scan_bump_buf",
208208
);
209209
recording.clear_all(path_scan_bump_buf);
210210
recording.clear_all(reduced_buf);

‎vello/src/shaders.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ pub(crate) fn full_shaders(
9797
let pathtag_scan_csdldf = add_shader!(
9898
pathtag_scan_csdldf,
9999
[Uniform, BufReadOnly, Buffer, Buffer, Buffer],
100-
CpuShaderType::Present(vello_shaders::cpu::pathtag_scan_single)
100+
CpuShaderType::Present(vello_shaders::cpu::pathtag_scan)
101101
);
102102

103103
let bbox_clear = add_shader!(bbox_clear, [Uniform, Buffer]);

‎vello_shaders/shader/pathtag_scan_csdldf.wgsl

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ fn attempt_lookback(
5353
){
5454
let payload: u32 = atomicLoad(&reduced[lookback_ix][member_ix]);
5555
let flag_value: u32 = payload & FLAG_MASK;
56-
if(flag_value == FLAG_REDUCTION){
56+
if flag_value == FLAG_REDUCTION {
5757
*spin_count = 0u;
5858
*prev += payload >> 2u;
5959
*reduction_complete = true;
60-
} else if (flag_value == FLAG_INCLUSIVE){
60+
} else if flag_value == FLAG_INCLUSIVE {
6161
*spin_count = 0u;
6262
*prev += payload >> 2u;
6363
atomicStore(&reduced[part_ix][member_ix], ((aggregate + *prev) << 2u) | FLAG_INCLUSIVE);
@@ -77,12 +77,12 @@ fn fallback(
7777
){
7878
let fallback_payload = (fallback_aggregate << 2u) | select(FLAG_INCLUSIVE, FLAG_REDUCTION, fallback_ix != 0u);
7979
let prev_payload = atomicMax(&reduced[fallback_ix][member_ix], fallback_payload);
80-
if(prev_payload == 0u){
80+
if prev_payload == 0u {
8181
*prev += fallback_aggregate;
8282
} else {
8383
*prev += prev_payload >> 2u;
8484
}
85-
if(fallback_ix == 0u || (prev_payload & FLAG_MASK) == FLAG_INCLUSIVE){
85+
if fallback_ix == 0u || (prev_payload & FLAG_MASK) == FLAG_INCLUSIVE {
8686
atomicStore(&reduced[part_ix][member_ix], ((aggregate + *prev) << 2u) | FLAG_INCLUSIVE);
8787
sh_tag_broadcast[member_ix] = *prev;
8888
*inclusive_complete = true;
@@ -94,8 +94,8 @@ fn main(
9494
@builtin(local_invocation_id) local_id: vec3<u32>,
9595
) {
9696
//acquire the partition index, set the lock
97-
if(local_id.x == 0u){
98-
sh_broadcast = atomicAdd(&scan_bump[0u], 1u);
97+
if local_id.x == 0u {
98+
sh_broadcast = atomicAdd(&scan_bump[0], 1u);
9999
sh_lock = LOCKED;
100100
}
101101
workgroupBarrier();
@@ -121,7 +121,7 @@ fn main(
121121

122122
//Broadcast the results and flag into device memory
123123
if local_id.x == WG_SIZE - 1u {
124-
if(part_ix != 0u){
124+
if part_ix != 0u {
125125
atomicStore(&reduced[part_ix][0], (agg[0] << 2u) | FLAG_REDUCTION);
126126
atomicStore(&reduced[part_ix][1], (agg[1] << 2u) | FLAG_REDUCTION);
127127
atomicStore(&reduced[part_ix][2], (agg[2] << 2u) | FLAG_REDUCTION);
@@ -137,7 +137,7 @@ fn main(
137137
}
138138

139139
//Lookback and potentially fallback
140-
if(part_ix != 0u){
140+
if part_ix != 0u {
141141
var lookback_ix = part_ix - 1u;
142142

143143
var inc0: bool = false;
@@ -163,76 +163,76 @@ fn main(
163163

164164
//Lookback, with a single thread
165165
//Last thread in the workgroup has the complete aggregate
166-
if(local_id.x == WG_SIZE - 1u){
167-
for(var spin_count: u32 = 0u; spin_count < MAX_SPIN_COUNT; ){
166+
if local_id.x == WG_SIZE - 1u {
167+
for (var spin_count: u32 = 0u; spin_count < MAX_SPIN_COUNT; ) {
168168
//TRANS_IX
169-
if(!inc0 && !red0){
169+
if !inc0 && !red0 {
170170
attempt_lookback(
171171
part_ix,
172172
lookback_ix,
173173
0u,
174-
agg[0u],
174+
agg[0],
175175
&spin_count,
176176
&prev0,
177177
&red0,
178178
&inc0);
179179
}
180180

181181
//PATHSEG_IX
182-
if(!inc1 && !red1){
182+
if !inc1 && !red1 {
183183
attempt_lookback(
184184
part_ix,
185185
lookback_ix,
186186
1u,
187-
agg[1u],
187+
agg[1],
188188
&spin_count,
189189
&prev1,
190190
&red1,
191191
&inc1);
192192
}
193193

194194
//PATHSEG_OFFSET
195-
if(!inc2 && !red2){
195+
if !inc2 && !red2 {
196196
attempt_lookback(
197197
part_ix,
198198
lookback_ix,
199199
2u,
200-
agg[2u],
200+
agg[2],
201201
&spin_count,
202202
&prev2,
203203
&red2,
204204
&inc2);
205205
}
206206

207207
//STYLE_IX
208-
if(!inc3 && !red3){
208+
if !inc3 && !red3 {
209209
attempt_lookback(
210210
part_ix,
211211
lookback_ix,
212212
3u,
213-
agg[3u],
213+
agg[3],
214214
&spin_count,
215215
&prev3,
216216
&red3,
217217
&inc3);
218218
}
219219

220220
//PATH_IX
221-
if(!inc4 && !red4){
221+
if !inc4 && !red4 {
222222
attempt_lookback(
223223
part_ix,
224224
lookback_ix,
225225
4u,
226-
agg[4u],
226+
agg[4],
227227
&spin_count,
228228
&prev4,
229229
&red4,
230230
&inc4);
231231
}
232232

233233
//Have we completed the current reduction or inclusive sum for all PathTag members?
234-
if((inc0 || red0) && (inc1 || red1) && (inc2 || red2) && (inc3 || red3) && (inc4 || red4)){
235-
if(inc0 && inc1 && inc2 && inc3 && inc4){
234+
if (inc0 || red0) && (inc1 || red1) && (inc2 || red2) && (inc3 || red3) && (inc4 || red4) {
235+
if inc0 && inc1 && inc2 && inc3 && inc4 {
236236
sh_lock = UNLOCKED;
237237
break;
238238
} else {
@@ -251,7 +251,7 @@ fn main(
251251
//If we didn't complete the lookback within the allotted spins,
252252
//prepare for the fallback by broadcasting the lookback tile id
253253
//and states of the tagmonoid struct members
254-
if(sh_lock == LOCKED){
254+
if sh_lock == LOCKED {
255255
sh_broadcast = lookback_ix;
256256
sh_fallback_state[0] = !inc0 && !red0;
257257
sh_fallback_state[1] = !inc1 && !red1;
@@ -263,7 +263,7 @@ fn main(
263263
workgroupBarrier();
264264

265265
//Fallback
266-
if(sh_lock == LOCKED){
266+
if sh_lock == LOCKED {
267267
let fallback_ix = sh_broadcast;
268268

269269
red0 = sh_fallback_state[0];
@@ -282,114 +282,114 @@ fn main(
282282
workgroupBarrier();
283283
if local_id.x + (1u << i) < WG_SIZE {
284284
let index = local_id.x + (1u << i);
285-
if(red0){
285+
if red0 {
286286
f_agg[0] += sh_fallback[index][0];
287287
}
288-
if(red1){
288+
if red1 {
289289
f_agg[1] += sh_fallback[index][1];
290290
}
291-
if(red2){
291+
if red2 {
292292
f_agg[2] += sh_fallback[index][2];
293293
}
294-
if(red3){
294+
if red3 {
295295
f_agg[3] += sh_fallback[index][3];
296296
}
297-
if(red4){
297+
if red4 {
298298
f_agg[4] += sh_fallback[index][4];
299299
}
300300
}
301301
workgroupBarrier();
302-
if(red0){
302+
if red0 {
303303
sh_fallback[local_id.x][0] = f_agg[0];
304304
}
305305

306-
if(red1){
306+
if red1 {
307307
sh_fallback[local_id.x][1] = f_agg[1];
308308
}
309309

310-
if(red2){
310+
if red2 {
311311
sh_fallback[local_id.x][2] = f_agg[2];
312312
}
313313

314-
if(red3){
314+
if red3 {
315315
sh_fallback[local_id.x][3] = f_agg[3];
316316
}
317317

318-
if(red4){
318+
if red4 {
319319
sh_fallback[local_id.x][4] = f_agg[4];
320320
}
321321
}
322322

323323
//Fallback and attempt insertion of status flag
324-
if(local_id.x == WG_SIZE - 1u){
324+
if local_id.x == WG_SIZE - 1u {
325325
//TRANS_IX FALLBACK
326-
if(red0){
326+
if red0 {
327327
fallback(
328328
part_ix,
329329
fallback_ix,
330330
0u,
331-
agg[0u],
332-
f_agg[0u],
331+
agg[0],
332+
f_agg[0],
333333
&prev0,
334334
&inc0,
335335
);
336336
}
337337

338338
//PATHSEG_IX FALLBACK
339-
if(red1){
339+
if red1 {
340340
fallback(
341341
part_ix,
342342
fallback_ix,
343343
1u,
344-
agg[1u],
345-
f_agg[1u],
344+
agg[1],
345+
f_agg[1],
346346
&prev1,
347347
&inc1,
348348
);
349349
}
350350

351351
//PATHSEG_OFFSET FALLBACK
352-
if(red2){
352+
if red2 {
353353
fallback(
354354
part_ix,
355355
fallback_ix,
356356
2u,
357-
agg[2u],
358-
f_agg[2u],
357+
agg[2],
358+
f_agg[2],
359359
&prev2,
360360
&inc2,
361361
);
362362
}
363363

364364
//STYLE_IX FALLBACK
365-
if(red3){
365+
if red3 {
366366
fallback(
367367
part_ix,
368368
fallback_ix,
369369
3u,
370-
agg[3u],
371-
f_agg[3u],
370+
agg[3],
371+
f_agg[3],
372372
&prev3,
373373
&inc3,
374374
);
375375
}
376376

377377
//PATH_IX FALLBACK
378-
if(red4){
378+
if red4 {
379379
fallback(
380380
part_ix,
381381
fallback_ix,
382382
4u,
383-
agg[4u],
384-
f_agg[4u],
383+
agg[4],
384+
f_agg[4],
385385
&prev4,
386386
&inc4,
387387
);
388388
}
389389

390390
//At this point, the reductions are guaranteed to be complete,
391391
//so try unlocking, else, keep looking back
392-
if(inc0 && inc1 && inc2 && inc3 && inc4){
392+
if inc0 && inc1 && inc2 && inc3 && inc4 {
393393
sh_lock = UNLOCKED;
394394
} else {
395395
lookback_ix--;
@@ -402,7 +402,7 @@ fn main(
402402
workgroupBarrier();
403403

404404
var tm: array<u32, 5>;
405-
if(part_ix != 0u){
405+
if part_ix != 0u {
406406
tm = sh_tag_broadcast;
407407
} else {
408408
tm[0] = 0u;
@@ -412,7 +412,7 @@ fn main(
412412
tm[4] = 0u;
413413
}
414414

415-
if(local_id.x != 0u){
415+
if local_id.x != 0u {
416416
let other: array<u32, 5> = sh_scratch[local_id.x - 1u];
417417
tm[0] += other[0];
418418
tm[1] += other[1];

‎vello_shaders/shader/shared/pathtag.wgsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ fn reduce_tag_arr(tag_word: u32) -> array<u32, 5> {
8484
c[4] = countOneBits(tag_word & (PATH_TAG_PATH * 0x1010101u));
8585
c[3] = countOneBits(tag_word & (PATH_TAG_STYLE * 0x1010101u)) * STYLE_SIZE_IN_WORDS;
8686
return c;
87-
}
87+
}

‎vello_shaders/src/cpu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub use path_count::path_count;
4242
pub use path_count_setup::path_count_setup;
4343
pub use path_tiling::path_tiling;
4444
pub use path_tiling_setup::path_tiling_setup;
45-
pub use pathtag_scan_single::pathtag_scan_single;
45+
pub use pathtag_scan_single::pathtag_scan;
4646
pub use tile_alloc::tile_alloc;
4747

4848
use std::cell::{Ref, RefCell, RefMut};

‎vello_shaders/src/cpu/pathtag_scan_single.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use super::CpuBinding;
77

88
const WG_SIZE: usize = 256;
99

10-
fn pathtag_scan_single_main(
10+
fn pathtag_scan_main(
1111
n_wg: u32,
1212
config: &ConfigUniform,
1313
scene: &[u32],
@@ -22,9 +22,9 @@ fn pathtag_scan_single_main(
2222
}
2323
}
2424

25-
pub fn pathtag_scan_single(n_wg: u32, resources: &[CpuBinding]) {
25+
pub fn pathtag_scan(n_wg: u32, resources: &[CpuBinding]) {
2626
let config = resources[0].as_typed();
2727
let scene = resources[1].as_slice();
2828
let mut tag_monoids = resources[3].as_slice_mut();
29-
pathtag_scan_single_main(n_wg, &config, &scene, &mut tag_monoids);
29+
pathtag_scan_main(n_wg, &config, &scene, &mut tag_monoids);
3030
}

0 commit comments

Comments
 (0)