@cesium/engine 1.1.0 → 2.1.0

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\
 ";

package/Source/Shaders/PolylineShadowVolumeMorphVS.glsl

@@ -1,35 +1,35 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
+in vec3 position3DHigh;
+in vec3 position3DLow;
 
-attribute vec4 startHiAndForwardOffsetX;
-attribute vec4 startLoAndForwardOffsetY;
-attribute vec4 startNormalAndForwardOffsetZ;
-attribute vec4 endNormalAndTextureCoordinateNormalizationX;
-attribute vec4 rightNormalAndTextureCoordinateNormalizationY;
-attribute vec4 startHiLo2D;
-attribute vec4 offsetAndRight2D;
-attribute vec4 startEndNormals2D;
-attribute vec2 texcoordNormalization2D;
+in vec4 startHiAndForwardOffsetX;
+in vec4 startLoAndForwardOffsetY;
+in vec4 startNormalAndForwardOffsetZ;
+in vec4 endNormalAndTextureCoordinateNormalizationX;
+in vec4 rightNormalAndTextureCoordinateNormalizationY;
+in vec4 startHiLo2D;
+in vec4 offsetAndRight2D;
+in vec4 startEndNormals2D;
+in vec2 texcoordNormalization2D;
 
-attribute float batchId;
+in float batchId;
 
-varying vec3 v_forwardDirectionEC;
-varying vec3 v_texcoordNormalizationAndHalfWidth;
-varying float v_batchId;
+out vec3 v_forwardDirectionEC;
+out vec3 v_texcoordNormalizationAndHalfWidth;
+out float v_batchId;
 
 // For materials
 #ifdef WIDTH_VARYING
-varying float v_width;
+out float v_width;
 #endif
 #ifdef ANGLE_VARYING
-varying float v_polylineAngle;
+out float v_polylineAngle;
 #endif
 
 #ifdef PER_INSTANCE_COLOR
-varying vec4 v_color;
+out vec4 v_color;
 #else
-varying vec2 v_alignedPlaneDistances;
-varying float v_texcoordT;
+out vec2 v_alignedPlaneDistances;
+out float v_texcoordT;
 #endif
 
 // Morphing planes using SLERP or NLERP doesn't seem to work, so instead draw the material directly on the shadow volume.

package/Source/Shaders/PolylineShadowVolumeMorphVS.js

@@ -1,36 +1,36 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
 \n\
-attribute vec4 startHiAndForwardOffsetX;\n\
-attribute vec4 startLoAndForwardOffsetY;\n\
-attribute vec4 startNormalAndForwardOffsetZ;\n\
-attribute vec4 endNormalAndTextureCoordinateNormalizationX;\n\
-attribute vec4 rightNormalAndTextureCoordinateNormalizationY;\n\
-attribute vec4 startHiLo2D;\n\
-attribute vec4 offsetAndRight2D;\n\
-attribute vec4 startEndNormals2D;\n\
-attribute vec2 texcoordNormalization2D;\n\
+in vec4 startHiAndForwardOffsetX;\n\
+in vec4 startLoAndForwardOffsetY;\n\
+in vec4 startNormalAndForwardOffsetZ;\n\
+in vec4 endNormalAndTextureCoordinateNormalizationX;\n\
+in vec4 rightNormalAndTextureCoordinateNormalizationY;\n\
+in vec4 startHiLo2D;\n\
+in vec4 offsetAndRight2D;\n\
+in vec4 startEndNormals2D;\n\
+in vec2 texcoordNormalization2D;\n\
 \n\
-attribute float batchId;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_forwardDirectionEC;\n\
-varying vec3 v_texcoordNormalizationAndHalfWidth;\n\
-varying float v_batchId;\n\
+out vec3 v_forwardDirectionEC;\n\
+out vec3 v_texcoordNormalizationAndHalfWidth;\n\
+out float v_batchId;\n\
 \n\
 // For materials\n\
 #ifdef WIDTH_VARYING\n\
-varying float v_width;\n\
+out float v_width;\n\
 #endif\n\
 #ifdef ANGLE_VARYING\n\
-varying float v_polylineAngle;\n\
+out float v_polylineAngle;\n\
 #endif\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-varying vec4 v_color;\n\
+out vec4 v_color;\n\
 #else\n\
