@cesium/engine 1.0.0 → 2.0.0

package/Source/Shaders/PostProcessStages/BrightPass.js

@@ -5,7 +5,7 @@ uniform float avgLuminance;\n\
 uniform float threshold;\n\
 uniform float offset;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 float key(float avg)\n\
 {\n\
@@ -18,7 +18,7 @@ float key(float avg)\n\
 \n\
 void main()\n\
 {\n\
-    vec4 color = texture2D(colorTexture, v_textureCoordinates);\n\
+    vec4 color = texture(colorTexture, v_textureCoordinates);\n\
     vec3 xyz = czm_RGBToXYZ(color.rgb);\n\
     float luminance = xyz.r;\n\
 \n\
@@ -27,6 +27,6 @@ void main()\n\
     float brightness = brightLum / (offset + brightLum);\n\
 \n\
     xyz.r = brightness;\n\
-    gl_FragColor = vec4(czm_XYZToRGB(xyz), 1.0);\n\
+    out_FragColor = vec4(czm_XYZToRGB(xyz), 1.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/Brightness.glsl

@@ -1,11 +1,11 @@
 uniform sampler2D colorTexture;
 uniform float brightness;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main(void)
 {
-    vec3 rgb = texture2D(colorTexture, v_textureCoordinates).rgb;
+    vec3 rgb = texture(colorTexture, v_textureCoordinates).rgb;
     vec3 target = vec3(0.0);
-    gl_FragColor = vec4(mix(target, rgb, brightness), 1.0);
+    out_FragColor = vec4(mix(target, rgb, brightness), 1.0);
 }

package/Source/Shaders/PostProcessStages/Brightness.js

@@ -2,12 +2,12 @@
 export default "uniform sampler2D colorTexture;\n\
 uniform float brightness;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main(void)\n\
 {\n\
-    vec3 rgb = texture2D(colorTexture, v_textureCoordinates).rgb;\n\
+    vec3 rgb = texture(colorTexture, v_textureCoordinates).rgb;\n\
     vec3 target = vec3(0.0);\n\
-    gl_FragColor = vec4(mix(target, rgb, brightness), 1.0);\n\
+    out_FragColor = vec4(mix(target, rgb, brightness), 1.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/CompositeTranslucentClassification.glsl

@@ -4,18 +4,18 @@ uniform sampler2D colorTexture;
 uniform sampler2D u_packedTranslucentDepth;
 #endif
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
 #ifdef DEBUG_SHOW_DEPTH
     if (v_textureCoordinates.x < 0.5)
     {
-        gl_FragColor.rgb = vec3(czm_unpackDepth(texture2D(u_packedTranslucentDepth, v_textureCoordinates)));
-        gl_FragColor.a = 1.0;
+        out_FragColor.rgb = vec3(czm_unpackDepth(texture(u_packedTranslucentDepth, v_textureCoordinates)));
+        out_FragColor.a = 1.0;
     }
 #else
-    vec4 color = texture2D(colorTexture, v_textureCoordinates);
+    vec4 color = texture(colorTexture, v_textureCoordinates);
 
 #ifdef PICK
     if (color == vec4(0.0))
@@ -26,6 +26,6 @@ void main()
     // Reverse premultiplication process to get the correct composited result of the classification primitives
     color.rgb /= color.a;
 #endif
-    gl_FragColor = color;
+    out_FragColor = color;
 #endif
 }

package/Source/Shaders/PostProcessStages/CompositeTranslucentClassification.js

@@ -5,18 +5,18 @@ export default "uniform sampler2D colorTexture;\n\
 uniform sampler2D u_packedTranslucentDepth;\n\
 #endif\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
 #ifdef DEBUG_SHOW_DEPTH\n\
     if (v_textureCoordinates.x < 0.5)\n\
     {\n\
-        gl_FragColor.rgb = vec3(czm_unpackDepth(texture2D(u_packedTranslucentDepth, v_textureCoordinates)));\n\
-        gl_FragColor.a = 1.0;\n\
+        out_FragColor.rgb = vec3(czm_unpackDepth(texture(u_packedTranslucentDepth, v_textureCoordinates)));\n\
+        out_FragColor.a = 1.0;\n\
     }\n\
 #else\n\
-    vec4 color = texture2D(colorTexture, v_textureCoordinates);\n\
+    vec4 color = texture(colorTexture, v_textureCoordinates);\n\
 \n\
 #ifdef PICK\n\
     if (color == vec4(0.0))\n\
@@ -27,7 +27,7 @@ void main()\n\
     // Reverse premultiplication process to get the correct composited result of the classification primitives\n\
     color.rgb /= color.a;\n\
 #endif\n\
-    gl_FragColor = color;\n\
+    out_FragColor = color;\n\
 #endif\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/ContrastBias.glsl

@@ -2,16 +2,16 @@ uniform sampler2D colorTexture;
 uniform float contrast;
 uniform float brightness;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main(void)
 {
-    vec3 sceneColor = texture2D(colorTexture, v_textureCoordinates).xyz;
+    vec3 sceneColor = texture(colorTexture, v_textureCoordinates).xyz;
     sceneColor = czm_RGBToHSB(sceneColor);
     sceneColor.z += brightness;
     sceneColor = czm_HSBToRGB(sceneColor);
 
     float factor = (259.0 * (contrast + 255.0)) / (255.0 * (259.0 - contrast));
     sceneColor = factor * (sceneColor - vec3(0.5)) + vec3(0.5);
-    gl_FragColor = vec4(sceneColor, 1.0);
+    out_FragColor = vec4(sceneColor, 1.0);
 }

package/Source/Shaders/PostProcessStages/ContrastBias.js

@@ -3,17 +3,17 @@ export default "uniform sampler2D colorTexture;\n\
 uniform float contrast;\n\
 uniform float brightness;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main(void)\n\
 {\n\
-    vec3 sceneColor = texture2D(colorTexture, v_textureCoordinates).xyz;\n\
+    vec3 sceneColor = texture(colorTexture, v_textureCoordinates).xyz;\n\
     sceneColor = czm_RGBToHSB(sceneColor);\n\
     sceneColor.z += brightness;\n\
     sceneColor = czm_HSBToRGB(sceneColor);\n\
 \n\
     float factor = (259.0 * (contrast + 255.0)) / (255.0 * (259.0 - contrast));\n\
     sceneColor = factor * (sceneColor - vec3(0.5)) + vec3(0.5);\n\
-    gl_FragColor = vec4(sceneColor, 1.0);\n\
+    out_FragColor = vec4(sceneColor, 1.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/DepthOfField.glsl

@@ -3,7 +3,7 @@ uniform sampler2D blurTexture;
 uniform sampler2D depthTexture;
 uniform float focalDistance;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 vec4 toEye(vec2 uv, float depth)
 {
@@ -35,5 +35,5 @@ void main(void)
     float depth = czm_readDepth(depthTexture, v_textureCoordinates);
     vec4 posInCamera = toEye(v_textureCoordinates, depth);
     float d = computeDepthBlur(-posInCamera.z);
-    gl_FragColor = mix(texture2D(colorTexture, v_textureCoordinates), texture2D(blurTexture, v_textureCoordinates), d);
+    out_FragColor = mix(texture(colorTexture, v_textureCoordinates), texture(blurTexture, v_textureCoordinates), d);
 }

package/Source/Shaders/PostProcessStages/DepthOfField.js

@@ -4,7 +4,7 @@ uniform sampler2D blurTexture;\n\
 uniform sampler2D depthTexture;\n\
 uniform float focalDistance;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 vec4 toEye(vec2 uv, float depth)\n\
 {\n\
@@ -36,6 +36,6 @@ void main(void)\n\
     float depth = czm_readDepth(depthTexture, v_textureCoordinates);\n\
     vec4 posInCamera = toEye(v_textureCoordinates, depth);\n\
     float d = computeDepthBlur(-posInCamera.z);\n\
-    gl_FragColor = mix(texture2D(colorTexture, v_textureCoordinates), texture2D(blurTexture, v_textureCoordinates), d);\n\
+    out_FragColor = mix(texture(colorTexture, v_textureCoordinates), texture(blurTexture, v_textureCoordinates), d);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/DepthView.glsl

@@ -1,9 +1,9 @@
 uniform sampler2D depthTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main(void)
 {
     float depth = czm_readDepth(depthTexture, v_textureCoordinates);
-    gl_FragColor = vec4(vec3(depth), 1.0);
+    out_FragColor = vec4(vec3(depth), 1.0);
 }

package/Source/Shaders/PostProcessStages/DepthView.js

@@ -1,11 +1,11 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform sampler2D depthTexture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main(void)\n\
 {\n\
     float depth = czm_readDepth(depthTexture, v_textureCoordinates);\n\
-    gl_FragColor = vec4(vec3(depth), 1.0);\n\
+    out_FragColor = vec4(vec3(depth), 1.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/DepthViewPacked.glsl

@@ -1,14 +1,14 @@
 uniform sampler2D u_depthTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    float z_window = czm_unpackDepth(texture2D(u_depthTexture, v_textureCoordinates));
+    float z_window = czm_unpackDepth(texture(u_depthTexture, v_textureCoordinates));
     z_window = czm_reverseLogDepth(z_window);
     float n_range = czm_depthRange.near;
     float f_range = czm_depthRange.far;
     float z_ndc = (2.0 * z_window - n_range - f_range) / (f_range - n_range);
     float scale = pow(z_ndc * 0.5 + 0.5, 8.0);
-    gl_FragColor = vec4(mix(vec3(0.0), vec3(1.0), scale), 1.0);
+    out_FragColor = vec4(mix(vec3(0.0), vec3(1.0), scale), 1.0);
 }

package/Source/Shaders/PostProcessStages/DepthViewPacked.js

@@ -1,16 +1,16 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform sampler2D u_depthTexture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    float z_window = czm_unpackDepth(texture2D(u_depthTexture, v_textureCoordinates));\n\
+    float z_window = czm_unpackDepth(texture(u_depthTexture, v_textureCoordinates));\n\
     z_window = czm_reverseLogDepth(z_window);\n\
     float n_range = czm_depthRange.near;\n\
     float f_range = czm_depthRange.far;\n\
     float z_ndc = (2.0 * z_window - n_range - f_range) / (f_range - n_range);\n\
     float scale = pow(z_ndc * 0.5 + 0.5, 8.0);\n\
-    gl_FragColor = vec4(mix(vec3(0.0), vec3(1.0), scale), 1.0);\n\
+    out_FragColor = vec4(mix(vec3(0.0), vec3(1.0), scale), 1.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/EdgeDetection.glsl

@@ -2,7 +2,7 @@ uniform sampler2D depthTexture;
 uniform float length;
 uniform vec4 color;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main(void)
 {
@@ -35,7 +35,7 @@ void main(void)
     }
     if (!selected)
     {
-        gl_FragColor = vec4(color.rgb, 0.0);
+        out_FragColor = vec4(color.rgb, 0.0);
         return;
     }
 #endif
@@ -48,13 +48,13 @@ void main(void)
         float dir = directions[i];
         float scale = scalars[i];
 
-        horizEdge -= texture2D(depthTexture, v_textureCoordinates + vec2(-padx, dir * pady)).x * scale;
-        horizEdge += texture2D(depthTexture, v_textureCoordinates + vec2(padx, dir * pady)).x * scale;
+        horizEdge -= texture(depthTexture, v_textureCoordinates + vec2(-padx, dir * pady)).x * scale;
+        horizEdge += texture(depthTexture, v_textureCoordinates + vec2(padx, dir * pady)).x * scale;
 
-        vertEdge -= texture2D(depthTexture, v_textureCoordinates + vec2(dir * padx, -pady)).x * scale;
-        vertEdge += texture2D(depthTexture, v_textureCoordinates + vec2(dir * padx, pady)).x * scale;
+        vertEdge -= texture(depthTexture, v_textureCoordinates + vec2(dir * padx, -pady)).x * scale;
+        vertEdge += texture(depthTexture, v_textureCoordinates + vec2(dir * padx, pady)).x * scale;
     }
 
     float len = sqrt(horizEdge * horizEdge + vertEdge * vertEdge);
-    gl_FragColor = vec4(color.rgb, len > length ? color.a : 0.0);
+    out_FragColor = vec4(color.rgb, len > length ? color.a : 0.0);
 }

package/Source/Shaders/PostProcessStages/EdgeDetection.js

@@ -3,7 +3,7 @@ export default "uniform sampler2D depthTexture;\n\
 uniform float length;\n\
 uniform vec4 color;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main(void)\n\
 {\n\
@@ -36,7 +36,7 @@ void main(void)\n\
     }\n\
     if (!selected)\n\
     {\n\
-        gl_FragColor = vec4(color.rgb, 0.0);\n\
+        out_FragColor = vec4(color.rgb, 0.0);\n\
         return;\n\
     }\n\
 #endif\n\
@@ -49,14 +49,14 @@ void main(void)\n\
         float dir = directions[i];\n\
         float scale = scalars[i];\n\
 \n\
-        horizEdge -= texture2D(depthTexture, v_textureCoordinates + vec2(-padx, dir * pady)).x * scale;\n\
-        horizEdge += texture2D(depthTexture, v_textureCoordinates + vec2(padx, dir * pady)).x * scale;\n\
+        horizEdge -= texture(depthTexture, v_textureCoordinates + vec2(-padx, dir * pady)).x * scale;\n\
+        horizEdge += texture(depthTexture, v_textureCoordinates + vec2(padx, dir * pady)).x * scale;\n\
 \n\
-        vertEdge -= texture2D(depthTexture, v_textureCoordinates + vec2(dir * padx, -pady)).x * scale;\n\
-        vertEdge += texture2D(depthTexture, v_textureCoordinates + vec2(dir * padx, pady)).x * scale;\n\
+        vertEdge -= texture(depthTexture, v_textureCoordinates + vec2(dir * padx, -pady)).x * scale;\n\
+        vertEdge += texture(depthTexture, v_textureCoordinates + vec2(dir * padx, pady)).x * scale;\n\
     }\n\
 \n\
     float len = sqrt(horizEdge * horizEdge + vertEdge * vertEdge);\n\
-    gl_FragColor = vec4(color.rgb, len > length ? color.a : 0.0);\n\
+    out_FragColor = vec4(color.rgb, len > length ? color.a : 0.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/FXAA.glsl

@@ -1,4 +1,4 @@
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 uniform sampler2D colorTexture;
 
@@ -16,6 +16,6 @@ void main()
         fxaaQualitySubpix,
         fxaaQualityEdgeThreshold,
         fxaaQualityEdgeThresholdMin);
-    float alpha = texture2D(colorTexture, v_textureCoordinates).a;
-    gl_FragColor = vec4(color.rgb, alpha);
+    float alpha = texture(colorTexture, v_textureCoordinates).a;
+    out_FragColor = vec4(color.rgb, alpha);
 }

package/Source/Shaders/PostProcessStages/FXAA.js

@@ -1,5 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec2 v_textureCoordinates;\n\
+export default "in vec2 v_textureCoordinates;\n\
 \n\
 uniform sampler2D colorTexture;\n\
 \n\
@@ -17,7 +17,7 @@ void main()\n\
         fxaaQualitySubpix,\n\
         fxaaQualityEdgeThreshold,\n\
         fxaaQualityEdgeThresholdMin);\n\
-    float alpha = texture2D(colorTexture, v_textureCoordinates).a;\n\
-    gl_FragColor = vec4(color.rgb, alpha);\n\
+    float alpha = texture(colorTexture, v_textureCoordinates).a;\n\
+    out_FragColor = vec4(color.rgb, alpha);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/FilmicTonemapping.glsl

@@ -1,6 +1,6 @@
 uniform sampler2D colorTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 #ifdef AUTO_EXPOSURE
 uniform sampler2D autoExposure;
@@ -11,11 +11,11 @@ uniform sampler2D autoExposure;
 
 void main()
 {
-    vec4 fragmentColor = texture2D(colorTexture, v_textureCoordinates);
+    vec4 fragmentColor = texture(colorTexture, v_textureCoordinates);
     vec3 color = fragmentColor.rgb;
 
 #ifdef AUTO_EXPOSURE
-    float exposure = texture2D(autoExposure, vec2(0.5)).r;
+    float exposure = texture(autoExposure, vec2(0.5)).r;
     color /= exposure;
 #endif
 
@@ -32,5 +32,5 @@ void main()
 	float w = ((white * (A * white + C * B) + D * E) / (white * ( A * white + B) + D * F)) - E / F;
 
 	c = czm_inverseGamma(c / w);
-	gl_FragColor = vec4(c, fragmentColor.a);
+	out_FragColor = vec4(c, fragmentColor.a);
 }

package/Source/Shaders/PostProcessStages/FilmicTonemapping.js

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform sampler2D colorTexture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 #ifdef AUTO_EXPOSURE\n\
 uniform sampler2D autoExposure;\n\
@@ -12,11 +12,11 @@ uniform sampler2D autoExposure;\n\
 \n\
 void main()\n\
 {\n\
-    vec4 fragmentColor = texture2D(colorTexture, v_textureCoordinates);\n\
+    vec4 fragmentColor = texture(colorTexture, v_textureCoordinates);\n\
     vec3 color = fragmentColor.rgb;\n\
 \n\
 #ifdef AUTO_EXPOSURE\n\
-    float exposure = texture2D(autoExposure, vec2(0.5)).r;\n\
+    float exposure = texture(autoExposure, vec2(0.5)).r;\n\
     color /= exposure;\n\
 #endif\n\
 \n\
@@ -33,6 +33,6 @@ void main()\n\
 	float w = ((white * (A * white + C * B) + D * E) / (white * ( A * white + B) + D * F)) - E / F;\n\
 \n\
 	c = czm_inverseGamma(c / w);\n\
-	gl_FragColor = vec4(c, fragmentColor.a);\n\
+	out_FragColor = vec4(c, fragmentColor.a);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/GaussianBlur1D.glsl

@@ -12,7 +12,7 @@ uniform float stepSize;
 uniform vec2 step;
 #endif
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 //  Incremental Computation of the Gaussian:
 //  https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch40.html
@@ -33,15 +33,15 @@ void main()
     g.y = exp((-0.5 * delta * delta) / (sigma * sigma));
     g.z = g.y * g.y;
 
-    vec4 result = texture2D(colorTexture, st) * g.x;
+    vec4 result = texture(colorTexture, st) * g.x;
     for (int i = 1; i < SAMPLES; ++i)
     {
         g.xy *= g.yz;
 
         vec2 offset = float(i) * dir * step;
-        result += texture2D(colorTexture, st - offset) * g.x;
-        result += texture2D(colorTexture, st + offset) * g.x;
+        result += texture(colorTexture, st - offset) * g.x;
+        result += texture(colorTexture, st + offset) * g.x;
     }
 
-    gl_FragColor = result;
+    out_FragColor = result;
 }

package/Source/Shaders/PostProcessStages/GaussianBlur1D.js

@@ -13,7 +13,7 @@ uniform float stepSize;\n\
 uniform vec2 step;\n\
 #endif\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 //  Incremental Computation of the Gaussian:\n\
 //  https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch40.html\n\
@@ -34,16 +34,16 @@ void main()\n\
     g.y = exp((-0.5 * delta * delta) / (sigma * sigma));\n\
     g.z = g.y * g.y;\n\
 \n\
-    vec4 result = texture2D(colorTexture, st) * g.x;\n\
+    vec4 result = texture(colorTexture, st) * g.x;\n\
     for (int i = 1; i < SAMPLES; ++i)\n\
     {\n\
         g.xy *= g.yz;\n\
 \n\
         vec2 offset = float(i) * dir * step;\n\
-        result += texture2D(colorTexture, st - offset) * g.x;\n\
-        result += texture2D(colorTexture, st + offset) * g.x;\n\
+        result += texture(colorTexture, st - offset) * g.x;\n\
+        result += texture(colorTexture, st + offset) * g.x;\n\
     }\n\
 \n\
-    gl_FragColor = result;\n\
+    out_FragColor = result;\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/LensFlare.glsl

@@ -9,7 +9,7 @@ uniform float dirtAmount;
 uniform float earthRadius;
 uniform float intensity;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 // whether it is in space or not
 // 6500000.0 is empirical value
@@ -46,22 +46,22 @@ vec4 textureDistorted(sampler2D tex, vec2 texcoord, vec2 direction, vec3 distort
     vec3 color;
     if(isSpace)
     {
-        color.r = isInEarth(texcoord + direction * distortion.r, sceneSize) * texture2D(tex, texcoord + direction * distortion.r).r;
-        color.g = isInEarth(texcoord + direction * distortion.g, sceneSize) * texture2D(tex, texcoord + direction * distortion.g).g;
-        color.b = isInEarth(texcoord + direction * distortion.b, sceneSize) * texture2D(tex, texcoord + direction * distortion.b).b;
+        color.r = isInEarth(texcoord + direction * distortion.r, sceneSize) * texture(tex, texcoord + direction * distortion.r).r;
+        color.g = isInEarth(texcoord + direction * distortion.g, sceneSize) * texture(tex, texcoord + direction * distortion.g).g;
+        color.b = isInEarth(texcoord + direction * distortion.b, sceneSize) * texture(tex, texcoord + direction * distortion.b).b;
     }
     else
     {
-        color.r = texture2D(tex, texcoord + direction * distortion.r).r;
-        color.g = texture2D(tex, texcoord + direction * distortion.g).g;
-        color.b = texture2D(tex, texcoord + direction * distortion.b).b;
+        color.r = texture(tex, texcoord + direction * distortion.r).r;
+        color.g = texture(tex, texcoord + direction * distortion.g).g;
+        color.b = texture(tex, texcoord + direction * distortion.b).b;
     }
     return vec4(clamp(color, 0.0, 1.0), 0.0);
 }
 
 void main(void)
 {
-    vec4 originalColor = texture2D(colorTexture, v_textureCoordinates);
+    vec4 originalColor = texture(colorTexture, v_textureCoordinates);
     vec3 rgb = originalColor.rgb;
     bool isSpace = length(czm_viewerPositionWC.xyz) > DISTANCE_TO_SPACE;
 
@@ -76,7 +76,7 @@ void main(void)
     {
         // Lens flare is disabled when not in space until #5932 is fixed.
         //    https://github.com/CesiumGS/cesium/issues/5932
-        gl_FragColor = originalColor;
+        out_FragColor = originalColor;
         return;
     }
 
@@ -117,7 +117,7 @@ void main(void)
     {
         dirtTexCoords.y = mod(floor(dirtTexCoords.y), 2.0) == 1.0 ? 1.0 - fract(dirtTexCoords.y) :  fract(dirtTexCoords.y);
     }
-    result += dirtAmount * texture2D(dirtTexture, dirtTexCoords);
+    result += dirtAmount * texture(dirtTexture, dirtTexCoords);
 
     // Rotating starburst texture's coordinate
     // dot(czm_view[0].xyz, vec3(0.0, 0.0, 1.0)) + dot(czm_view[1].xyz, vec3(0.0, 1.0, 0.0))
@@ -144,10 +144,10 @@ void main(void)
     else
     {
         result *= oneMinusWeightForLensFlare * intensity;
-        result *= texture2D(starTexture, lensStarTexcoord) * pow(weightForLensFlare, 1.0) * max((1.0 - length(vec3(st1.xy, 0.0))), 0.0) * 2.0;
+        result *= texture(starTexture, lensStarTexcoord) * pow(weightForLensFlare, 1.0) * max((1.0 - length(vec3(st1.xy, 0.0))), 0.0) * 2.0;
     }
 
-    result += texture2D(colorTexture, v_textureCoordinates);
+    result += texture(colorTexture, v_textureCoordinates);
 
-    gl_FragColor = result;
+    out_FragColor = result;
 }

package/Source/Shaders/PostProcessStages/LensFlare.js

@@ -10,7 +10,7 @@ uniform float dirtAmount;\n\
 uniform float earthRadius;\n\
 uniform float intensity;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 // whether it is in space or not\n\
 // 6500000.0 is empirical value\n\
@@ -47,22 +47,22 @@ vec4 textureDistorted(sampler2D tex, vec2 texcoord, vec2 direction, vec3 distort
     vec3 color;\n\
     if(isSpace)\n\
     {\n\
-        color.r = isInEarth(texcoord + direction * distortion.r, sceneSize) * texture2D(tex, texcoord + direction * distortion.r).r;\n\
-        color.g = isInEarth(texcoord + direction * distortion.g, sceneSize) * texture2D(tex, texcoord + direction * distortion.g).g;\n\
-        color.b = isInEarth(texcoord + direction * distortion.b, sceneSize) * texture2D(tex, texcoord + direction * distortion.b).b;\n\
+        color.r = isInEarth(texcoord + direction * distortion.r, sceneSize) * texture(tex, texcoord + direction * distortion.r).r;\n\
+        color.g = isInEarth(texcoord + direction * distortion.g, sceneSize) * texture(tex, texcoord + direction * distortion.g).g;\n\
+        color.b = isInEarth(texcoord + direction * distortion.b, sceneSize) * texture(tex, texcoord + direction * distortion.b).b;\n\
     }\n\
     else\n\
     {\n\
-        color.r = texture2D(tex, texcoord + direction * distortion.r).r;\n\
-        color.g = texture2D(tex, texcoord + direction * distortion.g).g;\n\
-        color.b = texture2D(tex, texcoord + direction * distortion.b).b;\n\
+        color.r = texture(tex, texcoord + direction * distortion.r).r;\n\
+        color.g = texture(tex, texcoord + direction * distortion.g).g;\n\
+        color.b = texture(tex, texcoord + direction * distortion.b).b;\n\
     }\n\
     return vec4(clamp(color, 0.0, 1.0), 0.0);\n\
 }\n\
 \n\
 void main(void)\n\
 {\n\
-    vec4 originalColor = texture2D(colorTexture, v_textureCoordinates);\n\
+    vec4 originalColor = texture(colorTexture, v_textureCoordinates);\n\
     vec3 rgb = originalColor.rgb;\n\
     bool isSpace = length(czm_viewerPositionWC.xyz) > DISTANCE_TO_SPACE;\n\
 \n\
@@ -77,7 +77,7 @@ void main(void)\n\
     {\n\
         // Lens flare is disabled when not in space until #5932 is fixed.\n\
         //    https://github.com/CesiumGS/cesium/issues/5932\n\
-        gl_FragColor = originalColor;\n\
+        out_FragColor = originalColor;\n\
         return;\n\
     }\n\
 \n\
@@ -118,7 +118,7 @@ void main(void)\n\
     {\n\
         dirtTexCoords.y = mod(floor(dirtTexCoords.y), 2.0) == 1.0 ? 1.0 - fract(dirtTexCoords.y) :  fract(dirtTexCoords.y);\n\
     }\n\
-    result += dirtAmount * texture2D(dirtTexture, dirtTexCoords);\n\
+    result += dirtAmount * texture(dirtTexture, dirtTexCoords);\n\
 \n\
     // Rotating starburst texture's coordinate\n\
     // dot(czm_view[0].xyz, vec3(0.0, 0.0, 1.0)) + dot(czm_view[1].xyz, vec3(0.0, 1.0, 0.0))\n\
@@ -145,11 +145,11 @@ void main(void)\n\
     else\n\
     {\n\
         result *= oneMinusWeightForLensFlare * intensity;\n\
-        result *= texture2D(starTexture, lensStarTexcoord) * pow(weightForLensFlare, 1.0) * max((1.0 - length(vec3(st1.xy, 0.0))), 0.0) * 2.0;\n\
+        result *= texture(starTexture, lensStarTexcoord) * pow(weightForLensFlare, 1.0) * max((1.0 - length(vec3(st1.xy, 0.0))), 0.0) * 2.0;\n\
     }\n\
 \n\
-    result += texture2D(colorTexture, v_textureCoordinates);\n\
+    result += texture(colorTexture, v_textureCoordinates);\n\
 \n\
-    gl_FragColor = result;\n\
+    out_FragColor = result;\n\
 }\n\
 ";