@cesium/engine 1.1.0 → 2.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\
 ";

package/Source/Shaders/PostProcessStages/ModifiedReinhardTonemapping.glsl

@@ -1,7 +1,7 @@
 uniform sampler2D colorTexture;
 uniform vec3 white;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 #ifdef AUTO_EXPOSURE
 uniform sampler2D autoExposure;
@@ -12,13 +12,13 @@ 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
     color = (color * (1.0 + color / white)) / (1.0 + color);
     color = czm_inverseGamma(color);
-    gl_FragColor = vec4(color, fragmentColor.a);
+    out_FragColor = vec4(color, fragmentColor.a);
 }

package/Source/Shaders/PostProcessStages/ModifiedReinhardTonemapping.js

@@ -2,7 +2,7 @@
 export default "uniform sampler2D colorTexture;\n\
 uniform vec3 white;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 #ifdef AUTO_EXPOSURE\n\
 uniform sampler2D autoExposure;\n\
@@ -13,14 +13,14 @@ 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\
 #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\
     color = (color * (1.0 + color / white)) / (1.0 + color);\n\
     color = czm_inverseGamma(color);\n\
-    gl_FragColor = vec4(color, fragmentColor.a);\n\
+    out_FragColor = vec4(color, fragmentColor.a);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/NightVision.glsl

