@cesium/engine 1.0.0 → 2.0.0

package/Source/Shaders/Model/ModelClippingPlanesStageFS.js

@@ -11,7 +11,7 @@ vec4 getClippingPlane(\n\
     float pixelHeight = 1.0 / float(CLIPPING_PLANES_TEXTURE_HEIGHT);\n\
     float u = (float(pixX) + 0.5) * pixelWidth; // sample from center of pixel\n\
     float v = (float(pixY) + 0.5) * pixelHeight;\n\
-    vec4 plane = texture2D(packedClippingPlanes, vec2(u, v));\n\
+    vec4 plane = texture(packedClippingPlanes, vec2(u, v));\n\
     return czm_transformPlane(plane, transform);\n\
 }\n\
 #else\n\
@@ -28,11 +28,11 @@ vec4 getClippingPlane(\n\
     float pixelHeight = 1.0 / float(CLIPPING_PLANES_TEXTURE_HEIGHT);\n\
     float u = (float(pixX) + 0.5) * pixelWidth; // sample from center of pixel\n\
     float v = (float(pixY) + 0.5) * pixelHeight;\n\
-    vec4 oct32 = texture2D(packedClippingPlanes, vec2(u, v)) * 255.0;\n\
+    vec4 oct32 = texture(packedClippingPlanes, vec2(u, v)) * 255.0;\n\
     vec2 oct = vec2(oct32.x * 256.0 + oct32.y, oct32.z * 256.0 + oct32.w);\n\
     vec4 plane;\n\
     plane.xyz = czm_octDecode(oct, 65535.0);\n\
-    plane.w = czm_unpackFloat(texture2D(packedClippingPlanes, vec2(u + pixelWidth, v)));\n\
+    plane.w = czm_unpackFloat(texture(packedClippingPlanes, vec2(u + pixelWidth, v)));\n\
     return czm_transformPlane(plane, transform);\n\
 }\n\
 #endif\n\

package/Source/Shaders/Model/ModelFS.glsl

@@ -85,5 +85,5 @@ void main()
     silhouetteStage(color);
     #endif
 
-    gl_FragColor = color;
+    out_FragColor = color;
 }

package/Source/Shaders/Model/ModelFS.js

@@ -86,6 +86,6 @@ void main()\n\
     silhouetteStage(color);\n\
     #endif\n\
 \n\
-    gl_FragColor = color;\n\
+    out_FragColor = color;\n\
 }\n\
 ";

package/Source/Shaders/Model/PrimitiveOutlineStageFS.glsl

@@ -4,11 +4,11 @@ void primitiveOutlineStage(inout czm_modelMaterial material) {
     }
 
     float outlineX = 
-        texture2D(model_outlineTexture, vec2(v_outlineCoordinates.x, 0.5)).r;
+        texture(model_outlineTexture, vec2(v_outlineCoordinates.x, 0.5)).r;
     float outlineY = 
-        texture2D(model_outlineTexture, vec2(v_outlineCoordinates.y, 0.5)).r;
+        texture(model_outlineTexture, vec2(v_outlineCoordinates.y, 0.5)).r;
     float outlineZ = 
-        texture2D(model_outlineTexture, vec2(v_outlineCoordinates.z, 0.5)).r;
+        texture(model_outlineTexture, vec2(v_outlineCoordinates.z, 0.5)).r;
     float outlineness = max(outlineX, max(outlineY, outlineZ));
 
     material.diffuse = mix(material.diffuse, model_outlineColor.rgb, model_outlineColor.a * outlineness);

package/Source/Shaders/Model/PrimitiveOutlineStageFS.js

@@ -5,11 +5,11 @@ export default "void primitiveOutlineStage(inout czm_modelMaterial material) {\n
     }\n\
 \n\
     float outlineX = \n\
-        texture2D(model_outlineTexture, vec2(v_outlineCoordinates.x, 0.5)).r;\n\
+        texture(model_outlineTexture, vec2(v_outlineCoordinates.x, 0.5)).r;\n\
     float outlineY = \n\
