From dceb0f941246a3961e2bb3212e468eee2bedde8b Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Mon, 21 Sep 2020 10:24:18 +0200
Subject: [PATCH 1/3] piet-gpu-types: remove unused annotated types

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 piet-gpu-types/src/annotated.rs |  33 -----
 piet-gpu/shader/annotated.h     | 230 +-------------------------------
 piet-gpu/shader/backdrop.spv    | Bin 7272 -> 7256 bytes
 piet-gpu/shader/binning.spv     | Bin 10136 -> 10136 bytes
 piet-gpu/shader/coarse.spv      | Bin 30904 -> 30904 bytes
 piet-gpu/shader/elements.spv    | Bin 52988 -> 52988 bytes
 piet-gpu/shader/tile_alloc.spv  | Bin 8800 -> 8800 bytes
 7 files changed, 3 insertions(+), 260 deletions(-)

diff --git a/piet-gpu-types/src/annotated.rs b/piet-gpu-types/src/annotated.rs
index d53d870..0e36f62 100644
--- a/piet-gpu-types/src/annotated.rs
+++ b/piet-gpu-types/src/annotated.rs
@@ -3,35 +3,6 @@ use piet_gpu_derive::piet_gpu;
 piet_gpu! {
     #[gpu_write]
     mod annotated {
-        // Note: path segments have moved to pathseg, delete these.
-        struct AnnoFillLineSeg {
-            p0: [f32; 2],
-            p1: [f32; 2],
-            path_ix: u32,
-            // A note: the layout of this struct is shared with
-            // AnnoStrokeLineSeg. In that case, we actually write
-            // [0.0, 0.0] as the stroke field, to minimize divergence.
-        }
-        struct AnnoStrokeLineSeg {
-            p0: [f32; 2],
-            p1: [f32; 2],
-            path_ix: u32,
-            // halfwidth in both x and y for binning
-            stroke: [f32; 2],
-        }
-        struct AnnoQuadSeg {
-            p0: [f32; 2],
-            p1: [f32; 2],
-            p2: [f32; 2],
-            stroke: [f32; 2],
-        }
-        struct AnnoCubicSeg {
-            p0: [f32; 2],
-            p1: [f32; 2],
-            p2: [f32; 2],
-            p3: [f32; 2],
-            stroke: [f32; 2],
-        }
         struct AnnoFill {
             rgba_color: u32,
             bbox: [f32; 4],
@@ -45,10 +16,6 @@ piet_gpu! {
         }
         enum Annotated {
             Nop,
-            FillLine(AnnoFillLineSeg),
-            StrokeLine(AnnoStrokeLineSeg),
-            Quad(AnnoQuadSeg),
-            Cubic(AnnoCubicSeg),
             Stroke(AnnoStroke),
             Fill(AnnoFill),
         }
diff --git a/piet-gpu/shader/annotated.h b/piet-gpu/shader/annotated.h
index f243fab..5dcb4ad 100644
--- a/piet-gpu/shader/annotated.h
+++ b/piet-gpu/shader/annotated.h
@@ -1,21 +1,5 @@
 // Code auto-generated by piet-gpu-derive
 
-struct AnnoFillLineSegRef {
-    uint offset;
-};
-
-struct AnnoStrokeLineSegRef {
-    uint offset;
-};
-
-struct AnnoQuadSegRef {
-    uint offset;
-};
-
-struct AnnoCubicSegRef {
-    uint offset;
-};
-
 struct AnnoFillRef {
     uint offset;
 };
@@ -28,58 +12,6 @@ struct AnnotatedRef {
     uint offset;
 };
 
-struct AnnoFillLineSeg {
-    vec2 p0;
-    vec2 p1;
-    uint path_ix;
-};
-
-#define AnnoFillLineSeg_size 20
-
-AnnoFillLineSegRef AnnoFillLineSeg_index(AnnoFillLineSegRef ref, uint index) {
-    return AnnoFillLineSegRef(ref.offset + index * AnnoFillLineSeg_size);
-}
-
-struct AnnoStrokeLineSeg {
-    vec2 p0;
-    vec2 p1;
-    uint path_ix;
-    vec2 stroke;
-};
-
-#define AnnoStrokeLineSeg_size 28
-
-AnnoStrokeLineSegRef AnnoStrokeLineSeg_index(AnnoStrokeLineSegRef ref, uint index) {
-    return AnnoStrokeLineSegRef(ref.offset + index * AnnoStrokeLineSeg_size);
-}
-
-struct AnnoQuadSeg {
-    vec2 p0;
-    vec2 p1;
-    vec2 p2;
-    vec2 stroke;
-};
-
-#define AnnoQuadSeg_size 32
-
-AnnoQuadSegRef AnnoQuadSeg_index(AnnoQuadSegRef ref, uint index) {
-    return AnnoQuadSegRef(ref.offset + index * AnnoQuadSeg_size);
-}
-
-struct AnnoCubicSeg {
-    vec2 p0;
-    vec2 p1;
-    vec2 p2;
-    vec2 p3;
-    vec2 stroke;
-};
-
-#define AnnoCubicSeg_size 40
-
-AnnoCubicSegRef AnnoCubicSeg_index(AnnoCubicSegRef ref, uint index) {
-    return AnnoCubicSegRef(ref.offset + index * AnnoCubicSeg_size);
-}
-
 struct AnnoFill {
     uint rgba_color;
     vec4 bbox;
@@ -104,134 +36,14 @@ AnnoStrokeRef AnnoStroke_index(AnnoStrokeRef ref, uint index) {
 }
 
 #define Annotated_Nop 0
-#define Annotated_FillLine 1
-#define Annotated_StrokeLine 2
-#define Annotated_Quad 3
-#define Annotated_Cubic 4
-#define Annotated_Stroke 5
-#define Annotated_Fill 6
-#define Annotated_size 44
+#define Annotated_Stroke 1
+#define Annotated_Fill 2
+#define Annotated_size 28
 
 AnnotatedRef Annotated_index(AnnotatedRef ref, uint index) {
     return AnnotatedRef(ref.offset + index * Annotated_size);
 }
 
-AnnoFillLineSeg AnnoFillLineSeg_read(AnnoFillLineSegRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = annotated[ix + 0];
-    uint raw1 = annotated[ix + 1];
-    uint raw2 = annotated[ix + 2];
-    uint raw3 = annotated[ix + 3];
-    uint raw4 = annotated[ix + 4];
-    AnnoFillLineSeg s;
-    s.p0 = vec2(uintBitsToFloat(raw0), uintBitsToFloat(raw1));
-    s.p1 = vec2(uintBitsToFloat(raw2), uintBitsToFloat(raw3));
-    s.path_ix = raw4;
-    return s;
-}
-
-void AnnoFillLineSeg_write(AnnoFillLineSegRef ref, AnnoFillLineSeg s) {
-    uint ix = ref.offset >> 2;
-    annotated[ix + 0] = floatBitsToUint(s.p0.x);
-    annotated[ix + 1] = floatBitsToUint(s.p0.y);
-    annotated[ix + 2] = floatBitsToUint(s.p1.x);
-    annotated[ix + 3] = floatBitsToUint(s.p1.y);
-    annotated[ix + 4] = s.path_ix;
-}
-
-AnnoStrokeLineSeg AnnoStrokeLineSeg_read(AnnoStrokeLineSegRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = annotated[ix + 0];
-    uint raw1 = annotated[ix + 1];
-    uint raw2 = annotated[ix + 2];
-    uint raw3 = annotated[ix + 3];
-    uint raw4 = annotated[ix + 4];
-    uint raw5 = annotated[ix + 5];
-    uint raw6 = annotated[ix + 6];
-    AnnoStrokeLineSeg s;
-    s.p0 = vec2(uintBitsToFloat(raw0), uintBitsToFloat(raw1));
-    s.p1 = vec2(uintBitsToFloat(raw2), uintBitsToFloat(raw3));
-    s.path_ix = raw4;
-    s.stroke = vec2(uintBitsToFloat(raw5), uintBitsToFloat(raw6));
-    return s;
-}
-
-void AnnoStrokeLineSeg_write(AnnoStrokeLineSegRef ref, AnnoStrokeLineSeg s) {
-    uint ix = ref.offset >> 2;
-    annotated[ix + 0] = floatBitsToUint(s.p0.x);
-    annotated[ix + 1] = floatBitsToUint(s.p0.y);
-    annotated[ix + 2] = floatBitsToUint(s.p1.x);
-    annotated[ix + 3] = floatBitsToUint(s.p1.y);
-    annotated[ix + 4] = s.path_ix;
-    annotated[ix + 5] = floatBitsToUint(s.stroke.x);
-    annotated[ix + 6] = floatBitsToUint(s.stroke.y);
-}
-
-AnnoQuadSeg AnnoQuadSeg_read(AnnoQuadSegRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = annotated[ix + 0];
-    uint raw1 = annotated[ix + 1];
-    uint raw2 = annotated[ix + 2];
-    uint raw3 = annotated[ix + 3];
-    uint raw4 = annotated[ix + 4];
-    uint raw5 = annotated[ix + 5];
-    uint raw6 = annotated[ix + 6];
-    uint raw7 = annotated[ix + 7];
-    AnnoQuadSeg s;
-    s.p0 = vec2(uintBitsToFloat(raw0), uintBitsToFloat(raw1));
-    s.p1 = vec2(uintBitsToFloat(raw2), uintBitsToFloat(raw3));
-    s.p2 = vec2(uintBitsToFloat(raw4), uintBitsToFloat(raw5));
-    s.stroke = vec2(uintBitsToFloat(raw6), uintBitsToFloat(raw7));
-    return s;
-}
-
-void AnnoQuadSeg_write(AnnoQuadSegRef ref, AnnoQuadSeg s) {
-    uint ix = ref.offset >> 2;
-    annotated[ix + 0] = floatBitsToUint(s.p0.x);
-    annotated[ix + 1] = floatBitsToUint(s.p0.y);
-    annotated[ix + 2] = floatBitsToUint(s.p1.x);
-    annotated[ix + 3] = floatBitsToUint(s.p1.y);
-    annotated[ix + 4] = floatBitsToUint(s.p2.x);
-    annotated[ix + 5] = floatBitsToUint(s.p2.y);
-    annotated[ix + 6] = floatBitsToUint(s.stroke.x);
-    annotated[ix + 7] = floatBitsToUint(s.stroke.y);
-}
-
-AnnoCubicSeg AnnoCubicSeg_read(AnnoCubicSegRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = annotated[ix + 0];
-    uint raw1 = annotated[ix + 1];
-    uint raw2 = annotated[ix + 2];
-    uint raw3 = annotated[ix + 3];
-    uint raw4 = annotated[ix + 4];
-    uint raw5 = annotated[ix + 5];
-    uint raw6 = annotated[ix + 6];
-    uint raw7 = annotated[ix + 7];
-    uint raw8 = annotated[ix + 8];
-    uint raw9 = annotated[ix + 9];
-    AnnoCubicSeg 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.stroke = vec2(uintBitsToFloat(raw8), uintBitsToFloat(raw9));
-    return s;
-}
-
-void AnnoCubicSeg_write(AnnoCubicSegRef ref, AnnoCubicSeg s) {
-    uint ix = ref.offset >> 2;
-    annotated[ix + 0] = floatBitsToUint(s.p0.x);
-    annotated[ix + 1] = floatBitsToUint(s.p0.y);
-    annotated[ix + 2] = floatBitsToUint(s.p1.x);
-    annotated[ix + 3] = floatBitsToUint(s.p1.y);
-    annotated[ix + 4] = floatBitsToUint(s.p2.x);
-    annotated[ix + 5] = floatBitsToUint(s.p2.y);
-    annotated[ix + 6] = floatBitsToUint(s.p3.x);
-    annotated[ix + 7] = floatBitsToUint(s.p3.y);
-    annotated[ix + 8] = floatBitsToUint(s.stroke.x);
-    annotated[ix + 9] = floatBitsToUint(s.stroke.y);
-}
-
 AnnoFill AnnoFill_read(AnnoFillRef ref) {
     uint ix = ref.offset >> 2;
     uint raw0 = annotated[ix + 0];
@@ -283,22 +95,6 @@ uint Annotated_tag(AnnotatedRef ref) {
     return annotated[ref.offset >> 2];
 }
 
-AnnoFillLineSeg Annotated_FillLine_read(AnnotatedRef ref) {
-    return AnnoFillLineSeg_read(AnnoFillLineSegRef(ref.offset + 4));
-}
-
-AnnoStrokeLineSeg Annotated_StrokeLine_read(AnnotatedRef ref) {
-    return AnnoStrokeLineSeg_read(AnnoStrokeLineSegRef(ref.offset + 4));
-}
-
-AnnoQuadSeg Annotated_Quad_read(AnnotatedRef ref) {
-    return AnnoQuadSeg_read(AnnoQuadSegRef(ref.offset + 4));
-}
-
-AnnoCubicSeg Annotated_Cubic_read(AnnotatedRef ref) {
-    return AnnoCubicSeg_read(AnnoCubicSegRef(ref.offset + 4));
-}
-
 AnnoStroke Annotated_Stroke_read(AnnotatedRef ref) {
     return AnnoStroke_read(AnnoStrokeRef(ref.offset + 4));
 }
@@ -311,26 +107,6 @@ void Annotated_Nop_write(AnnotatedRef ref) {
     annotated[ref.offset >> 2] = Annotated_Nop;
 }
 
-void Annotated_FillLine_write(AnnotatedRef ref, AnnoFillLineSeg s) {
-    annotated[ref.offset >> 2] = Annotated_FillLine;
-    AnnoFillLineSeg_write(AnnoFillLineSegRef(ref.offset + 4), s);
-}
-
-void Annotated_StrokeLine_write(AnnotatedRef ref, AnnoStrokeLineSeg s) {
-    annotated[ref.offset >> 2] = Annotated_StrokeLine;
-    AnnoStrokeLineSeg_write(AnnoStrokeLineSegRef(ref.offset + 4), s);
-}
-
-void Annotated_Quad_write(AnnotatedRef ref, AnnoQuadSeg s) {
-    annotated[ref.offset >> 2] = Annotated_Quad;
-    AnnoQuadSeg_write(AnnoQuadSegRef(ref.offset + 4), s);
-}
-
-void Annotated_Cubic_write(AnnotatedRef ref, AnnoCubicSeg s) {
-    annotated[ref.offset >> 2] = Annotated_Cubic;
-    AnnoCubicSeg_write(AnnoCubicSegRef(ref.offset + 4), s);
-}
-
 void Annotated_Stroke_write(AnnotatedRef ref, AnnoStroke s) {
     annotated[ref.offset >> 2] = Annotated_Stroke;
     AnnoStroke_write(AnnoStrokeRef(ref.offset + 4), s);
diff --git a/piet-gpu/shader/backdrop.spv b/piet-gpu/shader/backdrop.spv
index 67d05dfb6314282d14da2f770eeaf1950d5a02f2..fdbb4f1b1a11f1c4901d4b7fa46b750ae3efe68c 100644
GIT binary patch
literal 7256
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

literal 7272
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

diff --git a/piet-gpu/shader/binning.spv b/piet-gpu/shader/binning.spv
index 98f1d4e364798db1fd712e07334f1d70f099dca0..d1c469c2e11c240d2bdbe8ee79f361d45cc6d934 100644
GIT binary patch
delta 29
jcmbQ?Kf`|m3pb<8W>)UYtei{?3=Btsm~rz%f$d@db$kbi

delta 29
jcmbQ?Kf`|m3pb<AW>)UYtek8N3=Btsn050*f$d@dcN_<x

diff --git a/piet-gpu/shader/coarse.spv b/piet-gpu/shader/coarse.spv
index 757b8b2a7d1eaf48c0a43bee19a235de1b844162..29c430fb7be63bfae1cd5bfef60277e6f724c028 100644
GIT binary patch
delta 46
xcmdn-k#WaI#tl63j53>f<rhnHGBGePI59IYFmB#y#V!WsR<MA$Cj;KA0{|x(3upiU

delta 46
xcmdn-k#WaI#tl63j5?cn<rhnHvN13)I59IYux{RI#V!WsR<MA$Cj;KA0{|*<3y1&!

diff --git a/piet-gpu/shader/elements.spv b/piet-gpu/shader/elements.spv
index 54c5cc0f645353bfc360465a3037aa6a2ef29745..4b7a1c276b801ca7ae7d8c0000482e77756210e5 100644
GIT binary patch
delta 62
zcmew}m-)|J<_#>Gj53>9HBXoF-e6#0aAaU*-~`fXlN;v=Z~ib(fsywfl5o-FgY$(q
J8!R}Z2LMiW5<~z1

delta 62
zcmew}m-)|J<_#>Gj5?cHHBXoFN;5JrI5My@a56A3q)l#|C%pN?JOxJHC?w&c$p_~P
KZ#GzPMh^fbWf2ts

