alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2025-01-09 20:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

Simplify ringbuf

Browse source 
We don't really need a ring buffer, as we only read what we're actually
going to process.
This commit is contained in:
Raph Levien 2020-05-30 21:12:55 -07:00
parent 192ddc5eab
commit 2c185c3718
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
piet-gpu/shader/coarse.comp
View file

@ -28,13 +28,11 @@ layout(set = 0, binding = 3) buffer PtclBuf {
#include "bins.h" #include "bins.h"
#include "ptcl.h" #include "ptcl.h"
#define N_RINGBUF 512
#define LG_N_PART_READ 8 #define LG_N_PART_READ 8
#define N_PART_READ (1 << LG_N_PART_READ) #define N_PART_READ (1 << LG_N_PART_READ)
shared uint sh_elements[N_RINGBUF]; shared uint sh_elements[N_TILE];
shared float sh_right_edge[N_RINGBUF]; shared float sh_right_edge[N_TILE];
// Number of elements in the partition; prefix sum. // Number of elements in the partition; prefix sum.
shared uint sh_part_count[N_PART_READ]; shared uint sh_part_count[N_PART_READ];
@ -178,16 +176,14 @@ void main() {
ix -= part_ix > 0 ? sh_part_count[part_ix - 1] : part_start_ix; ix -= part_ix > 0 ? sh_part_count[part_ix - 1] : part_start_ix;
BinInstanceRef inst_ref = BinInstanceRef(sh_part_elements[part_ix]); BinInstanceRef inst_ref = BinInstanceRef(sh_part_elements[part_ix]);
BinInstance inst = BinInstance_read(BinInstance_index(inst_ref, ix)); BinInstance inst = BinInstance_read(BinInstance_index(inst_ref, ix));
uint wr_el_ix = (rd_ix + th_ix) % N_RINGBUF; sh_elements[th_ix] = inst.element_ix;
sh_elements[wr_el_ix] = inst.element_ix; sh_right_edge[th_ix] = inst.right_edge;
sh_right_edge[wr_el_ix] = inst.right_edge;
} }
barrier(); barrier();
wr_ix = min(rd_ix + N_TILE, ready_ix); wr_ix = min(rd_ix + N_TILE, ready_ix);
} while (wr_ix - rd_ix < N_TILE && (wr_ix < ready_ix || partition_ix < n_partitions)); } while (wr_ix - rd_ix < N_TILE && (wr_ix < ready_ix || partition_ix < n_partitions));
// We've done the merge and filled the buffer. // We've done the merge and filled the buffer.
// Read one element, compute coverage. // Read one element, compute coverage.
@ -195,9 +191,8 @@ void main() {
AnnotatedRef ref; AnnotatedRef ref;
float right_edge = 0.0; float right_edge = 0.0;
if (th_ix + rd_ix < wr_ix) { if (th_ix + rd_ix < wr_ix) {
uint rd_el_ix = (rd_ix + th_ix) % N_RINGBUF; uint element_ix = sh_elements[th_ix];
uint element_ix = sh_elements[rd_el_ix]; right_edge = sh_right_edge[th_ix];
right_edge = sh_right_edge[rd_el_ix];
ref = AnnotatedRef(element_ix * Annotated_size); ref = AnnotatedRef(element_ix * Annotated_size);
tag = Annotated_tag(ref); tag = Annotated_tag(ref);
} }
@ -355,7 +350,7 @@ void main() {
} }
} }
uint out_offset = seg_alloc + Segment_size * ix + SegChunk_size; uint out_offset = seg_alloc + Segment_size * ix + SegChunk_size;
uint rd_el_ix = (rd_ix + slice_ix * 32 + bit_ix) % N_RINGBUF; uint rd_el_ix = slice_ix * 32 + bit_ix;
uint element_ix = sh_elements[rd_el_ix]; uint element_ix = sh_elements[rd_el_ix];
ref = AnnotatedRef(element_ix * Annotated_size); ref = AnnotatedRef(element_ix * Annotated_size);
AnnoFillLineSeg line = Annotated_FillLine_read(ref); AnnoFillLineSeg line = Annotated_FillLine_read(ref);
@ -407,7 +402,7 @@ void main() {
} }
} }
uint element_ref_ix = slice_ix * 32 + findLSB(nonseg_bitmap); uint element_ref_ix = slice_ix * 32 + findLSB(nonseg_bitmap);
uint element_ix = sh_elements[(rd_ix + element_ref_ix) % N_RINGBUF]; uint element_ix = sh_elements[element_ref_ix];
// Bits up to and including the lsb // Bits up to and including the lsb
uint bd_mask = (nonseg_bitmap - 1) ^ nonseg_bitmap; uint bd_mask = (nonseg_bitmap - 1) ^ nonseg_bitmap;

BIN
piet-gpu/shader/coarse.spv
View file

Binary file not shown.