-        texture2D(model_outlineTexture, vec2(v_outlineCoordinates.y, 0.5)).r;\n\
+        texture(model_outlineTexture, vec2(v_outlineCoordinates.y, 0.5)).r;\n\
     float outlineZ = \n\
-        texture2D(model_outlineTexture, vec2(v_outlineCoordinates.z, 0.5)).r;\n\
+        texture(model_outlineTexture, vec2(v_outlineCoordinates.z, 0.5)).r;\n\
     float outlineness = max(outlineX, max(outlineY, outlineZ));\n\
 \n\
     material.diffuse = mix(material.diffuse, model_outlineColor.rgb, model_outlineColor.a * outlineness);\n\

package/Source/Shaders/Model/SelectedFeatureIdStageCommon.glsl

@@ -27,7 +27,7 @@ void selectedFeatureIdStage(out SelectedFeature feature, FeatureIds featureIds)
 
         feature.id = featureId;
         feature.st = featureSt;
-        feature.color = texture2D(model_batchTexture, featureSt);
+        feature.color = texture(model_batchTexture, featureSt);
     }
     // Floating point comparisons can be unreliable in GLSL, so we
     // increment the feature ID to make sure it's always greater

package/Source/Shaders/Model/SelectedFeatureIdStageCommon.js

@@ -28,7 +28,7 @@ void selectedFeatureIdStage(out SelectedFeature feature, FeatureIds featureIds)\
 \n\
         feature.id = featureId;\n\
         feature.st = featureSt;\n\
-        feature.color = texture2D(model_batchTexture, featureSt);\n\
+        feature.color = texture(model_batchTexture, featureSt);\n\
     }\n\
     // Floating point comparisons can be unreliable in GLSL, so we\n\
     // increment the feature ID to make sure it's always greater\n\

package/Source/Shaders/OctahedralProjectionAtlasFS.glsl

@@ -1,4 +1,4 @@
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 uniform float originalSize;
 uniform sampler2D texture0;
@@ -60,30 +60,30 @@ void main()
 
     if(mipLevel == 0.0)
     {
-        gl_FragColor = texture2D(texture0, uv);
+        out_FragColor = texture(texture0, uv);
     }
     else if(mipLevel == 1.0)
     {
-        gl_FragColor = texture2D(texture1, uv);
+        out_FragColor = texture(texture1, uv);
     }
     else if(mipLevel == 2.0)
     {
-        gl_FragColor = texture2D(texture2, uv);
+        out_FragColor = texture(texture2, uv);
     }
     else if(mipLevel == 3.0)
     {
-        gl_FragColor = texture2D(texture3, uv);
+        out_FragColor = texture(texture3, uv);
     }
     else if(mipLevel == 4.0)
     {
-        gl_FragColor = texture2D(texture4, uv);
+        out_FragColor = texture(texture4, uv);
     }
     else if(mipLevel == 5.0)
     {
-        gl_FragColor = texture2D(texture5, uv);
+        out_FragColor = texture(texture5, uv);
     }
     else
     {
-        gl_FragColor = vec4(0.0);
+        out_FragColor = vec4(0.0);
     }
 }

package/Source/Shaders/OctahedralProjectionAtlasFS.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 float originalSize;\n\
 uniform sampler2D texture0;\n\
@@ -61,31 +61,31 @@ void main()\n\
 \n\
     if(mipLevel == 0.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture0, uv);\n\
+        out_FragColor = texture(texture0, uv);\n\
     }\n\
     else if(mipLevel == 1.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture1, uv);\n\
+        out_FragColor = texture(texture1, uv);\n\
     }\n\
     else if(mipLevel == 2.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture2, uv);\n\
+        out_FragColor = texture(texture2, uv);\n\
     }\n\
     else if(mipLevel == 3.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture3, uv);\n\
+        out_FragColor = texture(texture3, uv);\n\
     }\n\
     else if(mipLevel == 4.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture4, uv);\n\
+        out_FragColor = texture(texture4, uv);\n\
     }\n\
     else if(mipLevel == 5.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture5, uv);\n\
