@cesium/engine 1.1.0 → 2.1.0

package/Source/Shaders/ShadowVolumeAppearanceFS.glsl

@@ -1,22 +1,18 @@
-#ifdef GL_EXT_frag_depth
-#extension GL_EXT_frag_depth : enable
-#endif
-
 #ifdef TEXTURE_COORDINATES
 #ifdef SPHERICAL
-varying vec4 v_sphericalExtents;
+in vec4 v_sphericalExtents;
 #else // SPHERICAL
-varying vec2 v_inversePlaneExtents;
-varying vec4 v_westPlane;
-varying vec4 v_southPlane;
+in vec2 v_inversePlaneExtents;
+in vec4 v_westPlane;
+in vec4 v_southPlane;
 #endif // SPHERICAL
-varying vec3 v_uvMinAndSphericalLongitudeRotation;
-varying vec3 v_uMaxAndInverseDistance;
-varying vec3 v_vMaxAndInverseDistance;
+in vec3 v_uvMinAndSphericalLongitudeRotation;
+in vec3 v_uMaxAndInverseDistance;
+in vec3 v_vMaxAndInverseDistance;
 #endif // TEXTURE_COORDINATES
 
 #ifdef PER_INSTANCE_COLOR
-varying vec4 v_color;
+in vec4 v_color;
 #endif
 
 #ifdef NORMAL_EC
@@ -28,8 +24,8 @@ vec3 getEyeCoordinate3FromWindowCoordinate(vec2 fragCoord, float logDepthOrDepth
 vec3 vectorFromOffset(vec4 eyeCoordinate, vec2 positiveOffset) {
     vec2 glFragCoordXY = gl_FragCoord.xy;
     // Sample depths at both offset and negative offset
-    float upOrRightLogDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, (glFragCoordXY + positiveOffset) / czm_viewport.zw));
-    float downOrLeftLogDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, (glFragCoordXY - positiveOffset) / czm_viewport.zw));
+    float upOrRightLogDepth = czm_unpackDepth(texture(czm_globeDepthTexture, (glFragCoordXY + positiveOffset) / czm_viewport.zw));
+    float downOrLeftLogDepth = czm_unpackDepth(texture(czm_globeDepthTexture, (glFragCoordXY - positiveOffset) / czm_viewport.zw));
     // Explicitly evaluate both paths
     // Necessary for multifrustum and for edges of the screen
     bvec2 upOrRightInBounds = lessThan(glFragCoordXY + positiveOffset, czm_viewport.zw);
@@ -44,7 +40,7 @@ vec3 vectorFromOffset(vec4 eyeCoordinate, vec2 positiveOffset) {
 void main(void)
 {
 #ifdef REQUIRES_EC
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw));
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw));
     vec4 eyeCoordinate = czm_windowToEyeCoordinates(gl_FragCoord.xy, logDepthOrDepth);
 #endif
 
@@ -76,11 +72,11 @@ void main(void)
     // being opaque pixels there in another buffer.
     // Check for logDepthOrDepth != 0.0 to make sure this should be classified.
     if (0.0 <= uv.x && uv.x <= 1.0 && 0.0 <= uv.y && uv.y <= 1.0 || logDepthOrDepth != 0.0) {
-        gl_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource
+        out_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource
         czm_writeDepthClamp();
     }
 #else // CULL_FRAGMENTS
-        gl_FragColor.a = 1.0;
+        out_FragColor.a = 1.0;
 #endif // CULL_FRAGMENTS
 #else // PICK
 
@@ -105,7 +101,7 @@ void main(void)
 
     vec4 color = czm_gammaCorrect(v_color);
 #ifdef FLAT
-    gl_FragColor = color;
+    out_FragColor = color;
 #else // FLAT
     czm_materialInput materialInput;
     materialInput.normalEC = normalEC;
@@ -114,11 +110,11 @@ void main(void)
     material.diffuse = color.rgb;
     material.alpha = color.a;
 