@@ -1,6 +1,6 @@
 uniform sampler2D colorTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 float rand(vec2 co)
 {
@@ -10,7 +10,7 @@ float rand(vec2 co)
 void main(void)
 {
     float noiseValue = rand(v_textureCoordinates + sin(czm_frameNumber)) * 0.1;
-    vec3 rgb = texture2D(colorTexture, v_textureCoordinates).rgb;
+    vec3 rgb = texture(colorTexture, v_textureCoordinates).rgb;
     vec3 green = vec3(0.0, 1.0, 0.0);
-    gl_FragColor = vec4((noiseValue + rgb) * green, 1.0);
+    out_FragColor = vec4((noiseValue + rgb) * green, 1.0);
 }

package/Source/Shaders/PostProcessStages/NightVision.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\
 float rand(vec2 co)\n\
 {\n\
@@ -11,8 +11,8 @@ float rand(vec2 co)\n\
 void main(void)\n\
 {\n\
     float noiseValue = rand(v_textureCoordinates + sin(czm_frameNumber)) * 0.1;\n\
-    vec3 rgb = texture2D(colorTexture, v_textureCoordinates).rgb;\n\
+    vec3 rgb = texture(colorTexture, v_textureCoordinates).rgb;\n\
     vec3 green = vec3(0.0, 1.0, 0.0);\n\
-    gl_FragColor = vec4((noiseValue + rgb) * green, 1.0);\n\
+    out_FragColor = vec4((noiseValue + rgb) * green, 1.0);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/PassThrough.glsl

@@ -1,8 +1,8 @@
 uniform sampler2D colorTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    gl_FragColor = texture2D(colorTexture, v_textureCoordinates);
+    out_FragColor = texture(colorTexture, v_textureCoordinates);
 }

package/Source/Shaders/PostProcessStages/PassThrough.js

@@ -1,10 +1,10 @@
 //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\
 void main()\n\
 {\n\
-    gl_FragColor = texture2D(colorTexture, v_textureCoordinates);\n\
+    out_FragColor = texture(colorTexture, v_textureCoordinates);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/PassThroughDepth.glsl

@@ -1,8 +1,8 @@
 uniform highp sampler2D u_depthTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    gl_FragColor = czm_packDepth(texture2D(u_depthTexture, v_textureCoordinates).r);
+    out_FragColor = czm_packDepth(texture(u_depthTexture, v_textureCoordinates).r);
 }

package/Source/Shaders/PostProcessStages/PassThroughDepth.js

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

package/Source/Shaders/PostProcessStages/PointCloudEyeDomeLighting.glsl

@@ -1,9 +1,7 @@
-#extension GL_EXT_frag_depth : enable
-
 uniform sampler2D u_pointCloud_colorGBuffer;
 uniform sampler2D u_pointCloud_depthGBuffer;
 uniform vec2 u_distanceAndEdlStrength;
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 vec2 neighborContribution(float log2Depth, vec2 offset)
 {
@@ -12,8 +10,8 @@ vec2 neighborContribution(float log2Depth, vec2 offset)
     vec2 texCoord0 = v_textureCoordinates + offset * floor(dist);
     vec2 texCoord1 = v_textureCoordinates + offset * ceil(dist);
 
-    float depthOrLogDepth0 = czm_unpackDepth(texture2D(u_pointCloud_depthGBuffer, texCoord0));
-    float depthOrLogDepth1 = czm_unpackDepth(texture2D(u_pointCloud_depthGBuffer, texCoord1));
+    float depthOrLogDepth0 = czm_unpackDepth(texture(u_pointCloud_depthGBuffer, texCoord0));
+    float depthOrLogDepth1 = czm_unpackDepth(texture(u_pointCloud_depthGBuffer, texCoord1));
 
     // ignore depth values that are the clear depth
     if (depthOrLogDepth0 == 0.0 || depthOrLogDepth1 == 0.0) {
@@ -28,7 +26,7 @@ vec2 neighborContribution(float log2Depth, vec2 offset)
 
 void main()
 {
-    float depthOrLogDepth = czm_unpackDepth(texture2D(u_pointCloud_depthGBuffer, v_textureCoordinates));
+    float depthOrLogDepth = czm_unpackDepth(texture(u_pointCloud_depthGBuffer, v_textureCoordinates));
 
     vec4 eyeCoordinate = czm_windowToEyeCoordinates(gl_FragCoord.xy, depthOrLogDepth);
     eyeCoordinate /= eyeCoordinate.w;
@@ -40,7 +38,7 @@ void main()
         discard;
     }
 
-    vec4 color = texture2D(u_pointCloud_colorGBuffer, v_textureCoordinates);
+    vec4 color = texture(u_pointCloud_colorGBuffer, v_textureCoordinates);
 
     // sample from neighbors left, right, down, up
     vec2 texelSize = 1.0 / czm_viewport.zw;
@@ -56,8 +54,8 @@ void main()
     float strength = u_distanceAndEdlStrength.y;
     float shade = exp(-response * 300.0 * strength);
     color.rgb *= shade;
-    gl_FragColor = vec4(color);
+    out_FragColor = vec4(color);
 
     // Input and output depth are the same.
-    gl_FragDepthEXT = depthOrLogDepth;
+    gl_FragDepth = depthOrLogDepth;
 }

package/Source/Shaders/PostProcessStages/PointCloudEyeDomeLighting.js

@@ -1,10 +1,8 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "#extension GL_EXT_frag_depth : enable\n\
-\n\
-uniform sampler2D u_pointCloud_colorGBuffer;\n\
+export default "uniform sampler2D u_pointCloud_colorGBuffer;\n\
 uniform sampler2D u_pointCloud_depthGBuffer;\n\
 uniform vec2 u_distanceAndEdlStrength;\n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 vec2 neighborContribution(float log2Depth, vec2 offset)\n\
 {\n\
@@ -13,8 +11,8 @@ vec2 neighborContribution(float log2Depth, vec2 offset)\n\
     vec2 texCoord0 = v_textureCoordinates + offset * floor(dist);\n\
     vec2 texCoord1 = v_textureCoordinates + offset * ceil(dist);\n\
 \n\
-    float depthOrLogDepth0 = czm_unpackDepth(texture2D(u_pointCloud_depthGBuffer, texCoord0));\n\
-    float depthOrLogDepth1 = czm_unpackDepth(texture2D(u_pointCloud_depthGBuffer, texCoord1));\n\
+    float depthOrLogDepth0 = czm_unpackDepth(texture(u_pointCloud_depthGBuffer, texCoord0));\n\
+    float depthOrLogDepth1 = czm_unpackDepth(texture(u_pointCloud_depthGBuffer, texCoord1));\n\
 \n\
     // ignore depth values that are the clear depth\n\
     if (depthOrLogDepth0 == 0.0 || depthOrLogDepth1 == 0.0) {\n\
@@ -29,7 +27,7 @@ vec2 neighborContribution(float log2Depth, vec2 offset)\n\
 \n\
 void main()\n\
 {\n\
-    float depthOrLogDepth = czm_unpackDepth(texture2D(u_pointCloud_depthGBuffer, v_textureCoordinates));\n\
+    float depthOrLogDepth = czm_unpackDepth(texture(u_pointCloud_depthGBuffer, v_textureCoordinates));\n\
 \n\
     vec4 eyeCoordinate = czm_windowToEyeCoordinates(gl_FragCoord.xy, depthOrLogDepth);\n\
     eyeCoordinate /= eyeCoordinate.w;\n\
@@ -41,7 +39,7 @@ void main()\n\
         discard;\n\
     }\n\
 \n\
-    vec4 color = texture2D(u_pointCloud_colorGBuffer, v_textureCoordinates);\n\
+    vec4 color = texture(u_pointCloud_colorGBuffer, v_textureCoordinates);\n\
 \n\
     // sample from neighbors left, right, down, up\n\
     vec2 texelSize = 1.0 / czm_viewport.zw;\n\
@@ -57,9 +55,9 @@ void main()\n\
     float strength = u_distanceAndEdlStrength.y;\n\
     float shade = exp(-response * 300.0 * strength);\n\
     color.rgb *= shade;\n\
-    gl_FragColor = vec4(color);\n\
+    out_FragColor = vec4(color);\n\
 \n\
     // Input and output depth are the same.\n\
-    gl_FragDepthEXT = depthOrLogDepth;\n\
+    gl_FragDepth = depthOrLogDepth;\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/ReinhardTonemapping.glsl

@@ -1,6 +1,6 @@
 uniform sampler2D colorTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 #ifdef AUTO_EXPOSURE
 uniform sampler2D autoExposure;
@@ -11,13 +11,13 @@ 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
     color = color / (1.0 + color);
     color = czm_inverseGamma(color);
-    gl_FragColor = vec4(color, fragmentColor.a);
+    out_FragColor = vec4(color, fragmentColor.a);
 }

package/Source/Shaders/PostProcessStages/ReinhardTonemapping.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,14 +12,14 @@ 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\
 #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\
     color = color / (1.0 + color);\n\
     color = czm_inverseGamma(color);\n\
-    gl_FragColor = vec4(color, fragmentColor.a);\n\
+    out_FragColor = vec4(color, fragmentColor.a);\n\
 }\n\
 ";

package/Source/Shaders/PostProcessStages/Silhouette.glsl

@@ -1,11 +1,11 @@
 uniform sampler2D colorTexture;
 uniform sampler2D silhouetteTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main(void)
 {
-    vec4 silhouetteColor = texture2D(silhouetteTexture, v_textureCoordinates);
-    vec4 color = texture2D(colorTexture, v_textureCoordinates);
-    gl_FragColor = mix(color, silhouetteColor, silhouetteColor.a);
+    vec4 silhouetteColor = texture(silhouetteTexture, v_textureCoordinates);
+    vec4 color = texture(colorTexture, v_textureCoordinates);
+    out_FragColor = mix(color, silhouetteColor, silhouetteColor.a);
 }