diff --git a/piet-gpu/shader/tile_alloc.spv b/piet-gpu/shader/tile_alloc.spv
index 4eae6b8762b627c104810ad770c1298e6e6a49bb..e012b7c5d0f5f04473cc628eba3bbdedfee36b25 100644
GIT binary patch
delta 29
jcmaFh^1x+-3m2ozW>>EFESyXX3=F%0m~pc$zp^j@iz^3J

delta 29
jcmaFh^1x+-3m2o#W>>EFESzi%3=F%0n02!)zp^j@jLQdY


From fa9bf0dc2b9f4693d60314213930b7949838cea1 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Sun, 27 Sep 2020 18:30:33 +0200
Subject: [PATCH 2/3] piet-gpu-types: remove unused ptcl types

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 piet-gpu-types/src/ptcl.rs  |  12 -----
 piet-gpu/shader/coarse.spv  | Bin 30904 -> 30904 bytes
 piet-gpu/shader/kernel4.spv | Bin 20760 -> 20760 bytes
 piet-gpu/shader/ptcl.h      |  91 +-----------------------------------
 4 files changed, 2 insertions(+), 101 deletions(-)

diff --git a/piet-gpu-types/src/ptcl.rs b/piet-gpu-types/src/ptcl.rs
index 96c0ecc..1deac38 100644
--- a/piet-gpu-types/src/ptcl.rs
+++ b/piet-gpu-types/src/ptcl.rs
@@ -25,15 +25,6 @@ piet_gpu! {
             backdrop: i32,
             rgba_color: u32,
         }
