From 0fba9cab89d87f4af8bac87ea48b94ede11bf13f Mon Sep 17 00:00:00 2001
From: Asheem Mamoowala <asheem.mamoowala@mapbox.com>
Date: Mon, 14 May 2018 13:52:56 -0700
Subject: [PATCH] The PaintVertexArray's backing array buffer is deleted after
 upload if the Binder refers to a non state-dependent property expression.
 Ensure that Binder#upload does not attempt to re-upload the PaintVertexArray
 after a subsequent feature-state update.

---
 src/data/program_configuration.js             |   4 +-
 .../mapbox-gl-js#6655/expected.png            | Bin 0 -> 445 bytes
 .../regressions/mapbox-gl-js#6655/style.json  |  59 ++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#6655/expected.png
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#6655/style.json

diff --git a/src/data/program_configuration.js b/src/data/program_configuration.js
index 6f1ff830a34..0c3a6ea1659 100644
--- a/src/data/program_configuration.js
+++ b/src/data/program_configuration.js
@@ -184,7 +184,7 @@ class SourceExpressionBinder<T> implements Binder<T> {
     }
 
     upload(context: Context) {
-        if (this.paintVertexArray) {
+        if (this.paintVertexArray && this.paintVertexArray.arrayBuffer) {
             this.paintVertexBuffer = context.createVertexBuffer(this.paintVertexArray, this.paintVertexAttributes, this.expression.isStateDependent);
         }
     }
@@ -279,7 +279,7 @@ class CompositeExpressionBinder<T> implements Binder<T> {
     }
 
     upload(context: Context) {
-        if (this.paintVertexArray) {
+        if (this.paintVertexArray && this.paintVertexArray.arrayBuffer) {
             this.paintVertexBuffer = context.createVertexBuffer(this.paintVertexArray, this.paintVertexAttributes, this.expression.isStateDependent);
         }
     }
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#6655/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#6655/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f286c436a1bdbb7331b758294fc3a76c27a6a72
GIT binary patch
literal 445
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Or9=|Ar*{or0Om)Fff*ZcyAAG
z%!*2sV7O4c-rKR@va8Xugu)HYyB|cm7(LaUWLe3rZs^?pO|+$lZ>z%D2N5wz)42R3
zFFA4Ty{@8iy59JSwL6Dmi+~f1_)wQ}&yAV6#5N+SZEaWTs;dW8tLAMxAh<46C3tS|
zoa(v8F)JK=P5lbreQn!uc<Pa?ORpcSw$(LbuB&-+J>Txl3T^2}+<B@~Jl|Va{X4m1
zzJc7vFoUJFXHMGA{4e%HXJJef?-vmtiT;S&#!0q`Yu2>4wG?IYifp;j6H$GvqqMts
zQzKBIRP;+^rQ`gmo7S}yy^qmbyR^x&J<i~Hz|A11om<kl@-qA~tB+0j#_OAE%=z@v
zt)ztyW=z)1tzNdJ-!gF9fiS0;U#xy)`gi-zpSu5<%)JX=Zm7q2uTa|?eJ626f_v@J
zgI&$CrTuds&OVa0s<73XXYV;ly%2@qwS0OPKW|~}D_E;EbNj^u46*#vW+ZAO1r9Kn
cR{mkUf7Mr~^O0g5Fg_SOUHx3vIVCg!0F@-ZN&o-=

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#6655/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#6655/style.json
new file mode 100644
index 00000000000..31572b22e00
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#6655/style.json
@@ -0,0 +1,59 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64,
+      "operations": [
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "1"
+          },
+          {
+            "hover": true
+          }
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "zoom": 2,
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+            "type": "Feature",
+            "id": 1,
+            "properties": {
+                "radius": 5
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [0,0]
+            }
+        }
+    }
+  },
+  "layers": [
+    {
+      "id": "circle",
+      "type": "circle",
+      "source": "geojson",
+      "paint": {
+            "circle-radius": [ "get", "radius" ],
+            "circle-opacity": 0.5,
+            "circle-color": "#ff0000",
+            "circle-stroke-width": [
+                "case",
+                ["boolean", ["feature-state", "hover"], false],
+                4,
+                1
+            ]
+        }
+    }
+  ]
+}