@cesium/engine 1.1.0 → 2.0.0

package/Source/Shaders/PostProcessStages/AcesTonemappingStage.glsl

@@ -1,6 +1,6 @@
 uniform sampler2D colorTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 #ifdef AUTO_EXPOSURE
 uniform sampler2D autoExposure;
@@ -8,14 +8,14 @@ uniform sampler2D autoExposure;
 
 void main()
 {
-    vec4 fragmentColor = texture2D(colorTexture, v_textureCoordinates);
+    vec4 fragmentColor = texture(colorTexture, v_textureCoordinates);
     vec3 color = fragmentColor.rgb;
 
 #ifdef AUTO_EXPOSURE
-    color /= texture2D(autoExposure, vec2(0.5)).r;
+    color /= texture(autoExposure, vec2(0.5)).r;
 #endif
     color = czm_acesTonemapping(color);
     color = czm_inverseGamma(color);
 
-    gl_FragColor = vec4(color, fragmentColor.a);
+    out_FragColor = vec4(color, fragmentColor.a);
 }

package/Source/Shaders/PostProcessStages/AcesTonemappingStage.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\
@@ -9,15 +9,15 @@ 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\
-    color /= texture2D(autoExposure, vec2(0.5)).r;\n\
+    color /= texture(autoExposure, vec2(0.5)).r;\n\
 #endif\n\
     color = czm_acesTonemapping(color);\n\
     color = czm_inverseGamma(color);\n\
 \n\
-    gl_FragColor = vec4(color, fragmentColor.a);\n\
+    out_FragColor = vec4(color, fragmentColor.a);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/AdditiveBlend.glsl

@@ -4,14 +4,14 @@ uniform sampler2D colorTexture2;
 uniform vec2 center;
 uniform float radius;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    vec4 color0 = texture2D(colorTexture, v_textureCoordinates);
-    vec4 color1 = texture2D(colorTexture2, v_textureCoordinates);
+    vec4 color0 = texture(colorTexture, v_textureCoordinates);
+    vec4 color1 = texture(colorTexture2, v_textureCoordinates);
 
     float x = length(gl_FragCoord.xy - center) / radius;
     float t = smoothstep(0.5, 0.8, x);
-    gl_FragColor = mix(color0 + color1, color1, t);
+    out_FragColor = mix(color0 + color1, color1, t);
 }

package/Source/Shaders/PostProcessStages/AdditiveBlend.js

@@ -5,15 +5,15 @@ uniform sampler2D colorTexture2;\n\
 uniform vec2 center;\n\
 uniform float radius;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    vec4 color0 = texture2D(colorTexture, v_textureCoordinates);\n\
-    vec4 color1 = texture2D(colorTexture2, v_textureCoordinates);\n\
+    vec4 color0 = texture(colorTexture, v_textureCoordinates);\n\
+    vec4 color1 = texture(colorTexture2, v_textureCoordinates);\n\
 \n\
     float x = length(gl_FragCoord.xy - center) / radius;\n\
     float t = smoothstep(0.5, 0.8, x);\n\
-    gl_FragColor = mix(color0 + color1, color1, t);\n\
+    out_FragColor = mix(color0 + color1, color1, t);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/AmbientOcclusionGenerate.glsl

@@ -6,7 +6,7 @@ uniform float lengthCap;
 uniform float stepSize;
 uniform float frustumLength;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 vec4 clipToEye(vec2 uv, float depth)
 {
@@ -42,7 +42,7 @@ void main(void)
 
     if (posInCamera.z > frustumLength)
     {
-        gl_FragColor = vec4(1.0);
+        out_FragColor = vec4(1.0);
         return;
     }
 
@@ -58,7 +58,7 @@ void main(void)
     float gapAngle = 90.0 * czm_radiansPerDegree;
 
     // RandomNoise
-    float randomVal = texture2D(randomTexture, v_textureCoordinates).x;
+    float randomVal = texture(randomTexture, v_textureCoordinates).x;
 
     //Loop for each direction
     for (int i = 0; i < 4; i++)
@@ -111,5 +111,5 @@ void main(void)
     ao /= 4.0;
     ao = 1.0 - clamp(ao, 0.0, 1.0);
     ao = pow(ao, intensity);
-    gl_FragColor = vec4(vec3(ao), 1.0);
+    out_FragColor = vec4(vec3(ao), 1.0);
 }