-    gl_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);
 #endif // FLAT
 
     // Premultiply alpha. Required for classification primitives on translucent globe.
-    gl_FragColor.rgb *= gl_FragColor.a;
+    out_FragColor.rgb *= out_FragColor.a;
 
 #else // PER_INSTANCE_COLOR
 
@@ -151,13 +147,13 @@ void main(void)
     czm_material material = czm_getMaterial(materialInput);
 
 #ifdef FLAT
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #else // FLAT
-    gl_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);
 #endif // FLAT
 
     // Premultiply alpha. Required for classification primitives on translucent globe.
-    gl_FragColor.rgb *= gl_FragColor.a;
+    out_FragColor.rgb *= out_FragColor.a;
 
 #endif // PER_INSTANCE_COLOR
     czm_writeDepthClamp();

package/Source/Shaders/ShadowVolumeAppearanceFS.js

@@ -1,23 +1,19 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "#ifdef GL_EXT_frag_depth\n\
-#extension GL_EXT_frag_depth : enable\n\
-#endif\n\
-\n\
-#ifdef TEXTURE_COORDINATES\n\
+export default "#ifdef TEXTURE_COORDINATES\n\
 #ifdef SPHERICAL\n\
-varying vec4 v_sphericalExtents;\n\
+in vec4 v_sphericalExtents;\n\
 #else // SPHERICAL\n\
-varying vec2 v_inversePlaneExtents;\n\
-varying vec4 v_westPlane;\n\
-varying vec4 v_southPlane;\n\
+in vec2 v_inversePlaneExtents;\n\
+in vec4 v_westPlane;\n\
+in vec4 v_southPlane;\n\
 #endif // SPHERICAL\n\
-varying vec3 v_uvMinAndSphericalLongitudeRotation;\n\
-varying vec3 v_uMaxAndInverseDistance;\n\
-varying vec3 v_vMaxAndInverseDistance;\n\
+in vec3 v_uvMinAndSphericalLongitudeRotation;\n\
+in vec3 v_uMaxAndInverseDistance;\n\
+in vec3 v_vMaxAndInverseDistance;\n\
 #endif // TEXTURE_COORDINATES\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-varying vec4 v_color;\n\
+in vec4 v_color;\n\
 #endif\n\
 \n\
 #ifdef NORMAL_EC\n\
@@ -29,8 +25,8 @@ vec3 getEyeCoordinate3FromWindowCoordinate(vec2 fragCoord, float logDepthOrDepth
 vec3 vectorFromOffset(vec4 eyeCoordinate, vec2 positiveOffset) {\n\
     vec2 glFragCoordXY = gl_FragCoord.xy;\n\
     // Sample depths at both offset and negative offset\n\
-    float upOrRightLogDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, (glFragCoordXY + positiveOffset) / czm_viewport.zw));\n\
-    float downOrLeftLogDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, (glFragCoordXY - positiveOffset) / czm_viewport.zw));\n\
+    float upOrRightLogDepth = czm_unpackDepth(texture(czm_globeDepthTexture, (glFragCoordXY + positiveOffset) / czm_viewport.zw));\n\
+    float downOrLeftLogDepth = czm_unpackDepth(texture(czm_globeDepthTexture, (glFragCoordXY - positiveOffset) / czm_viewport.zw));\n\
     // Explicitly evaluate both paths\n\
     // Necessary for multifrustum and for edges of the screen\n\
     bvec2 upOrRightInBounds = lessThan(glFragCoordXY + positiveOffset, czm_viewport.zw);\n\
@@ -45,7 +41,7 @@ vec3 vectorFromOffset(vec4 eyeCoordinate, vec2 positiveOffset) {\n\
 void main(void)\n\
 {\n\
 #ifdef REQUIRES_EC\n\
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw));\n\
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw));\n\
     vec4 eyeCoordinate = czm_windowToEyeCoordinates(gl_FragCoord.xy, logDepthOrDepth);\n\
 #endif\n\
 \n\