-        struct CmdFillEdge {
-            // The sign is only one bit.
-            sign: i32,
-            y: f32,
-        }
-        struct CmdDrawFill {
-            backdrop: i32,
-            rgba_color: u32,
-        }
         struct CmdSolid {
             rgba_color: u32,
         }
@@ -46,11 +37,8 @@ piet_gpu! {
             Line(CmdLine),
             Fill(CmdFill),
             Stroke(CmdStroke),
-            FillEdge(CmdFillEdge),
-            DrawFill(CmdDrawFill),
             Solid(CmdSolid),
             Jump(CmdJump),
-            Bail,
         }
 
         // TODO: strongly consider using f16. If so, these would be
diff --git a/piet-gpu/shader/coarse.spv b/piet-gpu/shader/coarse.spv
index 29c430fb7be63bfae1cd5bfef60277e6f724c028..334e1f52bc8e29efd23b1a54a5f058a4a0761b45 100644
GIT binary patch
delta 260
zcmdn-k#WaI#tmzD8ShV?%PYV646g-0>oZ0M2DZ(dvfkl>_km1y1_lOe1{Q`0ApKx+
zYKgn*Eud%%5Vr$GZUSjL24)73*h3)Sk%5&#9Z27ve6d70^A1q-HV`)eMcII&cY$n>
z*lHj<0BB|?kiG}xgTz6mfb0YDZGm#(K)HuNb|sJo$vptFL3~S~NlZYoM?iKAkOt{_
zFqyGXcydB%2;<|)f@Q*@Pk>^Nf%p*A-lstJlgW2WrFlUtkZI3>^s~*ZWt*7*lHNFB

