@cesium/engine 1.0.0 → 2.0.0

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

package/Source/Shaders/PostProcessStages/Silhouette.js

@@ -2,12 +2,12 @@
 export default "uniform sampler2D colorTexture;\n\
 uniform sampler2D silhouetteTexture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main(void)\n\
 {\n\
-    vec4 silhouetteColor = texture2D(silhouetteTexture, v_textureCoordinates);\n\
-    vec4 color = texture2D(colorTexture, v_textureCoordinates);\n\
-    gl_FragColor = mix(color, silhouetteColor, silhouetteColor.a);\n\
+    vec4 silhouetteColor = texture(silhouetteTexture, v_textureCoordinates);\n\
+    vec4 color = texture(colorTexture, v_textureCoordinates);\n\
+    out_FragColor = mix(color, silhouetteColor, silhouetteColor.a);\n\
 }\n\
 ";

package/Source/Shaders/ReprojectWebMercatorFS.glsl

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

package/Source/Shaders/ReprojectWebMercatorFS.js

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

package/Source/Shaders/ReprojectWebMercatorVS.glsl

@@ -1,9 +1,9 @@
-attribute vec4 position;
-attribute float webMercatorT;
+in vec4 position;
+in float webMercatorT;
 
 uniform vec2 u_textureDimensions;
 
-varying vec2 v_textureCoordinates;
+out vec2 v_textureCoordinates;
 
 void main()
 {

package/Source/Shaders/ReprojectWebMercatorVS.js

@@ -1,10 +1,10 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec4 position;\n\
-attribute float webMercatorT;\n\
+export default "in vec4 position;\n\
+in float webMercatorT;\n\
 \n\
 uniform vec2 u_textureDimensions;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+out vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/ShadowVolumeAppearanceFS.glsl

@@ -1,22 +1,18 @@
-#ifdef GL_EXT_frag_depth
-#extension GL_EXT_frag_depth : enable
-#endif
-
 #ifdef TEXTURE_COORDINATES
 #ifdef SPHERICAL
-varying vec4 v_sphericalExtents;
+in vec4 v_sphericalExtents;
 #else // SPHERICAL
-varying vec2 v_inversePlaneExtents;
-varying vec4 v_westPlane;
-varying vec4 v_southPlane;
+in vec2 v_inversePlaneExtents;
+in vec4 v_westPlane;
+in vec4 v_southPlane;
 #endif // SPHERICAL
-varying vec3 v_uvMinAndSphericalLongitudeRotation;
-varying vec3 v_uMaxAndInverseDistance;
-varying vec3 v_vMaxAndInverseDistance;
+in vec3 v_uvMinAndSphericalLongitudeRotation;
+in vec3 v_uMaxAndInverseDistance;
+in vec3 v_vMaxAndInverseDistance;
 #endif // TEXTURE_COORDINATES
 
 #ifdef PER_INSTANCE_COLOR
-varying vec4 v_color;
+in vec4 v_color;
 #endif
 
 #ifdef NORMAL_EC
@@ -28,8 +24,8 @@ vec3 getEyeCoordinate3FromWindowCoordinate(vec2 fragCoord, float logDepthOrDepth
 vec3 vectorFromOffset(vec4 eyeCoordinate, vec2 positiveOffset) {
     vec2 glFragCoordXY = gl_FragCoord.xy;
     // Sample depths at both offset and negative offset
-    float upOrRightLogDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, (glFragCoordXY + positiveOffset) / czm_viewport.zw));
-    float downOrLeftLogDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, (glFragCoordXY - positiveOffset) / czm_viewport.zw));
+    float upOrRightLogDepth = czm_unpackDepth(texture(czm_globeDepthTexture, (glFragCoordXY + positiveOffset) / czm_viewport.zw));
+    float downOrLeftLogDepth = czm_unpackDepth(texture(czm_globeDepthTexture, (glFragCoordXY - positiveOffset) / czm_viewport.zw));
     // Explicitly evaluate both paths
     // Necessary for multifrustum and for edges of the screen
     bvec2 upOrRightInBounds = lessThan(glFragCoordXY + positiveOffset, czm_viewport.zw);
@@ -44,7 +40,7 @@ vec3 vectorFromOffset(vec4 eyeCoordinate, vec2 positiveOffset) {
 void main(void)
 {
 #ifdef REQUIRES_EC
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw));
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw));
     vec4 eyeCoordinate = czm_windowToEyeCoordinates(gl_FragCoord.xy, logDepthOrDepth);
 #endif
 