@@ -77,11 +73,11 @@ void main(void)\n\
     // being opaque pixels there in another buffer.\n\
     // Check for logDepthOrDepth != 0.0 to make sure this should be classified.\n\
     if (0.0 <= uv.x && uv.x <= 1.0 && 0.0 <= uv.y && uv.y <= 1.0 || logDepthOrDepth != 0.0) {\n\
-        gl_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource\n\
+        out_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource\n\
         czm_writeDepthClamp();\n\
     }\n\
 #else // CULL_FRAGMENTS\n\
-        gl_FragColor.a = 1.0;\n\
+        out_FragColor.a = 1.0;\n\
 #endif // CULL_FRAGMENTS\n\
 #else // PICK\n\
 \n\
@@ -106,7 +102,7 @@ void main(void)\n\
 \n\
     vec4 color = czm_gammaCorrect(v_color);\n\
 #ifdef FLAT\n\
-    gl_FragColor = color;\n\
+    out_FragColor = color;\n\
 #else // FLAT\n\
     czm_materialInput materialInput;\n\
     materialInput.normalEC = normalEC;\n\
@@ -115,11 +111,11 @@ void main(void)\n\
     material.diffuse = color.rgb;\n\
     material.alpha = color.a;\n\
 \n\
-    gl_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);\n\
 #endif // FLAT\n\
 \n\
     // Premultiply alpha. Required for classification primitives on translucent globe.\n\
-    gl_FragColor.rgb *= gl_FragColor.a;\n\
+    out_FragColor.rgb *= out_FragColor.a;\n\
 \n\
 #else // PER_INSTANCE_COLOR\n\
 \n\
@@ -152,13 +148,13 @@ void main(void)\n\
     czm_material material = czm_getMaterial(materialInput);\n\
 \n\
 #ifdef FLAT\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #else // FLAT\n\
-    gl_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);\n\
 #endif // FLAT\n\
 \n\
     // Premultiply alpha. Required for classification primitives on translucent globe.\n\
-    gl_FragColor.rgb *= gl_FragColor.a;\n\
+    out_FragColor.rgb *= out_FragColor.a;\n\
 \n\
 #endif // PER_INSTANCE_COLOR\n\
     czm_writeDepthClamp();\n\

package/Source/Shaders/ShadowVolumeAppearanceVS.glsl

@@ -1,28 +1,28 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in float batchId;
 
 #ifdef EXTRUDED_GEOMETRY
-attribute vec3 extrudeDirection;
+in vec3 extrudeDirection;
 
 uniform float u_globeMinimumAltitude;
 #endif // EXTRUDED_GEOMETRY
 
 #ifdef PER_INSTANCE_COLOR
-varying vec4 v_color;
+out vec4 v_color;
 #endif // PER_INSTANCE_COLOR
 
 #ifdef TEXTURE_COORDINATES
 #ifdef SPHERICAL
-varying vec4 v_sphericalExtents;
+out vec4 v_sphericalExtents;
 #else // SPHERICAL
-varying vec2 v_inversePlaneExtents;
-varying vec4 v_westPlane;
-varying vec4 v_southPlane;
+out vec2 v_inversePlaneExtents;
+out vec4 v_westPlane;
+out vec4 v_southPlane;
 #endif // SPHERICAL
-varying vec3 v_uvMinAndSphericalLongitudeRotation;
-varying vec3 v_uMaxAndInverseDistance;
-varying vec3 v_vMaxAndInverseDistance;
+out vec3 v_uvMinAndSphericalLongitudeRotation;
+out vec3 v_uMaxAndInverseDistance;
+out vec3 v_vMaxAndInverseDistance;
 #endif // TEXTURE_COORDINATES
 
 void main()

