From 4fd332955add1074dc8ad87ee2af6350df31304a Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 19 Dec 2018 20:30:36 -0800
Subject: [PATCH] Fix bugs

---
 demo2/pathfinder.ts        | 1 +
 utils/tile-svg/src/main.rs | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/demo2/pathfinder.ts b/demo2/pathfinder.ts
index dd264f05..df5c847e 100644
--- a/demo2/pathfinder.ts
+++ b/demo2/pathfinder.ts
@@ -275,6 +275,7 @@ class App {
         gl.vertexAttribDivisor(maskTileProgram.attributes.Color, 1);
         gl.enableVertexAttribArray(maskTileProgram.attributes.TessCoord);
         gl.enableVertexAttribArray(maskTileProgram.attributes.TileOrigin);
+        gl.enableVertexAttribArray(maskTileProgram.attributes.Backdrop);
         gl.enableVertexAttribArray(maskTileProgram.attributes.Color);
 
         // Set up event handlers.
diff --git a/utils/tile-svg/src/main.rs b/utils/tile-svg/src/main.rs
index af469aba..8164c89f 100644
--- a/utils/tile-svg/src/main.rs
+++ b/utils/tile-svg/src/main.rs
@@ -1081,8 +1081,13 @@ impl<'o, 'p> Tiler<'o, 'p> {
             // Finalize tiles.
             if !above_view_box {
                 // Flush tiles.
+                let first_tile_index = self.built_scene.mask_tiles.len() as u32;
+                //println!("--- first tile index {} ---", first_tile_index);
                 for (tile_index, tile) in strip_tiles.iter().enumerate() {
                     if used_strip_tiles.contains(tile_index) {
+                        /*println!("mask index {} -> {}",
+                                 tile_index,
+                                 self.built_scene.mask_tiles.len());*/
                         self.built_scene.mask_tiles.push(*tile);
                     } else if tile.backdrop != 0.0 {
                         self.built_scene.solid_tiles.push(SolidTilePrimitive {
@@ -1095,10 +1100,12 @@ impl<'o, 'p> Tiler<'o, 'p> {
                 // Flush fills.
                 //
                 // TODO(pcwalton): Don't use a temporary vector to hold these.
-                let first_tile_index = self.built_scene.mask_tiles.len() as u32;
                 for fill in &strip_fills {
                     let real_tile_index = first_tile_index +
                         used_strip_tiles.count_ones(0..(fill.tile_index as usize)) as u32;
+                    /*println!("flush fill, mask index {} -> {}",
+                             fill.tile_index,
+                             real_tile_index);*/
                     self.built_scene.fills.push(FillPrimitive {
                         from: fill.from,
                         to: fill.to,