package/Source/Shaders/PostProcessStages/AmbientOcclusionGenerate.js

@@ -7,7 +7,7 @@ uniform float lengthCap;\n\
 uniform float stepSize;\n\
 uniform float frustumLength;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 vec4 clipToEye(vec2 uv, float depth)\n\
 {\n\
@@ -43,7 +43,7 @@ void main(void)\n\
 \n\
     if (posInCamera.z > frustumLength)\n\
     {\n\
-        gl_FragColor = vec4(1.0);\n\
+        out_FragColor = vec4(1.0);\n\
         return;\n\
     }\n\
 \n\
@@ -59,7 +59,7 @@ void main(void)\n\
     float gapAngle = 90.0 * czm_radiansPerDegree;\n\
 \n\
     // RandomNoise\n\
-    float randomVal = texture2D(randomTexture, v_textureCoordinates).x;\n\
+    float randomVal = texture(randomTexture, v_textureCoordinates).x;\n\
 \n\
     //Loop for each direction\n\
     for (int i = 0; i < 4; i++)\n\
@@ -112,6 +112,6 @@ void main(void)\n\
     ao /= 4.0;\n\
     ao = 1.0 - clamp(ao, 0.0, 1.0);\n\
     ao = pow(ao, intensity);\n\
-    gl_FragColor = vec4(vec3(ao), 1.0);\n\
+    out_FragColor = vec4(vec3(ao), 1.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/AmbientOcclusionModulate.glsl

@@ -1,11 +1,11 @@
 uniform sampler2D colorTexture;
 uniform sampler2D ambientOcclusionTexture;
 uniform bool ambientOcclusionOnly;
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main(void)
 {
-    vec3 color = texture2D(colorTexture, v_textureCoordinates).rgb;
-    vec3 ao = texture2D(ambientOcclusionTexture, v_textureCoordinates).rgb;
-    gl_FragColor.rgb = ambientOcclusionOnly ? ao : ao * color;
+    vec3 color = texture(colorTexture, v_textureCoordinates).rgb;
+    vec3 ao = texture(ambientOcclusionTexture, v_textureCoordinates).rgb;
+    out_FragColor.rgb = ambientOcclusionOnly ? ao : ao * color;
 }

package/Source/Shaders/PostProcessStages/AmbientOcclusionModulate.js

@@ -2,12 +2,12 @@
 export default "uniform sampler2D colorTexture;\n\
 uniform sampler2D ambientOcclusionTexture;\n\
 uniform bool ambientOcclusionOnly;\n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main(void)\n\
 {\n\
-    vec3 color = texture2D(colorTexture, v_textureCoordinates).rgb;\n\
-    vec3 ao = texture2D(ambientOcclusionTexture, v_textureCoordinates).rgb;\n\
-    gl_FragColor.rgb = ambientOcclusionOnly ? ao : ao * color;\n\
+    vec3 color = texture(colorTexture, v_textureCoordinates).rgb;\n\
+    vec3 ao = texture(ambientOcclusionTexture, v_textureCoordinates).rgb;\n\
+    out_FragColor.rgb = ambientOcclusionOnly ? ao : ao * color;\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/BlackAndWhite.glsl

@@ -1,19 +1,19 @@
 uniform sampler2D colorTexture;
 uniform float gradations;
 
-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;
 #ifdef CZM_SELECTED_FEATURE
     if (czm_selected()) {
-        gl_FragColor = vec4(rgb, 1.0);
+        out_FragColor = vec4(rgb, 1.0);
         return;
     }
 #endif
     float luminance = czm_luminance(rgb);
     float darkness = luminance * gradations;
     darkness = (darkness - fract(darkness)) / gradations;
-    gl_FragColor = vec4(vec3(darkness), 1.0);
+    out_FragColor = vec4(vec3(darkness), 1.0);
 }

package/Source/Shaders/PostProcessStages/BlackAndWhite.js

@@ -2,20 +2,20 @@
 export default "uniform sampler2D colorTexture;\n\
 uniform float gradations;\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\
 #ifdef CZM_SELECTED_FEATURE\n\
     if (czm_selected()) {\n\
-        gl_FragColor = vec4(rgb, 1.0);\n\
+        out_FragColor = vec4(rgb, 1.0);\n\
         return;\n\
     }\n\
 #endif\n\
     float luminance = czm_luminance(rgb);\n\
     float darkness = luminance * gradations;\n\
     darkness = (darkness - fract(darkness)) / gradations;\n\
-    gl_FragColor = vec4(vec3(darkness), 1.0);\n\
+    out_FragColor = vec4(vec3(darkness), 1.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/BloomComposite.glsl

@@ -2,19 +2,19 @@ uniform sampler2D colorTexture;
 uniform sampler2D bloomTexture;
 uniform bool glowOnly;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main(void)
 {
-    vec4 color = texture2D(colorTexture, v_textureCoordinates);
+    vec4 color = texture(colorTexture, v_textureCoordinates);
 
 #ifdef CZM_SELECTED_FEATURE
     if (czm_selected()) {
-        gl_FragColor = color;
+        out_FragColor = color;
         return;
     }
 #endif
 
-    vec4 bloom = texture2D(bloomTexture, v_textureCoordinates);
-    gl_FragColor = glowOnly ? bloom : bloom + color;
+    vec4 bloom = texture(bloomTexture, v_textureCoordinates);
+    out_FragColor = glowOnly ? bloom : bloom + color;
 }

package/Source/Shaders/PostProcessStages/BloomComposite.js

@@ -3,20 +3,20 @@ export default "uniform sampler2D colorTexture;\n\
 uniform sampler2D bloomTexture;\n\
 uniform bool glowOnly;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main(void)\n\
 {\n\
-    vec4 color = texture2D(colorTexture, v_textureCoordinates);\n\
+    vec4 color = texture(colorTexture, v_textureCoordinates);\n\
 \n\
 #ifdef CZM_SELECTED_FEATURE\n\
     if (czm_selected()) {\n\
-        gl_FragColor = color;\n\
+        out_FragColor = color;\n\
         return;\n\
     }\n\
 #endif\n\
 \n\
-    vec4 bloom = texture2D(bloomTexture, v_textureCoordinates);\n\
-    gl_FragColor = glowOnly ? bloom : bloom + color;\n\
+    vec4 bloom = texture(bloomTexture, v_textureCoordinates);\n\
+    out_FragColor = glowOnly ? bloom : bloom + color;\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/BrightPass.glsl

@@ -4,7 +4,7 @@ uniform float avgLuminance;
 uniform float threshold;
 uniform float offset;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 float key(float avg)
 {
@@ -17,7 +17,7 @@ float key(float avg)
 
 void main()
 {
-    vec4 color = texture2D(colorTexture, v_textureCoordinates);
+    vec4 color = texture(colorTexture, v_textureCoordinates);
     vec3 xyz = czm_RGBToXYZ(color.rgb);
     float luminance = xyz.r;
 
@@ -26,5 +26,5 @@ void main()
     float brightness = brightLum / (offset + brightLum);
 
     xyz.r = brightness;
-    gl_FragColor = vec4(czm_XYZToRGB(xyz), 1.0);
+    out_FragColor = vec4(czm_XYZToRGB(xyz), 1.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);
 }