+        out_FragColor = texture(texture5, uv);\n\
     }\n\
     else\n\
     {\n\
-        gl_FragColor = vec4(0.0);\n\
+        out_FragColor = vec4(0.0);\n\
     }\n\
 }\n\
 ";

package/Source/Shaders/OctahedralProjectionFS.glsl

@@ -1,14 +1,14 @@
-varying vec3 v_cubeMapCoordinates;
+in vec3 v_cubeMapCoordinates;
 uniform samplerCube cubeMap;
 
 void main()
 {
-    vec4 rgba = textureCube(cubeMap, v_cubeMapCoordinates);
+    vec4 rgba = czm_textureCube(cubeMap, v_cubeMapCoordinates);
     #ifdef RGBA_NORMALIZED
-        gl_FragColor = vec4(rgba.rgb, 1.0);
+        out_FragColor = vec4(rgba.rgb, 1.0);
     #else
         float m = rgba.a * 16.0;
         vec3 r = rgba.rgb * m;
-        gl_FragColor = vec4(r * r, 1.0);
+        out_FragColor = vec4(r * r, 1.0);
     #endif
 }

package/Source/Shaders/OctahedralProjectionFS.js

@@ -1,16 +1,16 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_cubeMapCoordinates;\n\
+export default "in vec3 v_cubeMapCoordinates;\n\
 uniform samplerCube cubeMap;\n\
 \n\
 void main()\n\
 {\n\
-    vec4 rgba = textureCube(cubeMap, v_cubeMapCoordinates);\n\
+    vec4 rgba = czm_textureCube(cubeMap, v_cubeMapCoordinates);\n\
     #ifdef RGBA_NORMALIZED\n\
-        gl_FragColor = vec4(rgba.rgb, 1.0);\n\
+        out_FragColor = vec4(rgba.rgb, 1.0);\n\
     #else\n\
         float m = rgba.a * 16.0;\n\
         vec3 r = rgba.rgb * m;\n\
-        gl_FragColor = vec4(r * r, 1.0);\n\
+        out_FragColor = vec4(r * r, 1.0);\n\
     #endif\n\
 }\n\
 ";

package/Source/Shaders/OctahedralProjectionVS.glsl

@@ -1,7 +1,7 @@
-attribute vec4 position;
-attribute vec3 cubeMapCoordinates;
+in vec4 position;
+in vec3 cubeMapCoordinates;
 