package/Source/Shaders/ShadowVolumeAppearanceVS.js

@@ -1,29 +1,29 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in float batchId;\n\
 \n\
 #ifdef EXTRUDED_GEOMETRY\n\
-attribute vec3 extrudeDirection;\n\
+in vec3 extrudeDirection;\n\
 \n\
 uniform float u_globeMinimumAltitude;\n\
 #endif // EXTRUDED_GEOMETRY\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-varying vec4 v_color;\n\
+out vec4 v_color;\n\
 #endif // PER_INSTANCE_COLOR\n\
 \n\
 #ifdef TEXTURE_COORDINATES\n\
 #ifdef SPHERICAL\n\
-varying vec4 v_sphericalExtents;\n\
+out vec4 v_sphericalExtents;\n\
 #else // SPHERICAL\n\
-varying vec2 v_inversePlaneExtents;\n\
-varying vec4 v_westPlane;\n\
-varying vec4 v_southPlane;\n\
+out vec2 v_inversePlaneExtents;\n\
+out vec4 v_westPlane;\n\
+out vec4 v_southPlane;\n\
 #endif // SPHERICAL\n\
-varying vec3 v_uvMinAndSphericalLongitudeRotation;\n\
-varying vec3 v_uMaxAndInverseDistance;\n\
-varying vec3 v_vMaxAndInverseDistance;\n\
+out vec3 v_uvMinAndSphericalLongitudeRotation;\n\
+out vec3 v_uMaxAndInverseDistance;\n\
+out vec3 v_vMaxAndInverseDistance;\n\
 #endif // TEXTURE_COORDINATES\n\
 \n\
 void main()\n\

package/Source/Shaders/ShadowVolumeFS.glsl

@@ -1,7 +1,3 @@
-#ifdef GL_EXT_frag_depth
-#extension GL_EXT_frag_depth : enable
-#endif
-
 #ifdef VECTOR_TILE
 uniform vec4 u_highlightColor;
 #endif
@@ -9,9 +5,9 @@ uniform vec4 u_highlightColor;
 void main(void)
 {
 #ifdef VECTOR_TILE
-    gl_FragColor = czm_gammaCorrect(u_highlightColor);
+    out_FragColor = czm_gammaCorrect(u_highlightColor);
 #else
-    gl_FragColor = vec4(1.0);
+    out_FragColor = vec4(1.0);
 #endif
     czm_writeDepthClamp();
 }

package/Source/Shaders/ShadowVolumeFS.js

@@ -1,18 +1,14 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "#ifdef GL_EXT_frag_depth\n\
-#extension GL_EXT_frag_depth : enable\n\
-#endif\n\
-\n\
-#ifdef VECTOR_TILE\n\
+export default "#ifdef VECTOR_TILE\n\
 uniform vec4 u_highlightColor;\n\
 #endif\n\
 \n\
 void main(void)\n\
 {\n\
 #ifdef VECTOR_TILE\n\
-    gl_FragColor = czm_gammaCorrect(u_highlightColor);\n\
+    out_FragColor = czm_gammaCorrect(u_highlightColor);\n\
 #else\n\
-    gl_FragColor = vec4(1.0);\n\
+    out_FragColor = vec4(1.0);\n\
 #endif\n\
     czm_writeDepthClamp();\n\
 }\n\

package/Source/Shaders/SkyAtmosphereFS.glsl

@@ -1,12 +1,12 @@
-varying vec3 v_outerPositionWC;
+in vec3 v_outerPositionWC;
 
 uniform vec3 u_hsbShift;
 
 #ifndef PER_FRAGMENT_ATMOSPHERE
-varying vec3 v_mieColor;
-varying vec3 v_rayleighColor;
-varying float v_opacity;
-varying float v_translucent;
+in vec3 v_mieColor;
+in vec3 v_rayleighColor;
+in float v_opacity;
+in float v_translucent;
 #endif
 
 void main (void)