@@ -76,11 +72,11 @@ void main(void)
     // being opaque pixels there in another buffer.
     // Check for logDepthOrDepth != 0.0 to make sure this should be classified.
     if (0.0 <= uv.x && uv.x <= 1.0 && 0.0 <= uv.y && uv.y <= 1.0 || logDepthOrDepth != 0.0) {
-        gl_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource
+        out_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource
         czm_writeDepthClamp();
     }
 #else // CULL_FRAGMENTS
-        gl_FragColor.a = 1.0;
+        out_FragColor.a = 1.0;
 #endif // CULL_FRAGMENTS
 #else // PICK
 
@@ -105,7 +101,7 @@ void main(void)
 
     vec4 color = czm_gammaCorrect(v_color);
 #ifdef FLAT
-    gl_FragColor = color;
+    out_FragColor = color;
 #else // FLAT
     czm_materialInput materialInput;
     materialInput.normalEC = normalEC;
@@ -114,11 +110,11 @@ void main(void)
     material.diffuse = color.rgb;
     material.alpha = color.a;
 
-    gl_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);
 #endif // FLAT
 
     // Premultiply alpha. Required for classification primitives on translucent globe.
-    gl_FragColor.rgb *= gl_FragColor.a;
+    out_FragColor.rgb *= out_FragColor.a;
 
 #else // PER_INSTANCE_COLOR
 
@@ -151,13 +147,13 @@ void main(void)
     czm_material material = czm_getMaterial(materialInput);
 
 #ifdef FLAT
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);
 #else // FLAT
-    gl_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);
 #endif // FLAT
 
     // Premultiply alpha. Required for classification primitives on translucent globe.
-    gl_FragColor.rgb *= gl_FragColor.a;
+    out_FragColor.rgb *= out_FragColor.a;
 
 #endif // PER_INSTANCE_COLOR
     czm_writeDepthClamp();

package/Source/Shaders/ShadowVolumeAppearanceFS.js

@@ -1,23 +1,19 @@
 //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\
-#ifdef TEXTURE_COORDINATES\n\
+export default "#ifdef TEXTURE_COORDINATES\n\
 #ifdef SPHERICAL\n\
-varying vec4 v_sphericalExtents;\n\
+in vec4 v_sphericalExtents;\n\
 #else // SPHERICAL\n\
-varying vec2 v_inversePlaneExtents;\n\
-varying vec4 v_westPlane;\n\
-varying vec4 v_southPlane;\n\
+in vec2 v_inversePlaneExtents;\n\
+in vec4 v_westPlane;\n\
+in vec4 v_southPlane;\n\
 #endif // SPHERICAL\n\
-varying vec3 v_uvMinAndSphericalLongitudeRotation;\n\
-varying vec3 v_uMaxAndInverseDistance;\n\
-varying vec3 v_vMaxAndInverseDistance;\n\
+in vec3 v_uvMinAndSphericalLongitudeRotation;\n\
+in vec3 v_uMaxAndInverseDistance;\n\
+in vec3 v_vMaxAndInverseDistance;\n\
 #endif // TEXTURE_COORDINATES\n\
 \n\
 #ifdef PER_INSTANCE_COLOR\n\
-varying vec4 v_color;\n\
+in vec4 v_color;\n\
 #endif\n\
 \n\
 #ifdef NORMAL_EC\n\
@@ -29,8 +25,8 @@ vec3 getEyeCoordinate3FromWindowCoordinate(vec2 fragCoord, float logDepthOrDepth
 vec3 vectorFromOffset(vec4 eyeCoordinate, vec2 positiveOffset) {\n\
     vec2 glFragCoordXY = gl_FragCoord.xy;\n\
     // Sample depths at both offset and negative offset\n\
-    float upOrRightLogDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, (glFragCoordXY + positiveOffset) / czm_viewport.zw));\n\
-    float downOrLeftLogDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, (glFragCoordXY - positiveOffset) / czm_viewport.zw));\n\
+    float upOrRightLogDepth = czm_unpackDepth(texture(czm_globeDepthTexture, (glFragCoordXY + positiveOffset) / czm_viewport.zw));\n\
+    float downOrLeftLogDepth = czm_unpackDepth(texture(czm_globeDepthTexture, (glFragCoordXY - positiveOffset) / czm_viewport.zw));\n\
     // Explicitly evaluate both paths\n\
     // Necessary for multifrustum and for edges of the screen\n\
     bvec2 upOrRightInBounds = lessThan(glFragCoordXY + positiveOffset, czm_viewport.zw);\n\