-varying vec3 v_cubeMapCoordinates;
+out vec3 v_cubeMapCoordinates;
 
 void main()
 {

package/Source/Shaders/OctahedralProjectionVS.js

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

package/Source/Shaders/PointPrimitiveCollectionFS.glsl

@@ -1,8 +1,8 @@
-varying vec4 v_color;
-varying vec4 v_outlineColor;
-varying float v_innerPercent;
-varying float v_pixelDistance;
-varying vec4 v_pickColor;
+in vec4 v_color;
+in vec4 v_outlineColor;
+in float v_innerPercent;
+in float v_pixelDistance;
+in vec4 v_pickColor;
 
 void main()
 {
@@ -38,6 +38,6 @@ void main()
 #endif
 #endif
 
-    gl_FragColor = czm_gammaCorrect(color);
+    out_FragColor = czm_gammaCorrect(color);
     czm_writeLogDepth();
 }

package/Source/Shaders/PointPrimitiveCollectionFS.js

@@ -1,9 +1,9 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec4 v_color;\n\
-varying vec4 v_outlineColor;\n\
-varying float v_innerPercent;\n\
-varying float v_pixelDistance;\n\
-varying vec4 v_pickColor;\n\
+export default "in vec4 v_color;\n\
+in vec4 v_outlineColor;\n\
+in float v_innerPercent;\n\
+in float v_pixelDistance;\n\
+in vec4 v_pickColor;\n\
 \n\
 void main()\n\
 {\n\
@@ -39,7 +39,7 @@ void main()\n\
 #endif\n\
 #endif\n\
 \n\
-    gl_FragColor = czm_gammaCorrect(color);\n\
+    out_FragColor = czm_gammaCorrect(color);\n\
     czm_writeLogDepth();\n\
 }\n\
 ";

package/Source/Shaders/PointPrimitiveCollectionVS.glsl

@@ -1,17 +1,17 @@
 uniform float u_maxTotalPointSize;
 
-attribute vec4 positionHighAndSize;
-attribute vec4 positionLowAndOutline;
-attribute vec4 compressedAttribute0;                       // color, outlineColor, pick color
-attribute vec4 compressedAttribute1;                       // show, translucency by distance, some free space
-attribute vec4 scaleByDistance;                            // near, nearScale, far, farScale
-attribute vec3 distanceDisplayConditionAndDisableDepth;    // near, far, disableDepthTestDistance
-
-varying vec4 v_color;
-varying vec4 v_outlineColor;
-varying float v_innerPercent;
-varying float v_pixelDistance;
-varying vec4 v_pickColor;
+in vec4 positionHighAndSize;
+in vec4 positionLowAndOutline;
+in vec4 compressedAttribute0;                       // color, outlineColor, pick color
+in vec4 compressedAttribute1;                       // show, translucency by distance, some free space
+in vec4 scaleByDistance;                            // near, nearScale, far, farScale
+in vec3 distanceDisplayConditionAndDisableDepth;    // near, far, disableDepthTestDistance
+
+out vec4 v_color;
+out vec4 v_outlineColor;
+out float v_innerPercent;
+out float v_pixelDistance;
+out vec4 v_pickColor;
 
 const float SHIFT_LEFT8 = 256.0;
 const float SHIFT_RIGHT8 = 1.0 / 256.0;
@@ -28,8 +28,6 @@ void main()
     float outlinePercent = outlineWidthBothSides / totalSize;
     // Scale in response to browser-zoom.
     totalSize *= czm_pixelRatio;
-    // Add padding for anti-aliasing on both sides.
-    totalSize += 3.0;
 
     float temp = compressedAttribute1.x * SHIFT_RIGHT8;
     float show = floor(temp);
@@ -111,6 +109,11 @@ void main()
 #ifdef EYE_DISTANCE_SCALING
     totalSize *= czm_nearFarScalar(scaleByDistance, lengthSq);
 #endif
+    if (totalSize > 0.0) {
+        // Add padding for anti-aliasing on both sides.
+        totalSize += 3.0;
+    }
+
     // Clamp to max point size.
     totalSize = min(totalSize, u_maxTotalPointSize);
     // If size is too small, push vertex behind near plane for clipping.

package/Source/Shaders/PointPrimitiveCollectionVS.js

@@ -1,18 +1,18 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform float u_maxTotalPointSize;\n\
 \n\
-attribute vec4 positionHighAndSize;\n\
-attribute vec4 positionLowAndOutline;\n\
-attribute vec4 compressedAttribute0;                       // color, outlineColor, pick color\n\
-attribute vec4 compressedAttribute1;                       // show, translucency by distance, some free space\n\
-attribute vec4 scaleByDistance;                            // near, nearScale, far, farScale\n\
-attribute vec3 distanceDisplayConditionAndDisableDepth;    // near, far, disableDepthTestDistance\n\
-\n\
-varying vec4 v_color;\n\
-varying vec4 v_outlineColor;\n\
-varying float v_innerPercent;\n\
-varying float v_pixelDistance;\n\
-varying vec4 v_pickColor;\n\
+in vec4 positionHighAndSize;\n\
+in vec4 positionLowAndOutline;\n\
+in vec4 compressedAttribute0;                       // color, outlineColor, pick color\n\
+in vec4 compressedAttribute1;                       // show, translucency by distance, some free space\n\
+in vec4 scaleByDistance;                            // near, nearScale, far, farScale\n\
+in vec3 distanceDisplayConditionAndDisableDepth;    // near, far, disableDepthTestDistance\n\
+\n\
+out vec4 v_color;\n\
+out vec4 v_outlineColor;\n\
+out float v_innerPercent;\n\
+out float v_pixelDistance;\n\
+out vec4 v_pickColor;\n\
 \n\
 const float SHIFT_LEFT8 = 256.0;\n\
 const float SHIFT_RIGHT8 = 1.0 / 256.0;\n\
@@ -29,8 +29,6 @@ void main()\n\
     float outlinePercent = outlineWidthBothSides / totalSize;\n\
     // Scale in response to browser-zoom.\n\
     totalSize *= czm_pixelRatio;\n\
-    // Add padding for anti-aliasing on both sides.\n\
-    totalSize += 3.0;\n\
 \n\
     float temp = compressedAttribute1.x * SHIFT_RIGHT8;\n\
     float show = floor(temp);\n\
@@ -112,6 +110,11 @@ void main()\n\
 #ifdef EYE_DISTANCE_SCALING\n\
     totalSize *= czm_nearFarScalar(scaleByDistance, lengthSq);\n\
 #endif\n\
+    if (totalSize > 0.0) {\n\
+        // Add padding for anti-aliasing on both sides.\n\
+        totalSize += 3.0;\n\
+    }\n\
+\n\
     // Clamp to max point size.\n\
     totalSize = min(totalSize, u_maxTotalPointSize);\n\
     // If size is too small, push vertex behind near plane for clipping.\n\

package/Source/Shaders/PolylineFS.glsl

@@ -2,7 +2,7 @@
 uniform vec4 u_highlightColor;
 #endif
 
-varying vec2 v_st;
+in vec2 v_st;
 
 void main()
 {
@@ -16,9 +16,9 @@ void main()
     materialInput.str = vec3(st, 0.0);
 
     czm_material material = czm_getMaterial(materialInput);
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #ifdef VECTOR_TILE
-    gl_FragColor *= u_highlightColor;
+    out_FragColor *= u_highlightColor;
 #endif
 
     czm_writeLogDepth();

package/Source/Shaders/PolylineFS.js

@@ -3,7 +3,7 @@ export default "#ifdef VECTOR_TILE\n\
 uniform vec4 u_highlightColor;\n\
 #endif\n\
 \n\
-varying vec2 v_st;\n\
+in vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\
@@ -17,9 +17,9 @@ void main()\n\
     materialInput.str = vec3(st, 0.0);\n\
 \n\
     czm_material material = czm_getMaterial(materialInput);\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #ifdef VECTOR_TILE\n\
-    gl_FragColor *= u_highlightColor;\n\
+    out_FragColor *= u_highlightColor;\n\
 #endif\n\
 \n\
     czm_writeLogDepth();\n\

package/Source/Shaders/PolylineShadowVolumeFS.glsl

@@ -1,26 +1,22 @@
-#ifdef GL_EXT_frag_depth
-#extension GL_EXT_frag_depth : enable
-#endif
-
-varying vec4 v_startPlaneNormalEcAndHalfWidth;
-varying vec4 v_endPlaneNormalEcAndBatchId;
-varying vec4 v_rightPlaneEC; // Technically can compute distance for this here
-varying vec4 v_endEcAndStartEcX;
-varying vec4 v_texcoordNormalizationAndStartEcYZ;
+in vec4 v_startPlaneNormalEcAndHalfWidth;
+in vec4 v_endPlaneNormalEcAndBatchId;
+in vec4 v_rightPlaneEC; // Technically can compute distance for this here
+in vec4 v_endEcAndStartEcX;
+in vec4 v_texcoordNormalizationAndStartEcYZ;
 
 #ifdef PER_INSTANCE_COLOR
-varying vec4 v_color;
+in vec4 v_color;
 #endif
 
 void main(void)
 {
-    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)));
     vec3 ecStart = vec3(v_endEcAndStartEcX.w, v_texcoordNormalizationAndStartEcYZ.zw);
 
     // Discard for sky
     if (logDepthOrDepth == 0.0) {
 #ifdef DEBUG_SHOW_VOLUME
-        gl_FragColor = vec4(1.0, 0.0, 0.0, 0.5);
+        out_FragColor = vec4(1.0, 0.0, 0.0, 0.5);
         return;
 #else // DEBUG_SHOW_VOLUME
         discard;
@@ -40,7 +36,7 @@ void main(void)
 
     if (abs(widthwiseDistance) > halfMaxWidth || distanceFromStart < 0.0 || distanceFromEnd < 0.0) {
 #ifdef DEBUG_SHOW_VOLUME
-        gl_FragColor = vec4(1.0, 0.0, 0.0, 0.5);
+        out_FragColor = vec4(1.0, 0.0, 0.0, 0.5);
         return;
 #else // DEBUG_SHOW_VOLUME
         discard;
@@ -65,7 +61,7 @@ void main(void)
     distanceFromEnd = czm_planeDistance(alignedPlaneNormal, -dot(alignedPlaneNormal, v_endEcAndStartEcX.xyz), eyeCoordinate.xyz);
 
 #ifdef PER_INSTANCE_COLOR
-    gl_FragColor = czm_gammaCorrect(v_color);
+    out_FragColor = czm_gammaCorrect(v_color);
 #else // PER_INSTANCE_COLOR
     // Clamp - distance to aligned planes may be negative due to mitering,
     // so fragment texture coordinate might be out-of-bounds.
@@ -80,11 +76,11 @@ void main(void)
     materialInput.str = vec3(s, t, 0.0);
 
     czm_material material = czm_getMaterial(materialInput);
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #endif // PER_INSTANCE_COLOR
 
     // Premultiply alpha. Required for classification primitives on translucent globe.
-    gl_FragColor.rgb *= gl_FragColor.a;
+    out_FragColor.rgb *= out_FragColor.a;
 
     czm_writeDepthClamp();
 }

package/Source/Shaders/PolylineShadowVolumeFS.js

@@ -1,27 +1,23 @@
 //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_startPlaneNormalEcAndHalfWidth;\n\
-varying vec4 v_endPlaneNormalEcAndBatchId;\n\
-varying vec4 v_rightPlaneEC; // Technically can compute distance for this here\n\
-varying vec4 v_endEcAndStartEcX;\n\
-varying vec4 v_texcoordNormalizationAndStartEcYZ;\n\
+export default "in vec4 v_startPlaneNormalEcAndHalfWidth;\n\
+in vec4 v_endPlaneNormalEcAndBatchId;\n\
+in vec4 v_rightPlaneEC; // Technically can compute distance for this here\n\
+in vec4 v_endEcAndStartEcX;\n\
+in vec4 v_texcoordNormalizationAndStartEcYZ;\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-varying vec4 v_color;\n\
+in vec4 v_color;\n\
 #endif\n\
 \n\
 void main(void)\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\
     vec3 ecStart = vec3(v_endEcAndStartEcX.w, v_texcoordNormalizationAndStartEcYZ.zw);\n\
 \n\
     // Discard for sky\n\
     if (logDepthOrDepth == 0.0) {\n\
 #ifdef DEBUG_SHOW_VOLUME\n\
-        gl_FragColor = vec4(1.0, 0.0, 0.0, 0.5);\n\
+        out_FragColor = vec4(1.0, 0.0, 0.0, 0.5);\n\
         return;\n\
 #else // DEBUG_SHOW_VOLUME\n\
         discard;\n\
@@ -41,7 +37,7 @@ void main(void)\n\
 \n\
     if (abs(widthwiseDistance) > halfMaxWidth || distanceFromStart < 0.0 || distanceFromEnd < 0.0) {\n\
 #ifdef DEBUG_SHOW_VOLUME\n\
-        gl_FragColor = vec4(1.0, 0.0, 0.0, 0.5);\n\
+        out_FragColor = vec4(1.0, 0.0, 0.0, 0.5);\n\
         return;\n\
 #else // DEBUG_SHOW_VOLUME\n\
         discard;\n\
@@ -66,7 +62,7 @@ void main(void)\n\
     distanceFromEnd = czm_planeDistance(alignedPlaneNormal, -dot(alignedPlaneNormal, v_endEcAndStartEcX.xyz), eyeCoordinate.xyz);\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-    gl_FragColor = czm_gammaCorrect(v_color);\n\
+    out_FragColor = czm_gammaCorrect(v_color);\n\
 #else // PER_INSTANCE_COLOR\n\
     // Clamp - distance to aligned planes may be negative due to mitering,\n\
     // so fragment texture coordinate might be out-of-bounds.\n\
@@ -81,11 +77,11 @@ void main(void)\n\
     materialInput.str = vec3(s, t, 0.0);\n\
 \n\
     czm_material material = czm_getMaterial(materialInput);\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #endif // PER_INSTANCE_COLOR\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\
     czm_writeDepthClamp();\n\
 }\n\

package/Source/Shaders/PolylineShadowVolumeMorphFS.glsl

@@ -1,12 +1,12 @@
-varying vec3 v_forwardDirectionEC;
-varying vec3 v_texcoordNormalizationAndHalfWidth;
-varying float v_batchId;
+in vec3 v_forwardDirectionEC;
+in vec3 v_texcoordNormalizationAndHalfWidth;
+in float v_batchId;
 
 #ifdef PER_INSTANCE_COLOR
-varying vec4 v_color;
+in vec4 v_color;
 #else
-varying vec2 v_alignedPlaneDistances;
-varying float v_texcoordT;
+in vec2 v_alignedPlaneDistances;
+in float v_texcoordT;
 #endif
 
 float rayPlaneDistanceUnsafe(vec3 origin, vec3 direction, vec3 planeNormal, float planeDistance) {
@@ -20,7 +20,7 @@ void main(void)
     eyeCoordinate /= eyeCoordinate.w;
 
 #ifdef PER_INSTANCE_COLOR
-    gl_FragColor = czm_gammaCorrect(v_color);
+    out_FragColor = czm_gammaCorrect(v_color);
 #else // PER_INSTANCE_COLOR
     // Use distances for planes aligned with segment to prevent skew in dashing
     float distanceFromStart = rayPlaneDistanceUnsafe(eyeCoordinate.xyz, -v_forwardDirectionEC, v_forwardDirectionEC.xyz, v_alignedPlaneDistances.x);
@@ -40,6 +40,6 @@ void main(void)
     materialInput.str = vec3(s, v_texcoordT, 0.0);
 
     czm_material material = czm_getMaterial(materialInput);
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #endif // PER_INSTANCE_COLOR
 }

package/Source/Shaders/PolylineShadowVolumeMorphFS.js

@@ -1,13 +1,13 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_forwardDirectionEC;\n\
-varying vec3 v_texcoordNormalizationAndHalfWidth;\n\
-varying float v_batchId;\n\
+export default "in vec3 v_forwardDirectionEC;\n\
+in vec3 v_texcoordNormalizationAndHalfWidth;\n\
+in float v_batchId;\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-varying vec4 v_color;\n\
+in vec4 v_color;\n\
 #else\n\
-varying vec2 v_alignedPlaneDistances;\n\
-varying float v_texcoordT;\n\
+in vec2 v_alignedPlaneDistances;\n\
+in float v_texcoordT;\n\
 #endif\n\
 \n\
 float rayPlaneDistanceUnsafe(vec3 origin, vec3 direction, vec3 planeNormal, float planeDistance) {\n\
@@ -21,7 +21,7 @@ void main(void)\n\
     eyeCoordinate /= eyeCoordinate.w;\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-    gl_FragColor = czm_gammaCorrect(v_color);\n\
+    out_FragColor = czm_gammaCorrect(v_color);\n\
 #else // PER_INSTANCE_COLOR\n\
     // Use distances for planes aligned with segment to prevent skew in dashing\n\
     float distanceFromStart = rayPlaneDistanceUnsafe(eyeCoordinate.xyz, -v_forwardDirectionEC, v_forwardDirectionEC.xyz, v_alignedPlaneDistances.x);\n\
@@ -41,7 +41,7 @@ void main(void)\n\
     materialInput.str = vec3(s, v_texcoordT, 0.0);\n\
 \n\
     czm_material material = czm_getMaterial(materialInput);\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #endif // PER_INSTANCE_COLOR\n\
 }\n\
 ";