@@ -60,5 +60,5 @@ void main (void)
         color.a = mix(color.b, 1.0, color.a) * smoothstep(0.0, 1.0, czm_morphTime);
     }
 
-    gl_FragColor = color;
+    out_FragColor = color;
 }

package/Source/Shaders/SkyAtmosphereFS.js

@@ -1,13 +1,13 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_outerPositionWC;\n\
+export default "in vec3 v_outerPositionWC;\n\
 \n\
 uniform vec3 u_hsbShift;\n\
 \n\
 #ifndef PER_FRAGMENT_ATMOSPHERE\n\
-varying vec3 v_mieColor;\n\
-varying vec3 v_rayleighColor;\n\
-varying float v_opacity;\n\
-varying float v_translucent;\n\
+in vec3 v_mieColor;\n\
+in vec3 v_rayleighColor;\n\
+in float v_opacity;\n\
+in float v_translucent;\n\
 #endif\n\
 \n\
 void main (void)\n\
@@ -61,6 +61,6 @@ void main (void)\n\
         color.a = mix(color.b, 1.0, color.a) * smoothstep(0.0, 1.0, czm_morphTime);\n\
     }\n\
 \n\
-    gl_FragColor = color;\n\
+    out_FragColor = color;\n\
 }\n\
 ";

package/Source/Shaders/SkyAtmosphereVS.glsl

@@ -1,12 +1,12 @@
-attribute vec4 position;
+in vec4 position;
 
-varying vec3 v_outerPositionWC;
+out vec3 v_outerPositionWC;
 
 #ifndef PER_FRAGMENT_ATMOSPHERE
-varying vec3 v_mieColor;
-varying vec3 v_rayleighColor;
-varying float v_opacity;
-varying float v_translucent;
+out vec3 v_mieColor;
+out vec3 v_rayleighColor;
+out float v_opacity;
+out float v_translucent;
 #endif
 
 void main(void)

package/Source/Shaders/SkyAtmosphereVS.js

@@ -1,13 +1,13 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec4 position;\n\
+export default "in vec4 position;\n\
 \n\
-varying vec3 v_outerPositionWC;\n\
+out vec3 v_outerPositionWC;\n\
 \n\
 #ifndef PER_FRAGMENT_ATMOSPHERE\n\
-varying vec3 v_mieColor;\n\
-varying vec3 v_rayleighColor;\n\
-varying float v_opacity;\n\
-varying float v_translucent;\n\
+out vec3 v_mieColor;\n\
+out vec3 v_rayleighColor;\n\
+out float v_opacity;\n\
+out float v_translucent;\n\
 #endif\n\
 \n\
 void main(void)\n\

package/Source/Shaders/SkyBoxFS.glsl

@@ -1,9 +1,9 @@
 uniform samplerCube u_cubeMap;
 
-varying vec3 v_texCoord;
+in vec3 v_texCoord;
 
 void main()
 {
-    vec4 color = textureCube(u_cubeMap, normalize(v_texCoord));
-    gl_FragColor = vec4(czm_gammaCorrect(color).rgb, czm_morphTime);
+    vec4 color = czm_textureCube(u_cubeMap, normalize(v_texCoord));
+    out_FragColor = vec4(czm_gammaCorrect(color).rgb, czm_morphTime);
 }

package/Source/Shaders/SkyBoxFS.js

@@ -1,11 +1,11 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform samplerCube u_cubeMap;\n\
 \n\
-varying vec3 v_texCoord;\n\
+in vec3 v_texCoord;\n\
 \n\
 void main()\n\
 {\n\
-    vec4 color = textureCube(u_cubeMap, normalize(v_texCoord));\n\
-    gl_FragColor = vec4(czm_gammaCorrect(color).rgb, czm_morphTime);\n\
+    vec4 color = czm_textureCube(u_cubeMap, normalize(v_texCoord));\n\
+    out_FragColor = vec4(czm_gammaCorrect(color).rgb, czm_morphTime);\n\
 }\n\
 ";