delta 260
zcmXYqu@1pt5XbLBiQx-PnZzibL4?HA!D1ja7%T>(q-|m|NIbyz7z~mw9ay}95iLr~
z+&A#Q#Blll?svI6KNWr|_B*K#vMeI+D9w^~6+{KESnpf<laYwpl%p{+QZw6Z++f$J
z4a^1Er7W@I#U5$Ygb&o&Hs&ErfLg)kVeepeTkrrkN5}_y_I!o^ao@qr!t4cJB6${p
wxo_c82JQ`>AbBTJVqvJMGZeAXU89=7#i-N&?+2Wy(5Xo#zV<~{Jk9koKbrbCsQ>@~

diff --git a/piet-gpu/shader/kernel4.spv b/piet-gpu/shader/kernel4.spv
index 6f50746197f173e9b71a494ce9a57b417b8b1eb6..84919e07df997d9280b068322fe37e750b44a3a7 100644
GIT binary patch
delta 24
gcmbQSh;hau#tjRkI9VAO80IlDFtBZ2DV1*q09|?puK)l5

delta 24
gcmbQSh;hau#tjRkIN2E(80IlDFmP;MDV1*q09~R6vj6}9

diff --git a/piet-gpu/shader/ptcl.h b/piet-gpu/shader/ptcl.h
index 0c20a89..c9be302 100644
--- a/piet-gpu/shader/ptcl.h
+++ b/piet-gpu/shader/ptcl.h
@@ -16,14 +16,6 @@ struct CmdFillRef {
     uint offset;
 };
 
-struct CmdFillEdgeRef {
-    uint offset;
-};
-
-struct CmdDrawFillRef {
-    uint offset;
-};
-
 struct CmdSolidRef {
     uint offset;
 };
@@ -91,28 +83,6 @@ CmdFillRef CmdFill_index(CmdFillRef ref, uint index) {
     return CmdFillRef(ref.offset + index * CmdFill_size);
 }
 
-struct CmdFillEdge {
-    int sign;
-    float y;
-};
-
-#define CmdFillEdge_size 8
-
-CmdFillEdgeRef CmdFillEdge_index(CmdFillEdgeRef ref, uint index) {
-    return CmdFillEdgeRef(ref.offset + index * CmdFillEdge_size);
-}
-
-struct CmdDrawFill {
-    int backdrop;
-    uint rgba_color;
-};
-
-#define CmdDrawFill_size 8
-
-CmdDrawFillRef CmdDrawFill_index(CmdDrawFillRef ref, uint index) {
-    return CmdDrawFillRef(ref.offset + index * CmdDrawFill_size);
-}
-
 struct CmdSolid {
     uint rgba_color;
 };
@@ -138,11 +108,8 @@ CmdJumpRef CmdJump_index(CmdJumpRef ref, uint index) {
 #define Cmd_Line 2
 #define Cmd_Fill 3
 #define Cmd_Stroke 4
-#define Cmd_FillEdge 5
-#define Cmd_DrawFill 6
-#define Cmd_Solid 7
-#define Cmd_Jump 8
-#define Cmd_Bail 9
+#define Cmd_Solid 5
+#define Cmd_Jump 6
 #define Cmd_size 20
 
 CmdRef Cmd_index(CmdRef ref, uint index) {
@@ -252,38 +219,6 @@ void CmdFill_write(CmdFillRef ref, CmdFill s) {
     ptcl[ix + 2] = s.rgba_color;
 }
 
-CmdFillEdge CmdFillEdge_read(CmdFillEdgeRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = ptcl[ix + 0];
-    uint raw1 = ptcl[ix + 1];
-    CmdFillEdge s;
-    s.sign = int(raw0);
-    s.y = uintBitsToFloat(raw1);
-    return s;
-}
-
-void CmdFillEdge_write(CmdFillEdgeRef ref, CmdFillEdge s) {
-    uint ix = ref.offset >> 2;
-    ptcl[ix + 0] = uint(s.sign);
-    ptcl[ix + 1] = floatBitsToUint(s.y);
-}
-
-CmdDrawFill CmdDrawFill_read(CmdDrawFillRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = ptcl[ix + 0];
-    uint raw1 = ptcl[ix + 1];
-    CmdDrawFill s;
-    s.backdrop = int(raw0);
-    s.rgba_color = raw1;
-    return s;
-}
-
-void CmdDrawFill_write(CmdDrawFillRef ref, CmdDrawFill s) {
-    uint ix = ref.offset >> 2;
-    ptcl[ix + 0] = uint(s.backdrop);
-    ptcl[ix + 1] = s.rgba_color;
-}
-
 CmdSolid CmdSolid_read(CmdSolidRef ref) {
     uint ix = ref.offset >> 2;
     uint raw0 = ptcl[ix + 0];
@@ -330,14 +265,6 @@ CmdStroke Cmd_Stroke_read(CmdRef ref) {
     return CmdStroke_read(CmdStrokeRef(ref.offset + 4));
 }
 
-CmdFillEdge Cmd_FillEdge_read(CmdRef ref) {
-    return CmdFillEdge_read(CmdFillEdgeRef(ref.offset + 4));
-}
-
-CmdDrawFill Cmd_DrawFill_read(CmdRef ref) {
-    return CmdDrawFill_read(CmdDrawFillRef(ref.offset + 4));
-}
-
 CmdSolid Cmd_Solid_read(CmdRef ref) {
     return CmdSolid_read(CmdSolidRef(ref.offset + 4));
 }
@@ -370,16 +297,6 @@ void Cmd_Stroke_write(CmdRef ref, CmdStroke s) {
     CmdStroke_write(CmdStrokeRef(ref.offset + 4), s);
 }
 
-void Cmd_FillEdge_write(CmdRef ref, CmdFillEdge s) {
-    ptcl[ref.offset >> 2] = Cmd_FillEdge;
-    CmdFillEdge_write(CmdFillEdgeRef(ref.offset + 4), s);
-}
-
-void Cmd_DrawFill_write(CmdRef ref, CmdDrawFill s) {
-    ptcl[ref.offset >> 2] = Cmd_DrawFill;
-    CmdDrawFill_write(CmdDrawFillRef(ref.offset + 4), s);
-}
-
 void Cmd_Solid_write(CmdRef ref, CmdSolid s) {
     ptcl[ref.offset >> 2] = Cmd_Solid;
     CmdSolid_write(CmdSolidRef(ref.offset + 4), s);
@@ -390,10 +307,6 @@ void Cmd_Jump_write(CmdRef ref, CmdJump s) {
     CmdJump_write(CmdJumpRef(ref.offset + 4), s);
 }
 
-void Cmd_Bail_write(CmdRef ref) {
-    ptcl[ref.offset >> 2] = Cmd_Bail;
-}
-
 Segment Segment_read(SegmentRef ref) {
     uint ix = ref.offset >> 2;
     uint raw0 = ptcl[ix + 0];

From 9be0faba6fd45afe8b830a96c37f035aac233d00 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Sun, 27 Sep 2020 18:57:53 +0200
Subject: [PATCH 3/3] piet-gpu-types: remove unused scene elements

Delete image compute shader as well; it is unused.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 piet-gpu-types/src/scene.rs |  50 --------
 piet-gpu/shader/build.ninja |   2 -
 piet-gpu/shader/image.comp  |  54 ---------
 piet-gpu/shader/image.spv   | Bin 8116 -> 0 bytes
 piet-gpu/shader/scene.h     | 236 ------------------------------------
 5 files changed, 342 deletions(-)
 delete mode 100644 piet-gpu/shader/image.comp
 delete mode 100644 piet-gpu/shader/image.spv

diff --git a/piet-gpu-types/src/scene.rs b/piet-gpu-types/src/scene.rs
index 5e4899f..0d72650 100644
--- a/piet-gpu-types/src/scene.rs
+++ b/piet-gpu-types/src/scene.rs
@@ -1,60 +1,10 @@
 use piet_gpu_derive::piet_gpu;
 
-pub use self::scene::{
-    Bbox, PietCircle, PietFill, PietItem, PietStrokeLine, PietStrokePolyLine, Point, SimpleGroup,
-};
-
 pub use self::scene::{CubicSeg, Element, Fill, LineSeg, QuadSeg, SetLineWidth, Stroke, Transform};
 
 piet_gpu! {
     #[rust_encode]
     mod scene {
-        struct Bbox {
-            bbox: [i16; 4],
-        }
-        struct Point {
-            xy: [f32; 2],
-        }
-        struct SimpleGroup {
-            n_items: u32,
-            // Note: both of the following items are actually arrays
-            items: Ref<PietItem>,
-            bboxes: Ref<Bbox>,
-            offset: Point,
-        }
-        struct PietCircle {
-            rgba_color: u32,
-            center: Point,
-            radius: f32,
-        }
-        struct PietStrokeLine {
-            flags: u32,
-            rgba_color: u32,
-            width: f32,
-            start: Point,
-            end: Point,
-        }
-        struct PietFill {
-            flags: u32,
-            rgba_color: u32,
-            n_points: u32,
-            points: Ref<Point>,
-        }
-        struct PietStrokePolyLine {
-            rgba_color: u32,
-            width: f32,
-            n_points: u32,
-            points: Ref<Point>,
-        }
-        enum PietItem {
-            Group(SimpleGroup),
-            Circle(PietCircle),
-            Line(PietStrokeLine),
-            Fill(PietFill),
-            Poly(PietStrokePolyLine),
-        }
-
-        // New approach follows (above to be deleted)
         struct LineSeg {
             p0: [f32; 2],
             p1: [f32; 2],
diff --git a/piet-gpu/shader/build.ninja b/piet-gpu/shader/build.ninja
index 13fb1b2..cce8615 100644
--- a/piet-gpu/shader/build.ninja
+++ b/piet-gpu/shader/build.ninja
@@ -7,8 +7,6 @@ glslang_validator = glslangValidator
 rule glsl
   command = $glslang_validator -V -o $out $in
 
-build image.spv: glsl image.comp | scene.h
-
 
 build elements.spv: glsl elements.comp | scene.h state.h annotated.h
 
diff --git a/piet-gpu/shader/image.comp b/piet-gpu/shader/image.comp
deleted file mode 100644
index 6d84eb5..0000000
--- a/piet-gpu/shader/image.comp
+++ /dev/null
@@ -1,54 +0,0 @@
-// A simple kernel to create an image.
-
-// Right now, this kernel stores the image in a buffer, but a better
-// plan is to use a texture. This is because of limited support.
-
-#version 450
-#extension GL_GOOGLE_include_directive : enable
-
-layout(local_size_x = 16, local_size_y = 16) in;
-
-layout(set = 0, binding = 0) readonly buffer SceneBuf {
-    uint[] scene;
-};
-
-layout(set = 0, binding = 1) buffer ImageBuf {
-    uint[] image;
-};
-
-#include "scene.h"
-
-// TODO: make the image size dynamic.
-#define IMAGE_WIDTH 2048
-#define IMAGE_HEIGHT 1535
-
-void main() {
-    uvec2 xy_uint = gl_GlobalInvocationID.xy;
-    vec2 xy = vec2(xy_uint);
-    vec2 uv = xy * vec2(1.0 / IMAGE_WIDTH, 1.0 / IMAGE_HEIGHT);
-    vec3 rgb = uv.xyy;
-
-    // Render the scene. Right now, every pixel traverses the scene graph,
-    // which is horribly wasteful, but the goal is to get *some* output and
-    // then optimize.
-
-    SimpleGroup group = PietItem_Group_read(PietItemRef(0));
-    for (uint i = 0; i < group.n_items; i++) {
-        PietItemRef item_ref = PietItem_index(group.items, i);
-        uint tag = PietItem_tag(item_ref);
-        tag = PietItem_Circle;
-        if (tag == PietItem_Circle) {
-            PietCircle circle = PietItem_Circle_read(item_ref);
-            float r = length(xy + vec2(0.5, 0.5) - circle.center.xy);
-            float alpha = clamp(0.5 + circle.radius - r, 0.0, 1.0);
-            vec4 fg_rgba = unpackUnorm4x8(circle.rgba_color);
-            // TODO: sRGB
-            rgb = mix(rgb, fg_rgba.rgb, alpha * fg_rgba.a);
-        }
-    }
-
-    // TODO: sRGB
-    uvec4 s = uvec4(round(vec4(rgb, 1.0) * 255.0));
-    uint rgba_packed = s.r | (s.g << 8) | (s.b << 16) | (s.a << 24);
-    image[xy_uint.y * IMAGE_WIDTH + xy_uint.x] = rgba_packed;
-}
diff --git a/piet-gpu/shader/image.spv b/piet-gpu/shader/image.spv
deleted file mode 100644
index 097add185fc152cd7131529812585e68b2eebfd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8116
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
Vw^nn?<NuBC1^Yfxw^q5e{ud|lFJ=G$

diff --git a/piet-gpu/shader/scene.h b/piet-gpu/shader/scene.h
index 3e57303..eee8075 100644
--- a/piet-gpu/shader/scene.h
+++ b/piet-gpu/shader/scene.h
@@ -1,37 +1,5 @@
 // Code auto-generated by piet-gpu-derive
 
-struct BboxRef {
-    uint offset;
-};
-
-struct PointRef {
-    uint offset;
-};
-
-struct SimpleGroupRef {
-    uint offset;
-};
-
-struct PietCircleRef {
-    uint offset;
-};
-
-struct PietStrokeLineRef {
-    uint offset;
-};
-
-struct PietFillRef {
-    uint offset;
-};
-
-struct PietStrokePolyLineRef {
-    uint offset;
-};
-
-struct PietItemRef {
-    uint offset;
-};
-
 struct LineSegRef {
     uint offset;
 };
@@ -64,102 +32,6 @@ struct ElementRef {
     uint offset;
 };
 
-struct Bbox {
-    ivec4 bbox;
-};
-
-#define Bbox_size 8
-
-BboxRef Bbox_index(BboxRef ref, uint index) {
-    return BboxRef(ref.offset + index * Bbox_size);
-}
-
-struct Point {
-    vec2 xy;
-};
-
-#define Point_size 8
-
-PointRef Point_index(PointRef ref, uint index) {
-    return PointRef(ref.offset + index * Point_size);
-}
-
-struct SimpleGroup {
-    uint n_items;
-    PietItemRef items;
-    BboxRef bboxes;
-    Point offset;
-};
-
-#define SimpleGroup_size 20
-
-SimpleGroupRef SimpleGroup_index(SimpleGroupRef ref, uint index) {
-    return SimpleGroupRef(ref.offset + index * SimpleGroup_size);
-}
-
-struct PietCircle {
-    uint rgba_color;
-    Point center;
-    float radius;
-};
-
-#define PietCircle_size 16
-
-PietCircleRef PietCircle_index(PietCircleRef ref, uint index) {
-    return PietCircleRef(ref.offset + index * PietCircle_size);
-}
-
-struct PietStrokeLine {
-    uint flags;
-    uint rgba_color;
-    float width;
-    Point start;
-    Point end;
-};
-
-#define PietStrokeLine_size 28
-
-PietStrokeLineRef PietStrokeLine_index(PietStrokeLineRef ref, uint index) {
-    return PietStrokeLineRef(ref.offset + index * PietStrokeLine_size);
-}
-
-struct PietFill {
-    uint flags;
-    uint rgba_color;
-    uint n_points;
-    PointRef points;
-};
-
-#define PietFill_size 16
-
-PietFillRef PietFill_index(PietFillRef ref, uint index) {
-    return PietFillRef(ref.offset + index * PietFill_size);
-}
-
-struct PietStrokePolyLine {
-    uint rgba_color;
-    float width;
-    uint n_points;
-    PointRef points;
-};
-
-#define PietStrokePolyLine_size 16
-
-PietStrokePolyLineRef PietStrokePolyLine_index(PietStrokePolyLineRef ref, uint index) {
-    return PietStrokePolyLineRef(ref.offset + index * PietStrokePolyLine_size);
-}
-
-#define PietItem_Group 0
-#define PietItem_Circle 1
-#define PietItem_Line 2
-#define PietItem_Fill 3
-#define PietItem_Poly 4
-#define PietItem_size 32
-
-PietItemRef PietItem_index(PietItemRef ref, uint index) {
-    return PietItemRef(ref.offset + index * PietItem_size);
-}
-
 struct LineSeg {
     vec2 p0;
     vec2 p1;
@@ -254,114 +126,6 @@ ElementRef Element_index(ElementRef ref, uint index) {
     return ElementRef(ref.offset + index * Element_size);
 }
 
-Bbox Bbox_read(BboxRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = scene[ix + 0];
-    uint raw1 = scene[ix + 1];
-    Bbox s;
-    s.bbox = ivec4(int(raw0 << 16) >> 16, int(raw0) >> 16, int(raw1 << 16) >> 16, int(raw1) >> 16);
-    return s;
-}
-
-Point Point_read(PointRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = scene[ix + 0];
-    uint raw1 = scene[ix + 1];
-    Point s;
-    s.xy = vec2(uintBitsToFloat(raw0), uintBitsToFloat(raw1));
-    return s;
-}
-
-SimpleGroup SimpleGroup_read(SimpleGroupRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = scene[ix + 0];
-    uint raw1 = scene[ix + 1];
-    uint raw2 = scene[ix + 2];
-    SimpleGroup s;
-    s.n_items = raw0;
-    s.items = PietItemRef(raw1);
-    s.bboxes = BboxRef(raw2);
-    s.offset = Point_read(PointRef(ref.offset + 12));
-    return s;
-}
-
-PietCircle PietCircle_read(PietCircleRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = scene[ix + 0];
-    uint raw3 = scene[ix + 3];
-    PietCircle s;
-    s.rgba_color = raw0;
-    s.center = Point_read(PointRef(ref.offset + 4));
-    s.radius = uintBitsToFloat(raw3);
-    return s;
-}
-
-PietStrokeLine PietStrokeLine_read(PietStrokeLineRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = scene[ix + 0];
-    uint raw1 = scene[ix + 1];
-    uint raw2 = scene[ix + 2];
-    PietStrokeLine s;
-    s.flags = raw0;
-    s.rgba_color = raw1;
-    s.width = uintBitsToFloat(raw2);
-    s.start = Point_read(PointRef(ref.offset + 12));
-    s.end = Point_read(PointRef(ref.offset + 20));
-    return s;
-}
-
-PietFill PietFill_read(PietFillRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = scene[ix + 0];
-    uint raw1 = scene[ix + 1];
-    uint raw2 = scene[ix + 2];
-    uint raw3 = scene[ix + 3];
-    PietFill s;
-    s.flags = raw0;
-    s.rgba_color = raw1;
-    s.n_points = raw2;
-    s.points = PointRef(raw3);
-    return s;
-}
-
-PietStrokePolyLine PietStrokePolyLine_read(PietStrokePolyLineRef ref) {
-    uint ix = ref.offset >> 2;
-    uint raw0 = scene[ix + 0];
-    uint raw1 = scene[ix + 1];
-    uint raw2 = scene[ix + 2];
-    uint raw3 = scene[ix + 3];
-    PietStrokePolyLine s;
-    s.rgba_color = raw0;
-    s.width = uintBitsToFloat(raw1);
-    s.n_points = raw2;
-    s.points = PointRef(raw3);
-    return s;
-}
-
-uint PietItem_tag(PietItemRef ref) {
-    return scene[ref.offset >> 2];
-}
-
-SimpleGroup PietItem_Group_read(PietItemRef ref) {
-    return SimpleGroup_read(SimpleGroupRef(ref.offset + 4));
-}
-
-PietCircle PietItem_Circle_read(PietItemRef ref) {
-    return PietCircle_read(PietCircleRef(ref.offset + 4));
-}
-
-PietStrokeLine PietItem_Line_read(PietItemRef ref) {
-    return PietStrokeLine_read(PietStrokeLineRef(ref.offset + 4));
-}
-
-PietFill PietItem_Fill_read(PietItemRef ref) {
-    return PietFill_read(PietFillRef(ref.offset + 4));
-}
-
-PietStrokePolyLine PietItem_Poly_read(PietItemRef ref) {
-    return PietStrokePolyLine_read(PietStrokePolyLineRef(ref.offset + 4));
-}
-
 LineSeg LineSeg_read(LineSegRef ref) {
     uint ix = ref.offset >> 2;
     uint raw0 = scene[ix + 0];