-varying vec2 v_alignedPlaneDistances;\n\
-varying float v_texcoordT;\n\
+out vec2 v_alignedPlaneDistances;\n\
+out float v_texcoordT;\n\
 #endif\n\
 \n\
 // Morphing planes using SLERP or NLERP doesn't seem to work, so instead draw the material directly on the shadow volume.\n\

package/Source/Shaders/PolylineShadowVolumeVS.glsl

@@ -1,40 +1,40 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
+in vec3 position3DHigh;
+in vec3 position3DLow;
 
 // In 2D and in 3D, texture coordinate normalization component signs encodes:
 // * X sign - sidedness relative to right plane
 // * Y sign - is negative OR magnitude is greater than 1.0 if vertex is on bottom of volume
 #ifndef COLUMBUS_VIEW_2D
-attribute vec4 startHiAndForwardOffsetX;
-attribute vec4 startLoAndForwardOffsetY;
-attribute vec4 startNormalAndForwardOffsetZ;
-attribute vec4 endNormalAndTextureCoordinateNormalizationX;
-attribute vec4 rightNormalAndTextureCoordinateNormalizationY;
+in vec4 startHiAndForwardOffsetX;
+in vec4 startLoAndForwardOffsetY;
+in vec4 startNormalAndForwardOffsetZ;
+in vec4 endNormalAndTextureCoordinateNormalizationX;
+in vec4 rightNormalAndTextureCoordinateNormalizationY;
 #else
-attribute vec4 startHiLo2D;
-attribute vec4 offsetAndRight2D;
-attribute vec4 startEndNormals2D;
-attribute vec2 texcoordNormalization2D;
+in vec4 startHiLo2D;
+in vec4 offsetAndRight2D;
+in vec4 startEndNormals2D;
+in vec2 texcoordNormalization2D;
 #endif
 
-attribute float batchId;
+in float batchId;
 
-varying vec4 v_startPlaneNormalEcAndHalfWidth;
-varying vec4 v_endPlaneNormalEcAndBatchId;
-varying vec4 v_rightPlaneEC;
-varying vec4 v_endEcAndStartEcX;
-varying vec4 v_texcoordNormalizationAndStartEcYZ;
+out vec4 v_startPlaneNormalEcAndHalfWidth;
+out vec4 v_endPlaneNormalEcAndBatchId;
+out vec4 v_rightPlaneEC;
+out vec4 v_endEcAndStartEcX;
+out vec4 v_texcoordNormalizationAndStartEcYZ;
 
 // For materials
 #ifdef WIDTH_VARYING
-varying float v_width;
+out float v_width;
 #endif
 #ifdef ANGLE_VARYING
-varying float v_polylineAngle;
+out float v_polylineAngle;
 #endif
 
 #ifdef PER_INSTANCE_COLOR
-varying vec4 v_color;
+out vec4 v_color;
 #endif
 
 void main()

package/Source/Shaders/PolylineShadowVolumeVS.js

@@ -1,41 +1,41 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
 \n\
 // In 2D and in 3D, texture coordinate normalization component signs encodes:\n\
 // * X sign - sidedness relative to right plane\n\
 // * Y sign - is negative OR magnitude is greater than 1.0 if vertex is on bottom of volume\n\
 #ifndef COLUMBUS_VIEW_2D\n\
-attribute vec4 startHiAndForwardOffsetX;\n\
-attribute vec4 startLoAndForwardOffsetY;\n\
-attribute vec4 startNormalAndForwardOffsetZ;\n\
-attribute vec4 endNormalAndTextureCoordinateNormalizationX;\n\
-attribute vec4 rightNormalAndTextureCoordinateNormalizationY;\n\
+in vec4 startHiAndForwardOffsetX;\n\
+in vec4 startLoAndForwardOffsetY;\n\
+in vec4 startNormalAndForwardOffsetZ;\n\
+in vec4 endNormalAndTextureCoordinateNormalizationX;\n\
+in vec4 rightNormalAndTextureCoordinateNormalizationY;\n\
 #else\n\
-attribute vec4 startHiLo2D;\n\
-attribute vec4 offsetAndRight2D;\n\
-attribute vec4 startEndNormals2D;\n\
-attribute vec2 texcoordNormalization2D;\n\
+in vec4 startHiLo2D;\n\
+in vec4 offsetAndRight2D;\n\
+in vec4 startEndNormals2D;\n\
+in vec2 texcoordNormalization2D;\n\
 #endif\n\
 \n\