package/Source/Shaders/SkyBoxVS.glsl

@@ -1,6 +1,6 @@
-attribute vec3 position;
+in vec3 position;
 
-varying vec3 v_texCoord;
+out vec3 v_texCoord;
 
 void main()
 {

package/Source/Shaders/SkyBoxVS.js

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position;\n\
+export default "in vec3 position;\n\
 \n\
-varying vec3 v_texCoord;\n\
+out vec3 v_texCoord;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/SunFS.glsl

@@ -1,9 +1,9 @@
 uniform sampler2D u_texture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    vec4 color = texture2D(u_texture, v_textureCoordinates);
-    gl_FragColor = czm_gammaCorrect(color);
+    vec4 color = texture(u_texture, v_textureCoordinates);
+    out_FragColor = czm_gammaCorrect(color);
 }

package/Source/Shaders/SunFS.js

@@ -1,11 +1,11 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform sampler2D u_texture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    vec4 color = texture2D(u_texture, v_textureCoordinates);\n\
-    gl_FragColor = czm_gammaCorrect(color);\n\
+    vec4 color = texture(u_texture, v_textureCoordinates);\n\
+    out_FragColor = czm_gammaCorrect(color);\n\
 }\n\
 ";

package/Source/Shaders/SunTextureFS.glsl

@@ -1,6 +1,6 @@
 uniform float u_radiusTS;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 vec2 rotate(vec2 p, vec2 direction)
 {
@@ -51,5 +51,5 @@ void main()
 
     color += clamp(burst, vec4(0.0), vec4(1.0)) * 0.15;
 
-    gl_FragColor = clamp(color, vec4(0.0), vec4(1.0));
+    out_FragColor = clamp(color, vec4(0.0), vec4(1.0));
 }

package/Source/Shaders/SunTextureFS.js

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform float u_radiusTS;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 vec2 rotate(vec2 p, vec2 direction)\n\
 {\n\
@@ -52,6 +52,6 @@ void main()\n\
 \n\
     color += clamp(burst, vec4(0.0), vec4(1.0)) * 0.15;\n\
 \n\
-    gl_FragColor = clamp(color, vec4(0.0), vec4(1.0));\n\
+    out_FragColor = clamp(color, vec4(0.0), vec4(1.0));\n\
 }\n\
 ";

package/Source/Shaders/SunVS.glsl

@@ -1,8 +1,8 @@
-attribute vec2 direction;
+in vec2 direction;
 
 uniform float u_size;
 
