Update Scatterplot to GLSL 300 (#8369)

Author: donmccurdy

modules/layers/src/scatterplot-layer/scatterplot-layer-fragment.glsl.ts

@@ -19,6 +19,7 @@
 // THE SOFTWARE.
 
 export default `\
+#version 300 es
 #define SHADER_NAME scatterplot-layer-fragment-shader
 
 precision highp float;
@@ -27,11 +28,13 @@ uniform bool filled;
 uniform float stroked;
 uniform bool antialiasing;
 
-varying vec4 vFillColor;
-varying vec4 vLineColor;
-varying vec2 unitPosition;
-varying float innerUnitRadius;
-varying float outerRadiusPixels;
+in vec4 vFillColor;
+in vec4 vLineColor;
+in vec2 unitPosition;
+in float innerUnitRadius;
+in float outerRadiusPixels;
+
+out vec4 fragColor;
 
 void main(void) {
   geometry.uv = unitPosition;
@@ -51,20 +54,20 @@ void main(void) {
       step(innerUnitRadius * outerRadiusPixels, distToCenter);
 
     if (filled) {
-      gl_FragColor = mix(vFillColor, vLineColor, isLine);
+      fragColor = mix(vFillColor, vLineColor, isLine);
     } else {
       if (isLine == 0.0) {
         discard;
       }
-      gl_FragColor = vec4(vLineColor.rgb, vLineColor.a * isLine);
+      fragColor = vec4(vLineColor.rgb, vLineColor.a * isLine);
     }
   } else if (!filled) {
     discard;
   } else {
-    gl_FragColor = vFillColor;
+    fragColor = vFillColor;
   }
 
-  gl_FragColor.a *= inCircle;
-  DECKGL_FILTER_COLOR(gl_FragColor, geometry);
+  fragColor.a *= inCircle;
+  DECKGL_FILTER_COLOR(fragColor, geometry);
 }
 `;

modules/layers/src/scatterplot-layer/scatterplot-layer-vertex.glsl.ts

@@ -19,17 +19,18 @@
 // THE SOFTWARE.
 
 export default `\
+#version 300 es
 #define SHADER_NAME scatterplot-layer-vertex-shader
 
-attribute vec3 positions;
+in vec3 positions;
 
-attribute vec3 instancePositions;
-attribute vec3 instancePositions64Low;
-attribute float instanceRadius;
-attribute float instanceLineWidths;
-attribute vec4 instanceFillColors;
-attribute vec4 instanceLineColors;
-attribute vec3 instancePickingColors;
+in vec3 instancePositions;
+in vec3 instancePositions64Low;
+in float instanceRadius;
+in float instanceLineWidths;
+in vec4 instanceFillColors;
+in vec4 instanceLineColors;
+in vec3 instancePickingColors;
 
 uniform float opacity;
 uniform float radiusScale;
@@ -45,11 +46,11 @@ uniform bool billboard;
 uniform int radiusUnits;
 uniform int lineWidthUnits;
 
-varying vec4 vFillColor;
-varying vec4 vLineColor;
-varying vec2 unitPosition;
-varying float innerUnitRadius;
-varying float outerRadiusPixels;
+out vec4 vFillColor;
+out vec4 vLineColor;
+out vec2 unitPosition;
+out float innerUnitRadius;
+out float outerRadiusPixels;
 
 
 void main(void) {