@cesium/engine 1.1.0 → 2.0.0

package/Source/Shaders/Appearances/TexturedMaterialAppearanceFS.js

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec2 v_st;\n\
+export default "in vec3 v_positionEC;\n\
+in vec3 v_normalEC;\n\
+in vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\
@@ -19,9 +19,9 @@ void main()\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\n\
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
 #endif\n\
 }\n\
 ";

package/Source/Shaders/Appearances/TexturedMaterialAppearanceVS.glsl

@@ -1,12 +1,12 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 normal;
-attribute vec2 st;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 normal;
+in vec2 st;
+in float batchId;
 
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec2 v_st;
+out vec3 v_positionEC;
+out vec3 v_normalEC;
+out vec2 v_st;
 
 void main()
 {

package/Source/Shaders/Appearances/TexturedMaterialAppearanceVS.js

@@ -1,13 +1,13 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 normal;\n\
-attribute vec2 st;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 normal;\n\
+in vec2 st;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec2 v_st;\n\
+out vec3 v_positionEC;\n\
+out vec3 v_normalEC;\n\
+out vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/BillboardCollectionFS.glsl

@@ -8,20 +8,20 @@ uniform sampler2D u_atlas;
 uniform vec4 u_highlightColor;
 #endif
 
-varying vec2 v_textureCoordinates;
-varying vec4 v_pickColor;
-varying vec4 v_color;
+in vec2 v_textureCoordinates;
+in vec4 v_pickColor;
+in vec4 v_color;
 
 #ifdef SDF
-varying vec4 v_outlineColor;
-varying float v_outlineWidth;
+in vec4 v_outlineColor;
+in float v_outlineWidth;
 #endif
 
 #ifdef FRAGMENT_DEPTH_CHECK
-varying vec4 v_textureCoordinateBounds;                  // the min and max x and y values for the texture coordinates
-varying vec4 v_originTextureCoordinateAndTranslate;      // texture coordinate at the origin, billboard translate (used for label glyphs)
-varying vec4 v_compressed;                               // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
-varying mat2 v_rotationMatrix;
+in vec4 v_textureCoordinateBounds;                  // the min and max x and y values for the texture coordinates
+in vec4 v_originTextureCoordinateAndTranslate;      // texture coordinate at the origin, billboard translate (used for label glyphs)
+in vec4 v_compressed;                               // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
+in mat2 v_rotationMatrix;
 
 const float SHIFT_LEFT12 = 4096.0;
 const float SHIFT_LEFT1 = 2.0;
@@ -45,7 +45,7 @@ float getGlobeDepth(vec2 adjustedST, vec2 depthLookupST, bool applyTranslate, ve
     }
 
     vec2 st = ((lookupVector - translation + labelOffset) + gl_FragCoord.xy) / czm_viewport.zw;
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, st));
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, st));
 
     if (logDepthOrDepth == 0.0)
     {
@@ -63,7 +63,7 @@ float getGlobeDepth(vec2 adjustedST, vec2 depthLookupST, bool applyTranslate, ve
 // Get the distance from the edge of a glyph at a given position sampling an SDF texture.
 float getDistance(vec2 position)
 {
-    return texture2D(u_atlas, position).r;
+    return texture(u_atlas, position).r;
 }
 
 // Samples the sdf texture at the given position and produces a color based on the fill color and the outline.
@@ -90,7 +90,7 @@ vec4 getSDFColor(vec2 position, float outlineWidth, vec4 outlineColor, float smo
 
 void main()
 {
-    vec4 color = texture2D(u_atlas, v_textureCoordinates);
+    vec4 color = texture(u_atlas, v_textureCoordinates);
 
 #ifdef SDF
     float outlineWidth = v_outlineWidth;
@@ -99,7 +99,7 @@ void main()
     // Get the current distance
     float distance = getDistance(v_textureCoordinates);
 
-#ifdef GL_OES_standard_derivatives
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
     float smoothing = fwidth(distance);
     // Get an offset that is approximately half the distance to the neighbor pixels
     // 0.354 is approximately half of 1/sqrt(2)
@@ -117,7 +117,7 @@ void main()
     // Equally weight the center sample and the 4 neighboring samples
     color = (center + color1 + color2 + color3 + color4)/5.0;
 #else
-    // Just do a single sample
+    // If no derivatives available (IE 10?), just do a single sample
     float smoothing = 1.0/32.0;
     color = getSDFColor(v_textureCoordinates, outlineWidth, outlineColor, smoothing);
 #endif
@@ -153,7 +153,7 @@ void main()
 #ifdef VECTOR_TILE
     color *= u_highlightColor;
 #endif
-    gl_FragColor = color;
+    out_FragColor = color;
 
 #ifdef LOG_DEPTH
     czm_writeLogDepth();

package/Source/Shaders/BillboardCollectionFS.js

@@ -9,20 +9,20 @@ uniform sampler2D u_atlas;\n\
 uniform vec4 u_highlightColor;\n\
 #endif\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
-varying vec4 v_pickColor;\n\
-varying vec4 v_color;\n\
+in vec2 v_textureCoordinates;\n\
+in vec4 v_pickColor;\n\
+in vec4 v_color;\n\
 \n\
 #ifdef SDF\n\
-varying vec4 v_outlineColor;\n\
-varying float v_outlineWidth;\n\
+in vec4 v_outlineColor;\n\
+in float v_outlineWidth;\n\
 #endif\n\
 \n\
 #ifdef FRAGMENT_DEPTH_CHECK\n\
-varying vec4 v_textureCoordinateBounds;                  // the min and max x and y values for the texture coordinates\n\
-varying vec4 v_originTextureCoordinateAndTranslate;      // texture coordinate at the origin, billboard translate (used for label glyphs)\n\
-varying vec4 v_compressed;                               // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
-varying mat2 v_rotationMatrix;\n\
+in vec4 v_textureCoordinateBounds;                  // the min and max x and y values for the texture coordinates\n\
+in vec4 v_originTextureCoordinateAndTranslate;      // texture coordinate at the origin, billboard translate (used for label glyphs)\n\
+in vec4 v_compressed;                               // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
+in mat2 v_rotationMatrix;\n\
 \n\
 const float SHIFT_LEFT12 = 4096.0;\n\
 const float SHIFT_LEFT1 = 2.0;\n\
@@ -46,7 +46,7 @@ float getGlobeDepth(vec2 adjustedST, vec2 depthLookupST, bool applyTranslate, ve
     }\n\
 \n\
     vec2 st = ((lookupVector - translation + labelOffset) + gl_FragCoord.xy) / czm_viewport.zw;\n\
-    float logDepthOrDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, st));\n\
+    float logDepthOrDepth = czm_unpackDepth(texture(czm_globeDepthTexture, st));\n\
 \n\
     if (logDepthOrDepth == 0.0)\n\
     {\n\
@@ -64,7 +64,7 @@ float getGlobeDepth(vec2 adjustedST, vec2 depthLookupST, bool applyTranslate, ve
 // Get the distance from the edge of a glyph at a given position sampling an SDF texture.\n\
 float getDistance(vec2 position)\n\
 {\n\
-    return texture2D(u_atlas, position).r;\n\
+    return texture(u_atlas, position).r;\n\
 }\n\
 \n\
 // Samples the sdf texture at the given position and produces a color based on the fill color and the outline.\n\
@@ -91,7 +91,7 @@ vec4 getSDFColor(vec2 position, float outlineWidth, vec4 outlineColor, float smo
 \n\
 void main()\n\
 {\n\
-    vec4 color = texture2D(u_atlas, v_textureCoordinates);\n\
+    vec4 color = texture(u_atlas, v_textureCoordinates);\n\
 \n\
 #ifdef SDF\n\
     float outlineWidth = v_outlineWidth;\n\
@@ -100,7 +100,7 @@ void main()\n\
     // Get the current distance\n\
     float distance = getDistance(v_textureCoordinates);\n\
 \n\
-#ifdef GL_OES_standard_derivatives\n\
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))\n\
     float smoothing = fwidth(distance);\n\
     // Get an offset that is approximately half the distance to the neighbor pixels\n\
     // 0.354 is approximately half of 1/sqrt(2)\n\
@@ -118,7 +118,7 @@ void main()\n\
     // Equally weight the center sample and the 4 neighboring samples\n\
     color = (center + color1 + color2 + color3 + color4)/5.0;\n\
 #else\n\
-    // Just do a single sample\n\
+    // If no derivatives available (IE 10?), just do a single sample\n\
     float smoothing = 1.0/32.0;\n\
     color = getSDFColor(v_textureCoordinates, outlineWidth, outlineColor, smoothing);\n\
 #endif\n\
@@ -154,7 +154,7 @@ void main()\n\
 #ifdef VECTOR_TILE\n\
     color *= u_highlightColor;\n\
 #endif\n\
-    gl_FragColor = color;\n\
+    out_FragColor = color;\n\
 \n\
 #ifdef LOG_DEPTH\n\
     czm_writeLogDepth();\n\

package/Source/Shaders/BillboardCollectionVS.glsl

@@ -1,36 +1,36 @@
 #ifdef INSTANCED
-attribute vec2 direction;
+in vec2 direction;
 #endif
-attribute vec4 positionHighAndScale;
-attribute vec4 positionLowAndRotation;
-attribute vec4 compressedAttribute0;                       // pixel offset, translate, horizontal origin, vertical origin, show, direction, texture coordinates (texture offset)
-attribute vec4 compressedAttribute1;                       // aligned axis, translucency by distance, image width
-attribute vec4 compressedAttribute2;                       // label horizontal origin, image height, color, pick color, size in meters, valid aligned axis, 13 bits free
-attribute vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)
-attribute vec4 scaleByDistance;                            // near, nearScale, far, farScale
-attribute vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale
-attribute vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions
-attribute vec2 sdf;                                        // sdf outline color (rgb) and width (w)
+in vec4 positionHighAndScale;
+in vec4 positionLowAndRotation;
+in vec4 compressedAttribute0;                       // pixel offset, translate, horizontal origin, vertical origin, show, direction, texture coordinates (texture offset)
+in vec4 compressedAttribute1;                       // aligned axis, translucency by distance, image width
+in vec4 compressedAttribute2;                       // label horizontal origin, image height, color, pick color, size in meters, valid aligned axis, 13 bits free
+in vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)
+in vec4 scaleByDistance;                            // near, nearScale, far, farScale
+in vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale
+in vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions
+in vec2 sdf;                                        // sdf outline color (rgb) and width (w)
 #if defined(VERTEX_DEPTH_CHECK) || defined(FRAGMENT_DEPTH_CHECK)
-attribute vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates
+in vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates
 #endif
 #ifdef VECTOR_TILE
-attribute float a_batchId;
+in float a_batchId;
 #endif
 
-varying vec2 v_textureCoordinates;
+out vec2 v_textureCoordinates;
 #ifdef FRAGMENT_DEPTH_CHECK
-varying vec4 v_textureCoordinateBounds;
-varying vec4 v_originTextureCoordinateAndTranslate;
-varying vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
-varying mat2 v_rotationMatrix;
+out vec4 v_textureCoordinateBounds;
+out vec4 v_originTextureCoordinateAndTranslate;
+out vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize
+out mat2 v_rotationMatrix;
 #endif
 
-varying vec4 v_pickColor;
-varying vec4 v_color;
+out vec4 v_pickColor;
+out vec4 v_color;
 #ifdef SDF
-varying vec4 v_outlineColor;
-varying float v_outlineWidth;
+out vec4 v_outlineColor;
+out float v_outlineWidth;
 #endif
 
 const float UPPER_BOUND = 32768.0;
@@ -95,7 +95,7 @@ float getGlobeDepth(vec4 positionEC)
 {
     vec4 posWC = czm_eyeToWindowCoordinates(positionEC);
 
-    float globeDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, posWC.xy / czm_viewport.zw));
+    float globeDepth = czm_unpackDepth(texture(czm_globeDepthTexture, posWC.xy / czm_viewport.zw));
 
     if (globeDepth == 0.0)
     {

package/Source/Shaders/BillboardCollectionVS.js

@@ -1,37 +1,37 @@
 //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 positionHighAndScale;\n\
-attribute vec4 positionLowAndRotation;\n\
-attribute vec4 compressedAttribute0;                       // pixel offset, translate, horizontal origin, vertical origin, show, direction, texture coordinates (texture offset)\n\
-attribute vec4 compressedAttribute1;                       // aligned axis, translucency by distance, image width\n\
-attribute vec4 compressedAttribute2;                       // label horizontal origin, image height, color, pick color, size in meters, valid aligned axis, 13 bits free\n\
-attribute vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)\n\
-attribute vec4 scaleByDistance;                            // near, nearScale, far, farScale\n\
-attribute vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale\n\
-attribute vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions\n\
-attribute vec2 sdf;                                        // sdf outline color (rgb) and width (w)\n\
+in vec4 positionHighAndScale;\n\
+in vec4 positionLowAndRotation;\n\
+in vec4 compressedAttribute0;                       // pixel offset, translate, horizontal origin, vertical origin, show, direction, texture coordinates (texture offset)\n\
+in vec4 compressedAttribute1;                       // aligned axis, translucency by distance, image width\n\
+in vec4 compressedAttribute2;                       // label horizontal origin, image height, color, pick color, size in meters, valid aligned axis, 13 bits free\n\
+in vec4 eyeOffset;                                  // eye offset in meters, 4 bytes free (texture range)\n\
+in vec4 scaleByDistance;                            // near, nearScale, far, farScale\n\
+in vec4 pixelOffsetScaleByDistance;                 // near, nearScale, far, farScale\n\
+in vec4 compressedAttribute3;                       // distance display condition near, far, disableDepthTestDistance, dimensions\n\
+in vec2 sdf;                                        // sdf outline color (rgb) and width (w)\n\
 #if defined(VERTEX_DEPTH_CHECK) || defined(FRAGMENT_DEPTH_CHECK)\n\
-attribute vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates\n\
+in vec4 textureCoordinateBoundsOrLabelTranslate;    // the min and max x and y values for the texture coordinates\n\
 #endif\n\
 #ifdef VECTOR_TILE\n\
-attribute float a_batchId;\n\
+in float a_batchId;\n\
 #endif\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+out vec2 v_textureCoordinates;\n\
 #ifdef FRAGMENT_DEPTH_CHECK\n\
-varying vec4 v_textureCoordinateBounds;\n\
-varying vec4 v_originTextureCoordinateAndTranslate;\n\
-varying vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
-varying mat2 v_rotationMatrix;\n\
+out vec4 v_textureCoordinateBounds;\n\
+out vec4 v_originTextureCoordinateAndTranslate;\n\
+out vec4 v_compressed;                                 // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize\n\
+out mat2 v_rotationMatrix;\n\
 #endif\n\
 \n\
-varying vec4 v_pickColor;\n\
-varying vec4 v_color;\n\
+out vec4 v_pickColor;\n\
+out vec4 v_color;\n\
 #ifdef SDF\n\
-varying vec4 v_outlineColor;\n\
-varying float v_outlineWidth;\n\
+out vec4 v_outlineColor;\n\
+out float v_outlineWidth;\n\
 #endif\n\
 \n\
 const float UPPER_BOUND = 32768.0;\n\
@@ -96,7 +96,7 @@ float getGlobeDepth(vec4 positionEC)\n\
 {\n\
     vec4 posWC = czm_eyeToWindowCoordinates(positionEC);\n\
 \n\
-    float globeDepth = czm_unpackDepth(texture2D(czm_globeDepthTexture, posWC.xy / czm_viewport.zw));\n\
+    float globeDepth = czm_unpackDepth(texture(czm_globeDepthTexture, posWC.xy / czm_viewport.zw));\n\
 \n\
     if (globeDepth == 0.0)\n\
     {\n\

package/Source/Shaders/BrdfLutGeneratorFS.glsl

@@ -1,4 +1,4 @@
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 const float M_PI = 3.141592653589793;
 
 float vdcRadicalInverse(int i)
@@ -79,5 +79,5 @@ vec2 integrateBrdf(float roughness, float NdotV)
 
 void main()
 {
-    gl_FragColor = vec4(integrateBrdf(v_textureCoordinates.y, v_textureCoordinates.x), 0.0, 1.0);
+    out_FragColor = vec4(integrateBrdf(v_textureCoordinates.y, v_textureCoordinates.x), 0.0, 1.0);
 }

package/Source/Shaders/BrdfLutGeneratorFS.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\
 const float M_PI = 3.141592653589793;\n\
 \n\
 float vdcRadicalInverse(int i)\n\
@@ -80,6 +80,6 @@ vec2 integrateBrdf(float roughness, float NdotV)\n\
 \n\
 void main()\n\
 {\n\
-    gl_FragColor = vec4(integrateBrdf(v_textureCoordinates.y, v_textureCoordinates.x), 0.0, 1.0);\n\
+    out_FragColor = vec4(integrateBrdf(v_textureCoordinates.y, v_textureCoordinates.x), 0.0, 1.0);\n\
 }\n\
 ";

package/Source/Shaders/Builtin/CzmBuiltins.js

@@ -116,6 +116,7 @@ import czm_signNotZero from './Functions/signNotZero.js'
 import czm_sphericalHarmonics from './Functions/sphericalHarmonics.js'
 import czm_srgbToLinear from './Functions/srgbToLinear.js'
 import czm_tangentToEyeSpaceMatrix from './Functions/tangentToEyeSpaceMatrix.js'
+import czm_textureCube from './Functions/textureCube.js'
 import czm_transformPlane from './Functions/transformPlane.js'
 import czm_translateRelativeToEye from './Functions/translateRelativeToEye.js'
 import czm_translucentPhong from './Functions/translucentPhong.js'
@@ -248,6 +249,7 @@ export default {
     czm_sphericalHarmonics : czm_sphericalHarmonics,
     czm_srgbToLinear : czm_srgbToLinear,
     czm_tangentToEyeSpaceMatrix : czm_tangentToEyeSpaceMatrix,
+    czm_textureCube : czm_textureCube,
     czm_transformPlane : czm_transformPlane,
     czm_translateRelativeToEye : czm_translateRelativeToEye,
     czm_translucentPhong : czm_translucentPhong,

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

@@ -1,6 +1,6 @@
 // emulated noperspective
-#if defined(GL_EXT_frag_depth) && !defined(LOG_DEPTH)
-varying float v_WindowZ;
+#if (__VERSION__ == 300 || defined(GL_EXT_frag_depth)) && !defined(LOG_DEPTH)
+out float v_WindowZ;
 #endif
 
 /**
@@ -36,7 +36,7 @@ varying float v_WindowZ;
 vec4 czm_depthClamp(vec4 coords)
 {
 #ifndef LOG_DEPTH
-#ifdef GL_EXT_frag_depth
+#if __VERSION__ == 300 || defined(GL_EXT_frag_depth)
     v_WindowZ = (0.5 * (coords.z / coords.w) + 0.5) * coords.w;
     coords.z = 0.0;
 #else

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

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "// emulated noperspective\n\
-#if defined(GL_EXT_frag_depth) && !defined(LOG_DEPTH)\n\
-varying float v_WindowZ;\n\
+#if (__VERSION__ == 300 || defined(GL_EXT_frag_depth)) && !defined(LOG_DEPTH)\n\
+out float v_WindowZ;\n\
 #endif\n\
 \n\
 /**\n\
@@ -37,7 +37,7 @@ varying float v_WindowZ;\n\
 vec4 czm_depthClamp(vec4 coords)\n\
 {\n\
 #ifndef LOG_DEPTH\n\
-#ifdef GL_EXT_frag_depth\n\
+#if __VERSION__ == 300 || defined(GL_EXT_frag_depth)\n\
     v_WindowZ = (0.5 * (coords.z / coords.w) + 0.5) * coords.w;\n\
     coords.z = 0.0;\n\
 #else\n\

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

@@ -27,10 +27,10 @@ vec4 czm_getWaterNoise(sampler2D normalMap, vec2 uv, float time, float angleInRa
     uv1 = fract(uv1);
     uv2 = fract(uv2);
     uv3 = fract(uv3);
-    vec4 noise = (texture2D(normalMap, uv0)) +
-                 (texture2D(normalMap, uv1)) +
-                 (texture2D(normalMap, uv2)) +
-                 (texture2D(normalMap, uv3));
+    vec4 noise = (texture(normalMap, uv0)) +
+                 (texture(normalMap, uv1)) +
+                 (texture(normalMap, uv2)) +
+                 (texture(normalMap, uv3));
 
     // average and scale to between -1 and 1
     return ((noise / 4.0) - 0.5) * 2.0;

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

@@ -28,10 +28,10 @@ vec4 czm_getWaterNoise(sampler2D normalMap, vec2 uv, float time, float angleInRa
     uv1 = fract(uv1);\n\
     uv2 = fract(uv2);\n\
     uv3 = fract(uv3);\n\
-    vec4 noise = (texture2D(normalMap, uv0)) +\n\
-                 (texture2D(normalMap, uv1)) +\n\
-                 (texture2D(normalMap, uv2)) +\n\
-                 (texture2D(normalMap, uv3));\n\
+    vec4 noise = (texture(normalMap, uv0)) +\n\
+                 (texture(normalMap, uv1)) +\n\
+                 (texture(normalMap, uv2)) +\n\
+                 (texture(normalMap, uv3));\n\
 \n\
     // average and scale to between -1 and 1\n\
     return ((noise / 4.0) - 0.5) * 2.0;\n\

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

@@ -23,7 +23,7 @@ float czm_private_getSpecularOfMaterial(vec3 lightDirectionEC, vec3 toEyeEC, czm
  * vec3 positionToEyeEC = // ...
  * czm_material material = // ...
  * vec3 lightDirectionEC = // ...
- * gl_FragColor = czm_phong(normalize(positionToEyeEC), material, lightDirectionEC);
+ * out_FragColor = czm_phong(normalize(positionToEyeEC), material, lightDirectionEC);
  *
  * @see czm_getMaterial
  */

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

@@ -24,7 +24,7 @@ float czm_private_getSpecularOfMaterial(vec3 lightDirectionEC, vec3 toEyeEC, czm
  * vec3 positionToEyeEC = // ...\n\
  * czm_material material = // ...\n\
  * vec3 lightDirectionEC = // ...\n\
- * gl_FragColor = czm_phong(normalize(positionToEyeEC), material, lightDirectionEC);\n\
+ * out_FragColor = czm_phong(normalize(positionToEyeEC), material, lightDirectionEC);\n\
  *\n\
  * @see czm_getMaterial\n\
  */\n\

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

@@ -1,4 +1,4 @@
 float czm_readDepth(sampler2D depthTexture, vec2 texCoords)
 {
-    return czm_reverseLogDepth(texture2D(depthTexture, texCoords).r);
+    return czm_reverseLogDepth(texture(depthTexture, texCoords).r);
 }

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

@@ -1,6 +1,6 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "float czm_readDepth(sampler2D depthTexture, vec2 texCoords)\n\
 {\n\
-    return czm_reverseLogDepth(texture2D(depthTexture, texCoords).r);\n\
+    return czm_reverseLogDepth(texture(depthTexture, texCoords).r);\n\
 }\n\
 ";

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

@@ -32,10 +32,10 @@ vec3 czm_sampleOctahedralProjectionWithFiltering(sampler2D projectedMap, vec2 te
 
     // Do bilinear filtering
     #ifndef OES_texture_float_linear
-        vec3 color1 = texture2D(projectedMap, coord + vec2(0.0, pixel.y)).rgb;
-        vec3 color2 = texture2D(projectedMap, coord + vec2(pixel.x, 0.0)).rgb;
-        vec3 color3 = texture2D(projectedMap, coord + pixel).rgb;
-        vec3 color4 = texture2D(projectedMap, coord).rgb;
+        vec3 color1 = texture(projectedMap, coord + vec2(0.0, pixel.y)).rgb;
+        vec3 color2 = texture(projectedMap, coord + vec2(pixel.x, 0.0)).rgb;
+        vec3 color3 = texture(projectedMap, coord + pixel).rgb;
+        vec3 color4 = texture(projectedMap, coord).rgb;
 
         vec2 texturePosition = coord * textureSize;
 
@@ -47,7 +47,7 @@ vec3 czm_sampleOctahedralProjectionWithFiltering(sampler2D projectedMap, vec2 te
 
         vec3 color = mix(average1, average2, fv);
     #else
-        vec3 color = texture2D(projectedMap, coord).rgb;
+        vec3 color = texture(projectedMap, coord).rgb;
     #endif
 
     return color;

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

@@ -33,10 +33,10 @@ vec3 czm_sampleOctahedralProjectionWithFiltering(sampler2D projectedMap, vec2 te
 \n\
     // Do bilinear filtering\n\
     #ifndef OES_texture_float_linear\n\
-        vec3 color1 = texture2D(projectedMap, coord + vec2(0.0, pixel.y)).rgb;\n\
-        vec3 color2 = texture2D(projectedMap, coord + vec2(pixel.x, 0.0)).rgb;\n\
-        vec3 color3 = texture2D(projectedMap, coord + pixel).rgb;\n\
-        vec3 color4 = texture2D(projectedMap, coord).rgb;\n\
+        vec3 color1 = texture(projectedMap, coord + vec2(0.0, pixel.y)).rgb;\n\
+        vec3 color2 = texture(projectedMap, coord + vec2(pixel.x, 0.0)).rgb;\n\
+        vec3 color3 = texture(projectedMap, coord + pixel).rgb;\n\
+        vec3 color4 = texture(projectedMap, coord).rgb;\n\
 \n\
         vec2 texturePosition = coord * textureSize;\n\
 \n\
@@ -48,7 +48,7 @@ vec3 czm_sampleOctahedralProjectionWithFiltering(sampler2D projectedMap, vec2 te
 \n\
         vec3 color = mix(average1, average2, fv);\n\
     #else\n\
-        vec3 color = texture2D(projectedMap, coord).rgb;\n\
+        vec3 color = texture(projectedMap, coord).rgb;\n\
     #endif\n\
 \n\
     return color;\n\

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

@@ -1,15 +1,15 @@
 
 float czm_sampleShadowMap(highp samplerCube shadowMap, vec3 d)
 {
-    return czm_unpackDepth(textureCube(shadowMap, d));
+    return czm_unpackDepth(czm_textureCube(shadowMap, d));
 }
 
 float czm_sampleShadowMap(highp sampler2D shadowMap, vec2 uv)
 {
 #ifdef USE_SHADOW_DEPTH_TEXTURE
-    return texture2D(shadowMap, uv).r;
+    return texture(shadowMap, uv).r;
 #else
-    return czm_unpackDepth(texture2D(shadowMap, uv));
+    return czm_unpackDepth(texture(shadowMap, uv));
 #endif
 }
 

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

@@ -2,15 +2,15 @@
 export default "\n\
 float czm_sampleShadowMap(highp samplerCube shadowMap, vec3 d)\n\
 {\n\
-    return czm_unpackDepth(textureCube(shadowMap, d));\n\
+    return czm_unpackDepth(czm_textureCube(shadowMap, d));\n\
 }\n\
 \n\
 float czm_sampleShadowMap(highp sampler2D shadowMap, vec2 uv)\n\
 {\n\
 #ifdef USE_SHADOW_DEPTH_TEXTURE\n\
-    return texture2D(shadowMap, uv).r;\n\
+    return texture(shadowMap, uv).r;\n\
 #else\n\
-    return czm_unpackDepth(texture2D(shadowMap, uv));\n\
+    return czm_unpackDepth(texture(shadowMap, uv));\n\
 #endif\n\
 }\n\
 \n\

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

@@ -12,7 +12,7 @@
  *
  * @example
  * mat3 tangentToEye = czm_tangentToEyeSpaceMatrix(normalEC, tangentEC, bitangentEC);
- * vec3 normal = tangentToEye * texture2D(normalMap, st).xyz;
+ * vec3 normal = tangentToEye * texture(normalMap, st).xyz;
  */
 mat3 czm_tangentToEyeSpaceMatrix(vec3 normalEC, vec3 tangentEC, vec3 bitangentEC)
 {

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

@@ -13,7 +13,7 @@ export default "/**\n\
  *\n\
  * @example\n\
  * mat3 tangentToEye = czm_tangentToEyeSpaceMatrix(normalEC, tangentEC, bitangentEC);\n\
- * vec3 normal = tangentToEye * texture2D(normalMap, st).xyz;\n\
+ * vec3 normal = tangentToEye * texture(normalMap, st).xyz;\n\
  */\n\
 mat3 czm_tangentToEyeSpaceMatrix(vec3 normalEC, vec3 tangentEC, vec3 bitangentEC)\n\
 {\n\