-varying vec2 v_textureCoordinates;
+out vec2 v_textureCoordinates;
 
 void main() 
 {

package/Source/Shaders/SunVS.js

@@ -1,9 +1,9 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec2 direction;\n\
+export default "in vec2 direction;\n\
 \n\
 uniform float u_size;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+out vec2 v_textureCoordinates;\n\
 \n\
 void main() \n\
 {\n\

package/Source/Shaders/Vector3DTileClampedPolylinesFS.glsl

@@ -1,22 +1,18 @@
-#ifdef GL_EXT_frag_depth
-#extension GL_EXT_frag_depth : enable
-#endif
-
-varying vec4 v_startPlaneEC;
-varying vec4 v_endPlaneEC;
-varying vec4 v_rightPlaneEC;
-varying float v_halfWidth;
-varying vec3 v_volumeUpEC;
+in vec4 v_startPlaneEC;
+in vec4 v_endPlaneEC;
+in vec4 v_rightPlaneEC;
+in float v_halfWidth;
+in vec3 v_volumeUpEC;
 
 uniform vec4 u_highlightColor;
 void main()
 {
-    float logDepthOrDepth = czm_branchFreeTernary(czm_sceneMode == czm_sceneMode2D, gl_FragCoord.z, czm_unpackDepth(texture2D(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw)));
+    float logDepthOrDepth = czm_branchFreeTernary(czm_sceneMode == czm_sceneMode2D, gl_FragCoord.z, czm_unpackDepth(texture(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw)));
 
     // Discard for sky
     if (logDepthOrDepth == 0.0) {
 #ifdef DEBUG_SHOW_VOLUME
-        gl_FragColor = vec4(0.0, 0.0, 1.0, 0.5);
+        out_FragColor = vec4(0.0, 0.0, 1.0, 0.5);
         return;
 #else // DEBUG_SHOW_VOLUME
         discard;
@@ -40,13 +36,13 @@ void main()
 
     if (abs(widthwiseDistance) > halfMaxWidth || distanceFromStart < 0.0 || distanceFromEnd < 0.0) {
 #ifdef DEBUG_SHOW_VOLUME
-        gl_FragColor = vec4(logDepthOrDepth, 0.0, 0.0, 0.5);
+        out_FragColor = vec4(logDepthOrDepth, 0.0, 0.0, 0.5);
         return;
 #else // DEBUG_SHOW_VOLUME
         discard;
 #endif // DEBUG_SHOW_VOLUME
     }
-    gl_FragColor = u_highlightColor;
+    out_FragColor = u_highlightColor;
 
     czm_writeDepthClamp();
 }

package/Source/Shaders/Vector3DTileClampedPolylinesFS.js

@@ -1,23 +1,19 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "#ifdef GL_EXT_frag_depth\n\
-#extension GL_EXT_frag_depth : enable\n\
-#endif\n\
-\n\
-varying vec4 v_startPlaneEC;\n\
-varying vec4 v_endPlaneEC;\n\
-varying vec4 v_rightPlaneEC;\n\
-varying float v_halfWidth;\n\
-varying vec3 v_volumeUpEC;\n\
+export default "in vec4 v_startPlaneEC;\n\
+in vec4 v_endPlaneEC;\n\
+in vec4 v_rightPlaneEC;\n\
+in float v_halfWidth;\n\
+in vec3 v_volumeUpEC;\n\
 \n\
 uniform vec4 u_highlightColor;\n\
 void main()\n\
 {\n\
-    float logDepthOrDepth = czm_branchFreeTernary(czm_sceneMode == czm_sceneMode2D, gl_FragCoord.z, czm_unpackDepth(texture2D(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw)));\n\
+    float logDepthOrDepth = czm_branchFreeTernary(czm_sceneMode == czm_sceneMode2D, gl_FragCoord.z, czm_unpackDepth(texture(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw)));\n\
 \n\
     // Discard for sky\n\
     if (logDepthOrDepth == 0.0) {\n\
 #ifdef DEBUG_SHOW_VOLUME\n\
-        gl_FragColor = vec4(0.0, 0.0, 1.0, 0.5);\n\
+        out_FragColor = vec4(0.0, 0.0, 1.0, 0.5);\n\
         return;\n\
 #else // DEBUG_SHOW_VOLUME\n\
         discard;\n\
@@ -41,13 +37,13 @@ void main()\n\
 \n\
     if (abs(widthwiseDistance) > halfMaxWidth || distanceFromStart < 0.0 || distanceFromEnd < 0.0) {\n\
 #ifdef DEBUG_SHOW_VOLUME\n\
-        gl_FragColor = vec4(logDepthOrDepth, 0.0, 0.0, 0.5);\n\
+        out_FragColor = vec4(logDepthOrDepth, 0.0, 0.0, 0.5);\n\
         return;\n\
 #else // DEBUG_SHOW_VOLUME\n\
         discard;\n\
 #endif // DEBUG_SHOW_VOLUME\n\
     }\n\
-    gl_FragColor = u_highlightColor;\n\
+    out_FragColor = u_highlightColor;\n\
 \n\
     czm_writeDepthClamp();\n\
 }\n\