@@ -45,7 +41,7 @@ vec3 vectorFromOffset(vec4 eyeCoordinate, vec2 positiveOffset) {\n\
 void main(void)\n\
 {\n\
 #ifdef REQUIRES_EC\n\
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw));\n\
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, gl_FragCoord.xy / czm_viewport.zw));\n\
     vec4 eyeCoordinate = czm_windowToEyeCoordinates(gl_FragCoord.xy, logDepthOrDepth);\n\
 #endif\n\
 \n\
@@ -77,11 +73,11 @@ void main(void)\n\
     // being opaque pixels there in another buffer.\n\
     // Check for logDepthOrDepth != 0.0 to make sure this should be classified.\n\
     if (0.0 <= uv.x && uv.x <= 1.0 && 0.0 <= uv.y && uv.y <= 1.0 || logDepthOrDepth != 0.0) {\n\
-        gl_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource\n\
+        out_FragColor.a = 1.0; // 0.0 alpha leads to discard from ShaderSource.createPickFragmentShaderSource\n\
         czm_writeDepthClamp();\n\
     }\n\
 #else // CULL_FRAGMENTS\n\
-        gl_FragColor.a = 1.0;\n\
+        out_FragColor.a = 1.0;\n\
 #endif // CULL_FRAGMENTS\n\
 #else // PICK\n\
 \n\
@@ -106,7 +102,7 @@ void main(void)\n\
 \n\
     vec4 color = czm_gammaCorrect(v_color);\n\
 #ifdef FLAT\n\
-    gl_FragColor = color;\n\
+    out_FragColor = color;\n\
 #else // FLAT\n\
     czm_materialInput materialInput;\n\
     materialInput.normalEC = normalEC;\n\
@@ -115,11 +111,11 @@ void main(void)\n\
     material.diffuse = color.rgb;\n\
     material.alpha = color.a;\n\
 \n\
-    gl_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);\n\
 #endif // FLAT\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\
 #else // PER_INSTANCE_COLOR\n\
 \n\
@@ -152,13 +148,13 @@ void main(void)\n\
     czm_material material = czm_getMaterial(materialInput);\n\
 \n\
 #ifdef FLAT\n\
-    gl_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
+    out_FragColor = vec4(material.diffuse + material.emission, material.alpha);\n\
 #else // FLAT\n\
-    gl_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(-eyeCoordinate.xyz), material, czm_lightDirectionEC);\n\
 #endif // FLAT\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\
 #endif // PER_INSTANCE_COLOR\n\
     czm_writeDepthClamp();\n\

package/Source/Shaders/ShadowVolumeAppearanceVS.glsl

@@ -1,28 +1,28 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in float batchId;
 
 #ifdef EXTRUDED_GEOMETRY
-attribute vec3 extrudeDirection;
+in vec3 extrudeDirection;
 
 uniform float u_globeMinimumAltitude;
 #endif // EXTRUDED_GEOMETRY
 
 #ifdef PER_INSTANCE_COLOR
-varying vec4 v_color;
+out vec4 v_color;
 #endif // PER_INSTANCE_COLOR
 
 #ifdef TEXTURE_COORDINATES
 #ifdef SPHERICAL
-varying vec4 v_sphericalExtents;
+out vec4 v_sphericalExtents;
 #else // SPHERICAL
-varying vec2 v_inversePlaneExtents;
-varying vec4 v_westPlane;
-varying vec4 v_southPlane;
+out vec2 v_inversePlaneExtents;
+out vec4 v_westPlane;
+out vec4 v_southPlane;
 #endif // SPHERICAL
-varying vec3 v_uvMinAndSphericalLongitudeRotation;
-varying vec3 v_uMaxAndInverseDistance;
-varying vec3 v_vMaxAndInverseDistance;
+out vec3 v_uvMinAndSphericalLongitudeRotation;
+out vec3 v_uMaxAndInverseDistance;
+out vec3 v_vMaxAndInverseDistance;
 #endif // TEXTURE_COORDINATES
 
 void main()