-attribute float batchId;\n\
+in float batchId;\n\
 \n\
-varying vec4 v_startPlaneNormalEcAndHalfWidth;\n\
-varying vec4 v_endPlaneNormalEcAndBatchId;\n\
-varying vec4 v_rightPlaneEC;\n\
-varying vec4 v_endEcAndStartEcX;\n\
-varying vec4 v_texcoordNormalizationAndStartEcYZ;\n\
+out vec4 v_startPlaneNormalEcAndHalfWidth;\n\
+out vec4 v_endPlaneNormalEcAndBatchId;\n\
+out vec4 v_rightPlaneEC;\n\
+out vec4 v_endEcAndStartEcX;\n\
+out vec4 v_texcoordNormalizationAndStartEcYZ;\n\
 \n\
 // For materials\n\
 #ifdef WIDTH_VARYING\n\
-varying float v_width;\n\
+out float v_width;\n\
 #endif\n\
 #ifdef ANGLE_VARYING\n\
-varying float v_polylineAngle;\n\
+out float v_polylineAngle;\n\
 #endif\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-varying vec4 v_color;\n\
+out vec4 v_color;\n\
 #endif\n\
 \n\
 void main()\n\

package/Source/Shaders/PolylineVS.glsl

@@ -1,21 +1,21 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 position2DHigh;
-attribute vec3 position2DLow;
-attribute vec3 prevPosition3DHigh;
-attribute vec3 prevPosition3DLow;
-attribute vec3 prevPosition2DHigh;
-attribute vec3 prevPosition2DLow;
-attribute vec3 nextPosition3DHigh;
-attribute vec3 nextPosition3DLow;
-attribute vec3 nextPosition2DHigh;
-attribute vec3 nextPosition2DLow;
-attribute vec4 texCoordExpandAndBatchIndex;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 position2DHigh;
+in vec3 position2DLow;
+in vec3 prevPosition3DHigh;
+in vec3 prevPosition3DLow;
+in vec3 prevPosition2DHigh;
+in vec3 prevPosition2DLow;
+in vec3 nextPosition3DHigh;
+in vec3 nextPosition3DLow;
+in vec3 nextPosition2DHigh;
+in vec3 nextPosition2DLow;
+in vec4 texCoordExpandAndBatchIndex;
 
-varying vec2  v_st;
-varying float v_width;
-varying vec4 v_pickColor;
-varying float v_polylineAngle;
+out vec2  v_st;
+out float v_width;
+out vec4 v_pickColor;
+out float v_polylineAngle;
 
 void main()
 {

package/Source/Shaders/PolylineVS.js

@@ -1,22 +1,22 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 position2DHigh;\n\
-attribute vec3 position2DLow;\n\
-attribute vec3 prevPosition3DHigh;\n\
-attribute vec3 prevPosition3DLow;\n\
-attribute vec3 prevPosition2DHigh;\n\
-attribute vec3 prevPosition2DLow;\n\
-attribute vec3 nextPosition3DHigh;\n\
-attribute vec3 nextPosition3DLow;\n\
-attribute vec3 nextPosition2DHigh;\n\
-attribute vec3 nextPosition2DLow;\n\
-attribute vec4 texCoordExpandAndBatchIndex;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 position2DHigh;\n\
+in vec3 position2DLow;\n\
+in vec3 prevPosition3DHigh;\n\
+in vec3 prevPosition3DLow;\n\
+in vec3 prevPosition2DHigh;\n\
+in vec3 prevPosition2DLow;\n\
+in vec3 nextPosition3DHigh;\n\
+in vec3 nextPosition3DLow;\n\
+in vec3 nextPosition2DHigh;\n\
+in vec3 nextPosition2DLow;\n\
+in vec4 texCoordExpandAndBatchIndex;\n\
 \n\
-varying vec2  v_st;\n\
-varying float v_width;\n\
-varying vec4 v_pickColor;\n\
-varying float v_polylineAngle;\n\
+out vec2  v_st;\n\
+out float v_width;\n\
+out vec4 v_pickColor;\n\
+out float v_polylineAngle;\n\
 \n\
 void main()\n\
 {\n\

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);
 }