gpu,op/clip: [compute] get rid of stroke vs fill flags

The fill mode is now controlled by a SetFillMode command, not by flags
on each path segment and fill command.

Signed-off-by: Elias Naur <mail@eliasnaur.com>

gpu/shaders/pathseg.h

@@ -2,11 +2,7 @@
 
 // Code auto-generated by piet-gpu-derive
 
-struct PathFillCubicRef {
-    uint offset;
-};
-
-struct PathStrokeCubicRef {
+struct PathCubicRef {
     uint offset;
 };
 
@@ -14,22 +10,7 @@ struct PathSegRef {
     uint offset;
 };
 
-struct PathFillCubic {
-    vec2 p0;
-    vec2 p1;
-    vec2 p2;
-    vec2 p3;
-    uint path_ix;
-    uint trans_ix;
-};
-
-#define PathFillCubic_size 40
-
-PathFillCubicRef PathFillCubic_index(PathFillCubicRef ref, uint index) {
-    return PathFillCubicRef(ref.offset + index * PathFillCubic_size);
-}
-
-struct PathStrokeCubic {
+struct PathCubic {
     vec2 p0;
     vec2 p1;
     vec2 p2;
@@ -39,58 +20,26 @@ struct PathStrokeCubic {
     vec2 stroke;
 };
 
-#define PathStrokeCubic_size 48
+#define PathCubic_size 48
 
-PathStrokeCubicRef PathStrokeCubic_index(PathStrokeCubicRef ref, uint index) {
-    return PathStrokeCubicRef(ref.offset + index * PathStrokeCubic_size);
+PathCubicRef PathCubic_index(PathCubicRef ref, uint index) {
+    return PathCubicRef(ref.offset + index * PathCubic_size);
 }
 
 #define PathSeg_Nop 0
-#define PathSeg_FillCubic 1
-#define PathSeg_StrokeCubic 2
+#define PathSeg_Cubic 1
 #define PathSeg_size 52
 
 PathSegRef PathSeg_index(PathSegRef ref, uint index) {
     return PathSegRef(ref.offset + index * PathSeg_size);
 }
 
-PathFillCubic PathFillCubic_read(Alloc a, PathFillCubicRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = read_mem(a, ix + 0);
-    uint raw1 = read_mem(a, ix + 1);
-    uint raw2 = read_mem(a, ix + 2);
-    uint raw3 = read_mem(a, ix + 3);
-    uint raw4 = read_mem(a, ix + 4);
-    uint raw5 = read_mem(a, ix + 5);
-    uint raw6 = read_mem(a, ix + 6);
-    uint raw7 = read_mem(a, ix + 7);
-    uint raw8 = read_mem(a, ix + 8);
-    uint raw9 = read_mem(a, ix + 9);
-    PathFillCubic s;
-    s.p0 = vec2(uintBitsToFloat(raw0), uintBitsToFloat(raw1));
-    s.p1 = vec2(uintBitsToFloat(raw2), uintBitsToFloat(raw3));
-    s.p2 = vec2(uintBitsToFloat(raw4), uintBitsToFloat(raw5));
-    s.p3 = vec2(uintBitsToFloat(raw6), uintBitsToFloat(raw7));
-    s.path_ix = raw8;
-    s.trans_ix = raw9;
-    return s;
-}
+struct PathSegTag {
+   uint tag;
+   uint flags;
+};
 
-void PathFillCubic_write(Alloc a, PathFillCubicRef ref, PathFillCubic s) {
-    uint ix = ref.offset >> 2;
-    write_mem(a, ix + 0, floatBitsToUint(s.p0.x));
-    write_mem(a, ix + 1, floatBitsToUint(s.p0.y));
-    write_mem(a, ix + 2, floatBitsToUint(s.p1.x));
-    write_mem(a, ix + 3, floatBitsToUint(s.p1.y));
-    write_mem(a, ix + 4, floatBitsToUint(s.p2.x));
-    write_mem(a, ix + 5, floatBitsToUint(s.p2.y));
-    write_mem(a, ix + 6, floatBitsToUint(s.p3.x));
-    write_mem(a, ix + 7, floatBitsToUint(s.p3.y));
-    write_mem(a, ix + 8, s.path_ix);
-    write_mem(a, ix + 9, s.trans_ix);
-}
-
-PathStrokeCubic PathStrokeCubic_read(Alloc a, PathStrokeCubicRef ref) {
+PathCubic PathCubic_read(Alloc a, PathCubicRef ref) {
     uint ix = ref.offset >> 2;
     uint raw0 = read_mem(a, ix + 0);
     uint raw1 = read_mem(a, ix + 1);
@@ -104,7 +53,7 @@ PathStrokeCubic PathStrokeCubic_read(Alloc a, PathStrokeCubicRef ref) {
     uint raw9 = read_mem(a, ix + 9);
     uint raw10 = read_mem(a, ix + 10);
     uint raw11 = read_mem(a, ix + 11);
-    PathStrokeCubic s;
+    PathCubic s;
     s.p0 = vec2(uintBitsToFloat(raw0), uintBitsToFloat(raw1));
     s.p1 = vec2(uintBitsToFloat(raw2), uintBitsToFloat(raw3));
     s.p2 = vec2(uintBitsToFloat(raw4), uintBitsToFloat(raw5));
@@ -115,7 +64,7 @@ PathStrokeCubic PathStrokeCubic_read(Alloc a, PathStrokeCubicRef ref) {
     return s;
 }
 
-void PathStrokeCubic_write(Alloc a, PathStrokeCubicRef ref, PathStrokeCubic s) {
+void PathCubic_write(Alloc a, PathCubicRef ref, PathCubic s) {
     uint ix = ref.offset >> 2;
     write_mem(a, ix + 0, floatBitsToUint(s.p0.x));
     write_mem(a, ix + 1, floatBitsToUint(s.p0.y));
@@ -131,29 +80,21 @@ void PathStrokeCubic_write(Alloc a, PathStrokeCubicRef ref, PathStrokeCubic s) {
     write_mem(a, ix + 11, floatBitsToUint(s.stroke.y));
 }
 
-uint PathSeg_tag(Alloc a, PathSegRef ref) {
-    return read_mem(a, ref.offset >> 2);
+PathSegTag PathSeg_tag(Alloc a, PathSegRef ref) {
+    uint tag_and_flags = read_mem(a, ref.offset >> 2);
+    return PathSegTag(tag_and_flags & 0xffff, tag_and_flags >> 16);
 }
 
-PathFillCubic PathSeg_FillCubic_read(Alloc a, PathSegRef ref) {
-    return PathFillCubic_read(a, PathFillCubicRef(ref.offset + 4));
-}
-
-PathStrokeCubic PathSeg_StrokeCubic_read(Alloc a, PathSegRef ref) {
-    return PathStrokeCubic_read(a, PathStrokeCubicRef(ref.offset + 4));
+PathCubic PathSeg_Cubic_read(Alloc a, PathSegRef ref) {
+    return PathCubic_read(a, PathCubicRef(ref.offset + 4));
 }
 
 void PathSeg_Nop_write(Alloc a, PathSegRef ref) {
     write_mem(a, ref.offset >> 2, PathSeg_Nop);
 }
 
-void PathSeg_FillCubic_write(Alloc a, PathSegRef ref, PathFillCubic s) {
-    write_mem(a, ref.offset >> 2, PathSeg_FillCubic);
-    PathFillCubic_write(a, PathFillCubicRef(ref.offset + 4), s);
-}
-
-void PathSeg_StrokeCubic_write(Alloc a, PathSegRef ref, PathStrokeCubic s) {
-    write_mem(a, ref.offset >> 2, PathSeg_StrokeCubic);
-    PathStrokeCubic_write(a, PathStrokeCubicRef(ref.offset + 4), s);
+void PathSeg_Cubic_write(Alloc a, PathSegRef ref, uint flags, PathCubic s) {
+    write_mem(a, ref.offset >> 2, (flags << 16) | PathSeg_Cubic);
+    PathCubic_write(a, PathCubicRef(ref.offset + 4), s);
 }