@cesium/engine 1.1.0 → 2.1.0

package/Source/Shaders/Builtin/Functions/writeLogDepth.glsl

@@ -1,5 +1,5 @@
 #ifdef LOG_DEPTH
-varying float v_depthFromNearPlusOne;
+in float v_depthFromNearPlusOne;
 
 #ifdef POLYGON_OFFSET
 uniform vec2 u_polygonOffset;
@@ -27,7 +27,7 @@ uniform vec2 u_polygonOffset;
  */
 void czm_writeLogDepth(float depth)
 {
-#if defined(GL_EXT_frag_depth) && defined(LOG_DEPTH)
+#if (defined(LOG_DEPTH) && (__VERSION__ == 300 || defined(GL_EXT_frag_depth)))
     // Discard the vertex if it's not between the near and far planes.
     // We allow a bit of epsilon on the near plane comparison because a 1.0
     // from the vertex shader (indicating the vertex should be _on_ the near
@@ -41,8 +41,8 @@ void czm_writeLogDepth(float depth)
     float factor = u_polygonOffset[0];
     float units = u_polygonOffset[1];
 
-// If we can't compute derivatives, just leave out the factor I guess?
-#ifdef GL_OES_standard_derivatives
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
+    // This factor doesn't work in IE 10
     if (factor != 0.0) {
         // m = sqrt(dZdX^2 + dZdY^2);
         float x = dFdx(depth);
@@ -56,11 +56,11 @@ void czm_writeLogDepth(float depth)
 
 #endif
 
-    gl_FragDepthEXT = log2(depth) * czm_oneOverLog2FarDepthFromNearPlusOne;
+    gl_FragDepth = log2(depth) * czm_oneOverLog2FarDepthFromNearPlusOne;
 
 #ifdef POLYGON_OFFSET
     // Apply the units after the log depth.
-    gl_FragDepthEXT += czm_epsilon7 * units;
+    gl_FragDepth += czm_epsilon7 * units;
 #endif
 
 #endif

package/Source/Shaders/Builtin/Functions/writeLogDepth.js

@@ -1,6 +1,6 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "#ifdef LOG_DEPTH\n\
-varying float v_depthFromNearPlusOne;\n\
+in float v_depthFromNearPlusOne;\n\
 \n\
 #ifdef POLYGON_OFFSET\n\
 uniform vec2 u_polygonOffset;\n\
@@ -28,7 +28,7 @@ uniform vec2 u_polygonOffset;\n\
  */\n\
 void czm_writeLogDepth(float depth)\n\
 {\n\
-#if defined(GL_EXT_frag_depth) && defined(LOG_DEPTH)\n\
+#if (defined(LOG_DEPTH) && (__VERSION__ == 300 || defined(GL_EXT_frag_depth)))\n\
     // Discard the vertex if it's not between the near and far planes.\n\
     // We allow a bit of epsilon on the near plane comparison because a 1.0\n\
     // from the vertex shader (indicating the vertex should be _on_ the near\n\
@@ -42,8 +42,8 @@ void czm_writeLogDepth(float depth)\n\
     float factor = u_polygonOffset[0];\n\
     float units = u_polygonOffset[1];\n\
 \n\
-// If we can't compute derivatives, just leave out the factor I guess?\n\
-#ifdef GL_OES_standard_derivatives\n\
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))\n\
+    // This factor doesn't work in IE 10\n\
     if (factor != 0.0) {\n\
         // m = sqrt(dZdX^2 + dZdY^2);\n\
         float x = dFdx(depth);\n\
@@ -57,11 +57,11 @@ void czm_writeLogDepth(float depth)\n\
 \n\
 #endif\n\
 \n\
-    gl_FragDepthEXT = log2(depth) * czm_oneOverLog2FarDepthFromNearPlusOne;\n\
+    gl_FragDepth = log2(depth) * czm_oneOverLog2FarDepthFromNearPlusOne;\n\
 \n\
 #ifdef POLYGON_OFFSET\n\
     // Apply the units after the log depth.\n\
-    gl_FragDepthEXT += czm_epsilon7 * units;\n\
+    gl_FragDepth += czm_epsilon7 * units;\n\
 #endif\n\
 \n\
 #endif\n\

package/Source/Shaders/CloudCollectionFS.glsl

@@ -1,11 +1,11 @@
 uniform sampler2D u_noiseTexture;
 uniform vec3 u_noiseTextureDimensions;
 uniform float u_noiseDetail;
-varying vec2 v_offset;
-varying vec3 v_maximumSize;
-varying vec4 v_color;
-varying float v_slice;
-varying float v_brightness;
+in vec2 v_offset;
+in vec3 v_maximumSize;
+in vec4 v_color;
+in float v_slice;
+in float v_brightness;
 
 float wrap(float value, float rangeLength) {
     if(value < 0.0) {
@@ -22,15 +22,14 @@ vec3 wrapVec(vec3 value, float rangeLength) {
                 wrap(value.z, rangeLength));
 }
 
-float textureSliceWidth = u_noiseTextureDimensions.x;
-float noiseTextureRows = u_noiseTextureDimensions.y;
-float inverseNoiseTextureRows = u_noiseTextureDimensions.z;
-
-float textureSliceWidthSquared = textureSliceWidth * textureSliceWidth;
-vec2 inverseNoiseTextureDimensions = vec2(noiseTextureRows / textureSliceWidthSquared,
-                                          inverseNoiseTextureRows / textureSliceWidth);
-
 vec2 voxelToUV(vec3 voxelIndex) {
+    float textureSliceWidth = u_noiseTextureDimensions.x;
+    float noiseTextureRows = u_noiseTextureDimensions.y;
+    float inverseNoiseTextureRows = u_noiseTextureDimensions.z;
+
+    float textureSliceWidthSquared = textureSliceWidth * textureSliceWidth;
+    vec2 inverseNoiseTextureDimensions = vec2(noiseTextureRows / textureSliceWidthSquared,
+                                            inverseNoiseTextureRows / textureSliceWidth);
     vec3 wrappedIndex = wrapVec(voxelIndex, textureSliceWidth);
     float column = mod(wrappedIndex.z, textureSliceWidth * inverseNoiseTextureRows);
     float row = floor(wrappedIndex.z / textureSliceWidth * noiseTextureRows);
@@ -44,12 +43,13 @@ vec2 voxelToUV(vec3 voxelIndex) {
 vec4 lerpSamplesX(vec3 voxelIndex, float x) {
     vec2 uv0 = voxelToUV(voxelIndex);
     vec2 uv1 = voxelToUV(voxelIndex + vec3(1.0, 0.0, 0.0));
-    vec4 sample0 = texture2D(u_noiseTexture, uv0);
-    vec4 sample1 = texture2D(u_noiseTexture, uv1);
+    vec4 sample0 = texture(u_noiseTexture, uv0);
+    vec4 sample1 = texture(u_noiseTexture, uv1);
     return mix(sample0, sample1, x);
 }
 
 vec4 sampleNoiseTexture(vec3 position) {
+    float textureSliceWidth = u_noiseTextureDimensions.x;
     vec3 recenteredPos = position + vec3(textureSliceWidth / 2.0);
     vec3 lerpValue = fract(recenteredPos);
     vec3 voxelIndex = floor(recenteredPos);
@@ -231,7 +231,7 @@ vec4 drawCloud(vec3 rayOrigin, vec3 rayDir, vec3 cloudCenter, vec3 cloudScale, f
 
 void main() {
 #ifdef DEBUG_BILLBOARDS
-    gl_FragColor = vec4(0.0, 0.5, 0.5, 1.0);
+    out_FragColor = vec4(0.0, 0.5, 0.5, 1.0);
 #endif
     // To avoid calculations with high values,
     // we raycast from an arbitrarily smaller space.
@@ -248,7 +248,7 @@ void main() {
     vec3 point, normal;
     if(intersectEllipsoid(rayOrigin, rayDir, ellipsoidCenter, ellipsoidScale, v_slice,
                           point, normal)) {
-        gl_FragColor = v_brightness * v_color;
+        out_FragColor = v_brightness * v_color;
     }
 #else
 #ifndef DEBUG_BILLBOARDS
@@ -257,7 +257,7 @@ void main() {
     if(cloud.w < 0.01) {
         discard;
     }
-    gl_FragColor = cloud;
+    out_FragColor = cloud;
 #endif
 #endif
 }

package/Source/Shaders/CloudCollectionFS.js

@@ -2,11 +2,11 @@
 export default "uniform sampler2D u_noiseTexture;\n\
 uniform vec3 u_noiseTextureDimensions;\n\
 uniform float u_noiseDetail;\n\
-varying vec2 v_offset;\n\
-varying vec3 v_maximumSize;\n\
-varying vec4 v_color;\n\
-varying float v_slice;\n\
-varying float v_brightness;\n\
+in vec2 v_offset;\n\
+in vec3 v_maximumSize;\n\
+in vec4 v_color;\n\
+in float v_slice;\n\
+in float v_brightness;\n\
 \n\
 float wrap(float value, float rangeLength) {\n\
     if(value < 0.0) {\n\
@@ -23,15 +23,14 @@ vec3 wrapVec(vec3 value, float rangeLength) {\n\
                 wrap(value.z, rangeLength));\n\
 }\n\
 \n\
-float textureSliceWidth = u_noiseTextureDimensions.x;\n\
-float noiseTextureRows = u_noiseTextureDimensions.y;\n\
-float inverseNoiseTextureRows = u_noiseTextureDimensions.z;\n\
-\n\
-float textureSliceWidthSquared = textureSliceWidth * textureSliceWidth;\n\
-vec2 inverseNoiseTextureDimensions = vec2(noiseTextureRows / textureSliceWidthSquared,\n\
-                                          inverseNoiseTextureRows / textureSliceWidth);\n\
-\n\
 vec2 voxelToUV(vec3 voxelIndex) {\n\
+    float textureSliceWidth = u_noiseTextureDimensions.x;\n\
+    float noiseTextureRows = u_noiseTextureDimensions.y;\n\
+    float inverseNoiseTextureRows = u_noiseTextureDimensions.z;\n\
+\n\
+    float textureSliceWidthSquared = textureSliceWidth * textureSliceWidth;\n\
+    vec2 inverseNoiseTextureDimensions = vec2(noiseTextureRows / textureSliceWidthSquared,\n\
+                                            inverseNoiseTextureRows / textureSliceWidth);\n\
     vec3 wrappedIndex = wrapVec(voxelIndex, textureSliceWidth);\n\
     float column = mod(wrappedIndex.z, textureSliceWidth * inverseNoiseTextureRows);\n\
     float row = floor(wrappedIndex.z / textureSliceWidth * noiseTextureRows);\n\
@@ -45,12 +44,13 @@ vec2 voxelToUV(vec3 voxelIndex) {\n\
 vec4 lerpSamplesX(vec3 voxelIndex, float x) {\n\
     vec2 uv0 = voxelToUV(voxelIndex);\n\
     vec2 uv1 = voxelToUV(voxelIndex + vec3(1.0, 0.0, 0.0));\n\
-    vec4 sample0 = texture2D(u_noiseTexture, uv0);\n\
-    vec4 sample1 = texture2D(u_noiseTexture, uv1);\n\
+    vec4 sample0 = texture(u_noiseTexture, uv0);\n\
+    vec4 sample1 = texture(u_noiseTexture, uv1);\n\
     return mix(sample0, sample1, x);\n\
 }\n\
 \n\
 vec4 sampleNoiseTexture(vec3 position) {\n\
+    float textureSliceWidth = u_noiseTextureDimensions.x;\n\
     vec3 recenteredPos = position + vec3(textureSliceWidth / 2.0);\n\
     vec3 lerpValue = fract(recenteredPos);\n\
     vec3 voxelIndex = floor(recenteredPos);\n\
@@ -232,7 +232,7 @@ vec4 drawCloud(vec3 rayOrigin, vec3 rayDir, vec3 cloudCenter, vec3 cloudScale, f
 \n\
 void main() {\n\
 #ifdef DEBUG_BILLBOARDS\n\
-    gl_FragColor = vec4(0.0, 0.5, 0.5, 1.0);\n\
+    out_FragColor = vec4(0.0, 0.5, 0.5, 1.0);\n\
 #endif\n\
     // To avoid calculations with high values,\n\
     // we raycast from an arbitrarily smaller space.\n\
@@ -249,7 +249,7 @@ void main() {\n\
     vec3 point, normal;\n\
     if(intersectEllipsoid(rayOrigin, rayDir, ellipsoidCenter, ellipsoidScale, v_slice,\n\
                           point, normal)) {\n\
-        gl_FragColor = v_brightness * v_color;\n\
+        out_FragColor = v_brightness * v_color;\n\
     }\n\
 #else\n\
 #ifndef DEBUG_BILLBOARDS\n\
@@ -258,7 +258,7 @@ void main() {\n\
     if(cloud.w < 0.01) {\n\
         discard;\n\
     }\n\
-    gl_FragColor = cloud;\n\
+    out_FragColor = cloud;\n\
 #endif\n\
 #endif\n\
 }\n\

package/Source/Shaders/CloudCollectionVS.glsl

@@ -1,17 +1,17 @@
 #ifdef INSTANCED
-attribute vec2 direction;
+in vec2 direction;
 #endif
-attribute vec4 positionHighAndScaleX;
-attribute vec4 positionLowAndScaleY;
-attribute vec4 packedAttribute0;
-attribute vec4 packedAttribute1;
-attribute vec4 color;
+in vec4 positionHighAndScaleX;
+in vec4 positionLowAndScaleY;
+in vec4 packedAttribute0;
+in vec4 packedAttribute1;
+in vec4 color;
 
-varying vec2 v_offset;
-varying vec3 v_maximumSize;
-varying vec4 v_color;
-varying float v_slice;
-varying float v_brightness;
+out vec2 v_offset;
+out vec3 v_maximumSize;
+out vec4 v_color;
+out float v_slice;
+out float v_brightness;
 
 void main() {
     // Unpack attributes.

package/Source/Shaders/CloudCollectionVS.js

@@ -1,18 +1,18 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "#ifdef INSTANCED\n\
-attribute vec2 direction;\n\
+in vec2 direction;\n\
 #endif\n\
-attribute vec4 positionHighAndScaleX;\n\
-attribute vec4 positionLowAndScaleY;\n\
-attribute vec4 packedAttribute0;\n\
-attribute vec4 packedAttribute1;\n\
-attribute vec4 color;\n\
+in vec4 positionHighAndScaleX;\n\
+in vec4 positionLowAndScaleY;\n\
+in vec4 packedAttribute0;\n\
+in vec4 packedAttribute1;\n\
+in vec4 color;\n\
 \n\
-varying vec2 v_offset;\n\
-varying vec3 v_maximumSize;\n\
-varying vec4 v_color;\n\
-varying float v_slice;\n\
-varying float v_brightness;\n\
+out vec2 v_offset;\n\
+out vec3 v_maximumSize;\n\
+out vec4 v_color;\n\
+out float v_slice;\n\
+out float v_brightness;\n\
 \n\
 void main() {\n\
     // Unpack attributes.\n\

package/Source/Shaders/CloudNoiseFS.glsl

@@ -1,10 +1,7 @@
 uniform vec3 u_noiseTextureDimensions;
 uniform float u_noiseDetail;
 uniform vec3 u_noiseOffset;
-varying vec2 v_position;
-
-float textureSliceWidth = u_noiseTextureDimensions.x;
-float inverseNoiseTextureRows = u_noiseTextureDimensions.z;
+in vec2 v_position;
 
 float wrap(float value, float rangeLength) {
     if(value < 0.0) {
@@ -30,6 +27,7 @@ vec3 random3(vec3 p) {
 // Frequency corresponds to cell size.
 // The higher the frequency, the smaller the cell size.
 vec3 getWorleyCellPoint(vec3 centerCell, vec3 offset, float freq) {
+    float textureSliceWidth = u_noiseTextureDimensions.x;
     vec3 cell = centerCell + offset;
     cell = wrapVec(cell, textureSliceWidth / u_noiseDetail);
     cell += floor(u_noiseOffset / u_noiseDetail);
@@ -78,6 +76,8 @@ float worleyFBMNoise(vec3 p, float octaves, float scale) {
 }
 
 void main() {
+    float textureSliceWidth = u_noiseTextureDimensions.x;
+    float inverseNoiseTextureRows = u_noiseTextureDimensions.z;
     float x = mod(v_position.x, textureSliceWidth);
     float y = mod(v_position.y, textureSliceWidth);
     float sliceRow = floor(v_position.y / textureSliceWidth);
@@ -88,5 +88,5 @@ void main() {
     float worley0 = clamp(worleyFBMNoise(position, 3.0, 1.0), 0.0, 1.0);
     float worley1 = clamp(worleyFBMNoise(position, 3.0, 2.0), 0.0, 1.0);
     float worley2 = clamp(worleyFBMNoise(position, 3.0, 3.0), 0.0, 1.0);
-    gl_FragColor = vec4(worley0, worley1, worley2, 1.0);
+    out_FragColor = vec4(worley0, worley1, worley2, 1.0);
 }

package/Source/Shaders/CloudNoiseFS.js

@@ -2,10 +2,7 @@
 export default "uniform vec3 u_noiseTextureDimensions;\n\
 uniform float u_noiseDetail;\n\
 uniform vec3 u_noiseOffset;\n\
-varying vec2 v_position;\n\
-\n\
-float textureSliceWidth = u_noiseTextureDimensions.x;\n\
-float inverseNoiseTextureRows = u_noiseTextureDimensions.z;\n\
+in vec2 v_position;\n\
 \n\
 float wrap(float value, float rangeLength) {\n\
     if(value < 0.0) {\n\
@@ -31,6 +28,7 @@ vec3 random3(vec3 p) {\n\
 // Frequency corresponds to cell size.\n\
 // The higher the frequency, the smaller the cell size.\n\
 vec3 getWorleyCellPoint(vec3 centerCell, vec3 offset, float freq) {\n\
+    float textureSliceWidth = u_noiseTextureDimensions.x;\n\
     vec3 cell = centerCell + offset;\n\
     cell = wrapVec(cell, textureSliceWidth / u_noiseDetail);\n\
     cell += floor(u_noiseOffset / u_noiseDetail);\n\
@@ -79,6 +77,8 @@ float worleyFBMNoise(vec3 p, float octaves, float scale) {\n\
 }\n\
 \n\
 void main() {\n\
+    float textureSliceWidth = u_noiseTextureDimensions.x;\n\
+    float inverseNoiseTextureRows = u_noiseTextureDimensions.z;\n\
     float x = mod(v_position.x, textureSliceWidth);\n\
     float y = mod(v_position.y, textureSliceWidth);\n\
     float sliceRow = floor(v_position.y / textureSliceWidth);\n\
@@ -89,6 +89,6 @@ void main() {\n\
     float worley0 = clamp(worleyFBMNoise(position, 3.0, 1.0), 0.0, 1.0);\n\
     float worley1 = clamp(worleyFBMNoise(position, 3.0, 2.0), 0.0, 1.0);\n\
     float worley2 = clamp(worleyFBMNoise(position, 3.0, 3.0), 0.0, 1.0);\n\
-    gl_FragColor = vec4(worley0, worley1, worley2, 1.0);\n\
+    out_FragColor = vec4(worley0, worley1, worley2, 1.0);\n\
 }\n\
 ";

package/Source/Shaders/CloudNoiseVS.glsl

@@ -1,7 +1,7 @@
 uniform vec3 u_noiseTextureDimensions;
-attribute vec2 position;
+in vec2 position;
 
-varying vec2 v_position;
+out vec2 v_position;
 
 void main()
 {

package/Source/Shaders/CloudNoiseVS.js

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

package/Source/Shaders/CompareAndPackTranslucentDepth.glsl

@@ -1,12 +1,12 @@
 uniform sampler2D u_opaqueDepthTexture;
 uniform sampler2D u_translucentDepthTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    float opaqueDepth = texture2D(u_opaqueDepthTexture, v_textureCoordinates).r;
-    float translucentDepth = texture2D(u_translucentDepthTexture, v_textureCoordinates).r;
+    float opaqueDepth = texture(u_opaqueDepthTexture, v_textureCoordinates).r;
+    float translucentDepth = texture(u_translucentDepthTexture, v_textureCoordinates).r;
     translucentDepth = czm_branchFreeTernary(translucentDepth > opaqueDepth, 1.0, translucentDepth);
-    gl_FragColor = czm_packDepth(translucentDepth);
+    out_FragColor = czm_packDepth(translucentDepth);
 }

package/Source/Shaders/CompareAndPackTranslucentDepth.js

@@ -2,13 +2,13 @@
 export default "uniform sampler2D u_opaqueDepthTexture;\n\
 uniform sampler2D u_translucentDepthTexture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    float opaqueDepth = texture2D(u_opaqueDepthTexture, v_textureCoordinates).r;\n\
-    float translucentDepth = texture2D(u_translucentDepthTexture, v_textureCoordinates).r;\n\
+    float opaqueDepth = texture(u_opaqueDepthTexture, v_textureCoordinates).r;\n\
+    float translucentDepth = texture(u_translucentDepthTexture, v_textureCoordinates).r;\n\
     translucentDepth = czm_branchFreeTernary(translucentDepth > opaqueDepth, 1.0, translucentDepth);\n\
-    gl_FragColor = czm_packDepth(translucentDepth);\n\
+    out_FragColor = czm_packDepth(translucentDepth);\n\
 }\n\
 ";

package/Source/Shaders/CompositeOITFS.glsl

@@ -8,13 +8,13 @@ uniform sampler2D u_opaque;
 uniform sampler2D u_accumulation;
 uniform sampler2D u_revealage;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    vec4 opaque = texture2D(u_opaque, v_textureCoordinates);
-    vec4 accum = texture2D(u_accumulation, v_textureCoordinates);
-    float r = texture2D(u_revealage, v_textureCoordinates).r;
+    vec4 opaque = texture(u_opaque, v_textureCoordinates);
+    vec4 accum = texture(u_accumulation, v_textureCoordinates);
+    float r = texture(u_revealage, v_textureCoordinates).r;
 
 #ifdef MRT
     vec4 transparent = vec4(accum.rgb / clamp(r, 1e-4, 5e4), accum.a);
@@ -22,10 +22,10 @@ void main()
     vec4 transparent = vec4(accum.rgb / clamp(accum.a, 1e-4, 5e4), r);
 #endif
 
-    gl_FragColor = (1.0 - transparent.a) * transparent + transparent.a * opaque;
+    out_FragColor = (1.0 - transparent.a) * transparent + transparent.a * opaque;
 
     if (opaque != czm_backgroundColor)
     {
-        gl_FragColor.a = 1.0;
+        out_FragColor.a = 1.0;
     }
 }

package/Source/Shaders/CompositeOITFS.js

@@ -9,13 +9,13 @@ uniform sampler2D u_opaque;\n\
 uniform sampler2D u_accumulation;\n\
 uniform sampler2D u_revealage;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    vec4 opaque = texture2D(u_opaque, v_textureCoordinates);\n\
-    vec4 accum = texture2D(u_accumulation, v_textureCoordinates);\n\
-    float r = texture2D(u_revealage, v_textureCoordinates).r;\n\
+    vec4 opaque = texture(u_opaque, v_textureCoordinates);\n\
+    vec4 accum = texture(u_accumulation, v_textureCoordinates);\n\
+    float r = texture(u_revealage, v_textureCoordinates).r;\n\
 \n\
 #ifdef MRT\n\
     vec4 transparent = vec4(accum.rgb / clamp(r, 1e-4, 5e4), accum.a);\n\
@@ -23,11 +23,11 @@ void main()\n\
     vec4 transparent = vec4(accum.rgb / clamp(accum.a, 1e-4, 5e4), r);\n\
 #endif\n\
 \n\
-    gl_FragColor = (1.0 - transparent.a) * transparent + transparent.a * opaque;\n\
+    out_FragColor = (1.0 - transparent.a) * transparent + transparent.a * opaque;\n\
 \n\
     if (opaque != czm_backgroundColor)\n\
     {\n\
-        gl_FragColor.a = 1.0;\n\
+        out_FragColor.a = 1.0;\n\
     }\n\
 }\n\
 ";

package/Source/Shaders/DepthPlaneFS.glsl

@@ -1,4 +1,4 @@
-varying vec4 positionEC;
+in vec4 positionEC;
 
 void main()
 {
@@ -25,7 +25,7 @@ void main()
     czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid_center, czm_ellipsoidInverseRadii);
     if (!czm_isEmpty(intersection))
     {
-        gl_FragColor = vec4(1.0, 1.0, 0.0, 1.0);
+        out_FragColor = vec4(1.0, 1.0, 0.0, 1.0);
     }
     else
     {

package/Source/Shaders/DepthPlaneFS.js

@@ -1,5 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec4 positionEC;\n\
+export default "in vec4 positionEC;\n\
 \n\
 void main()\n\
 {\n\
@@ -26,7 +26,7 @@ void main()\n\
     czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid_center, czm_ellipsoidInverseRadii);\n\
     if (!czm_isEmpty(intersection))\n\
     {\n\
-        gl_FragColor = vec4(1.0, 1.0, 0.0, 1.0);\n\
+        out_FragColor = vec4(1.0, 1.0, 0.0, 1.0);\n\
     }\n\
     else\n\
     {\n\

package/Source/Shaders/DepthPlaneVS.glsl

@@ -1,6 +1,6 @@
-attribute vec4 position;
+in vec4 position;
 
-varying vec4 positionEC;
+out vec4 positionEC;
 
 void main()
 {

package/Source/Shaders/DepthPlaneVS.js

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

package/Source/Shaders/EllipsoidFS.glsl

@@ -1,13 +1,7 @@
-#ifdef WRITE_DEPTH
-#ifdef GL_EXT_frag_depth
-#extension GL_EXT_frag_depth : enable
-#endif
-#endif
-
 uniform vec3 u_radii;
 uniform vec3 u_oneOverEllipsoidRadiiSquared;
 
-varying vec3 v_positionEC;
+in vec3 v_positionEC;
 
 vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)
 {
@@ -89,11 +83,10 @@ void main()
     // If the viewer either is inside or can see inside, compute insideFaceColor, with normals facing inward.
     vec4 insideFaceColor = (outsideFaceColor.a < 1.0) ? computeEllipsoidColor(ray, intersection.stop, -1.0) : vec4(0.0);
 
-    gl_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);
-    gl_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);
+    out_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);
+    out_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);
 
-#ifdef WRITE_DEPTH
-#ifdef GL_EXT_frag_depth
+#if (defined(WRITE_DEPTH) && (__VERSION__ == 300 || defined(GL_EXT_frag_depth)))
     t = (intersection.start != 0.0) ? intersection.start : intersection.stop;
     vec3 positionEC = czm_pointAlongRay(ray, t);
     vec4 positionCC = czm_projection * vec4(positionEC, 1.0);
@@ -105,8 +98,7 @@ void main()
     float n = czm_depthRange.near;
     float f = czm_depthRange.far;
 
-    gl_FragDepthEXT = (z * (f - n) + f + n) * 0.5;
-#endif
+    gl_FragDepth = (z * (f - n) + f + n) * 0.5;
 #endif
 #endif
 }

package/Source/Shaders/EllipsoidFS.js

@@ -1,14 +1,8 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "#ifdef WRITE_DEPTH\n\
-#ifdef GL_EXT_frag_depth\n\
-#extension GL_EXT_frag_depth : enable\n\
-#endif\n\
-#endif\n\
-\n\
-uniform vec3 u_radii;\n\
+export default "uniform vec3 u_radii;\n\
 uniform vec3 u_oneOverEllipsoidRadiiSquared;\n\
 \n\
-varying vec3 v_positionEC;\n\
+in vec3 v_positionEC;\n\
 \n\
 vec4 computeEllipsoidColor(czm_ray ray, float intersection, float side)\n\
 {\n\
@@ -90,11 +84,10 @@ void main()\n\
     // If the viewer either is inside or can see inside, compute insideFaceColor, with normals facing inward.\n\
     vec4 insideFaceColor = (outsideFaceColor.a < 1.0) ? computeEllipsoidColor(ray, intersection.stop, -1.0) : vec4(0.0);\n\
 \n\
-    gl_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);\n\
-    gl_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);\n\
+    out_FragColor = mix(insideFaceColor, outsideFaceColor, outsideFaceColor.a);\n\
+    out_FragColor.a = 1.0 - (1.0 - insideFaceColor.a) * (1.0 - outsideFaceColor.a);\n\
 \n\
-#ifdef WRITE_DEPTH\n\
-#ifdef GL_EXT_frag_depth\n\
+#if (defined(WRITE_DEPTH) && (__VERSION__ == 300 || defined(GL_EXT_frag_depth)))\n\
     t = (intersection.start != 0.0) ? intersection.start : intersection.stop;\n\
     vec3 positionEC = czm_pointAlongRay(ray, t);\n\
     vec4 positionCC = czm_projection * vec4(positionEC, 1.0);\n\
@@ -106,8 +99,7 @@ void main()\n\
     float n = czm_depthRange.near;\n\
     float f = czm_depthRange.far;\n\
 \n\
-    gl_FragDepthEXT = (z * (f - n) + f + n) * 0.5;\n\
-#endif\n\
+    gl_FragDepth = (z * (f - n) + f + n) * 0.5;\n\
 #endif\n\
 #endif\n\
 }\n\

package/Source/Shaders/EllipsoidVS.glsl

@@ -1,8 +1,8 @@
-attribute vec3 position;
+in vec3 position;
 
 uniform vec3 u_radii;
 
-varying vec3 v_positionEC;
+out vec3 v_positionEC;
 
 void main()
 {

package/Source/Shaders/EllipsoidVS.js

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