@cesium/engine 1.1.0 → 2.0.0

package/Source/Shaders/Materials/NormalMapMaterial.glsl

@@ -6,7 +6,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
 {
     czm_material material = czm_getDefaultMaterial(materialInput);
     
-    vec4 textureValue = texture2D(image, fract(repeat * materialInput.st));
+    vec4 textureValue = texture(image, fract(repeat * materialInput.st));
     vec3 normalTangentSpace = textureValue.channels;
     normalTangentSpace.xy = normalTangentSpace.xy * 2.0 - 1.0;
     normalTangentSpace.z = clamp(1.0 - strength, 0.1, 1.0);

package/Source/Shaders/Materials/NormalMapMaterial.js

@@ -7,7 +7,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
     czm_material material = czm_getDefaultMaterial(materialInput);\n\
     \n\
-    vec4 textureValue = texture2D(image, fract(repeat * materialInput.st));\n\
+    vec4 textureValue = texture(image, fract(repeat * materialInput.st));\n\
     vec3 normalTangentSpace = textureValue.channels;\n\
     normalTangentSpace.xy = normalTangentSpace.xy * 2.0 - 1.0;\n\
     normalTangentSpace.z = clamp(1.0 - strength, 0.1, 1.0);\n\

package/Source/Shaders/Materials/PolylineArrowMaterial.glsl

@@ -16,10 +16,11 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
 
     vec2 st = materialInput.st;
 
-#ifdef GL_OES_standard_derivatives
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
     float base = 1.0 - abs(fwidth(st.s)) * 10.0 * czm_pixelRatio;
 #else
-    float base = 0.975; // 2.5% of the line will be the arrow head
+     // If no derivatives available (IE 10?), 2.5% of the line will be the arrow head
+    float base = 0.975;
 #endif
 
     vec2 center = vec2(1.0, 0.5);

package/Source/Shaders/Materials/PolylineArrowMaterial.js

@@ -17,10 +17,11 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 \n\
     vec2 st = materialInput.st;\n\
 \n\
-#ifdef GL_OES_standard_derivatives\n\
+#if (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))\n\
     float base = 1.0 - abs(fwidth(st.s)) * 10.0 * czm_pixelRatio;\n\
 #else\n\
-    float base = 0.975; // 2.5% of the line will be the arrow head\n\
+     // If no derivatives available (IE 10?), 2.5% of the line will be the arrow head\n\
+    float base = 0.975;\n\
 #endif\n\
 \n\
     vec2 center = vec2(1.0, 0.5);\n\

package/Source/Shaders/Materials/PolylineDashMaterial.glsl

@@ -2,7 +2,7 @@ uniform vec4 color;
 uniform vec4 gapColor;
 uniform float dashLength;
 uniform float dashPattern;
-varying float v_polylineAngle;
+in float v_polylineAngle;
 
 const float maskLength = 16.0;
 

package/Source/Shaders/Materials/PolylineDashMaterial.js

@@ -3,7 +3,7 @@ export default "uniform vec4 color;\n\
 uniform vec4 gapColor;\n\
 uniform float dashLength;\n\
 uniform float dashPattern;\n\
-varying float v_polylineAngle;\n\
+in float v_polylineAngle;\n\
 \n\
 const float maskLength = 16.0;\n\
 \n\

package/Source/Shaders/Materials/PolylineOutlineMaterial.glsl

@@ -2,7 +2,7 @@ uniform vec4 color;
 uniform vec4 outlineColor;
 uniform float outlineWidth;
 
-varying float v_width;
+in float v_width;
 
 czm_material czm_getMaterial(czm_materialInput materialInput)
 {

package/Source/Shaders/Materials/PolylineOutlineMaterial.js

@@ -3,7 +3,7 @@ export default "uniform vec4 color;\n\
 uniform vec4 outlineColor;\n\
 uniform float outlineWidth;\n\
 \n\
-varying float v_width;\n\
+in float v_width;\n\
 \n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\

package/Source/Shaders/Materials/SlopeRampMaterial.glsl

@@ -3,7 +3,7 @@ uniform sampler2D image;
 czm_material czm_getMaterial(czm_materialInput materialInput)
 {
     czm_material material = czm_getDefaultMaterial(materialInput);
-    vec4 rampColor = texture2D(image, vec2(materialInput.slope / (czm_pi / 2.0), 0.5));
+    vec4 rampColor = texture(image, vec2(materialInput.slope / (czm_pi / 2.0), 0.5));
     rampColor = czm_gammaCorrect(rampColor);
     material.diffuse = rampColor.rgb;
     material.alpha = rampColor.a;

package/Source/Shaders/Materials/SlopeRampMaterial.js

@@ -4,7 +4,7 @@ export default "uniform sampler2D image;\n\
 czm_material czm_getMaterial(czm_materialInput materialInput)\n\
 {\n\
     czm_material material = czm_getDefaultMaterial(materialInput);\n\
-    vec4 rampColor = texture2D(image, vec2(materialInput.slope / (czm_pi / 2.0), 0.5));\n\
+    vec4 rampColor = texture(image, vec2(materialInput.slope / (czm_pi / 2.0), 0.5));\n\
     rampColor = czm_gammaCorrect(rampColor);\n\
     material.diffuse = rampColor.rgb;\n\
     material.alpha = rampColor.a;\n\

package/Source/Shaders/Materials/Water.glsl

@@ -20,7 +20,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     // fade is a function of the distance from the fragment and the frequency of the waves
     float fade = max(1.0, (length(materialInput.positionToEyeEC) / 10000000000.0) * frequency * fadeFactor);
 
-    float specularMapValue = texture2D(specularMap, materialInput.st).r;
+    float specularMapValue = texture(specularMap, materialInput.st).r;
 
     // note: not using directional motion at this time, just set the angle to 0.0;
     vec4 noise = czm_getWaterNoise(normalMap, materialInput.st * frequency, time, 0.0);

package/Source/Shaders/Materials/Water.js

@@ -21,7 +21,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)\n\
     // fade is a function of the distance from the fragment and the frequency of the waves\n\
     float fade = max(1.0, (length(materialInput.positionToEyeEC) / 10000000000.0) * frequency * fadeFactor);\n\
 \n\
-    float specularMapValue = texture2D(specularMap, materialInput.st).r;\n\
+    float specularMapValue = texture(specularMap, materialInput.st).r;\n\
 \n\
     // note: not using directional motion at this time, just set the angle to 0.0;\n\
     vec4 noise = czm_getWaterNoise(normalMap, materialInput.st * frequency, time, 0.0);\n\

package/Source/Shaders/Model/ImageBasedLightingStageFS.glsl

@@ -30,7 +30,7 @@ vec3 proceduralIBL(
 
     float inverseRoughness = 1.04 - roughness;
     inverseRoughness *= inverseRoughness;
-    vec3 sceneSkyBox = textureCube(czm_environmentMap, r).rgb * inverseRoughness;
+    vec3 sceneSkyBox = czm_textureCube(czm_environmentMap, r).rgb * inverseRoughness;
 
     float atmosphereHeight = 0.05;
     float blendRegionSize = 0.1 * ((1.0 - inverseRoughness) * 8.0 + 1.1 - horizonDotNadir);
@@ -67,7 +67,7 @@ vec3 proceduralIBL(
     float luminance = model_luminanceAtZenith * (numerator / denominator);
     #endif 
 
-    vec2 brdfLut = texture2D(czm_brdfLut, vec2(NdotV, roughness)).rg;
+    vec2 brdfLut = texture(czm_brdfLut, vec2(NdotV, roughness)).rg;
     vec3 iblColor = (diffuseIrradiance * diffuseColor * model_iblFactor.x) + (specularIrradiance * czm_srgbToLinear(specularColor * brdfLut.x + brdfLut.y) * model_iblFactor.y);
     float maximumComponent = max(max(lightColorHdr.x, lightColorHdr.y), lightColorHdr.z);
     vec3 lightColor = lightColorHdr / max(maximumComponent, 1.0);
@@ -122,7 +122,7 @@ vec3 textureIBL(
     vec3 r90 = vec3(clamp(reflectance * 25.0, 0.0, 1.0));
     vec3 F = fresnelSchlick2(r0, r90, VdotH);
     
-    vec2 brdfLut = texture2D(czm_brdfLut, vec2(NdotV, roughness)).rg;
+    vec2 brdfLut = texture(czm_brdfLut, vec2(NdotV, roughness)).rg;
       #ifdef CUSTOM_SPECULAR_IBL 
       vec3 specularIBL = czm_sampleOctahedralProjection(model_specularEnvironmentMaps, model_specularEnvironmentMapsSize, cubeDir, roughness * model_specularEnvironmentMapsMaximumLOD, model_specularEnvironmentMapsMaximumLOD);
       #else 

package/Source/Shaders/Model/ImageBasedLightingStageFS.js

@@ -31,7 +31,7 @@ export default "vec3 proceduralIBL(\n\
 \n\
     float inverseRoughness = 1.04 - roughness;\n\
     inverseRoughness *= inverseRoughness;\n\
-    vec3 sceneSkyBox = textureCube(czm_environmentMap, r).rgb * inverseRoughness;\n\
+    vec3 sceneSkyBox = czm_textureCube(czm_environmentMap, r).rgb * inverseRoughness;\n\
 \n\
     float atmosphereHeight = 0.05;\n\
     float blendRegionSize = 0.1 * ((1.0 - inverseRoughness) * 8.0 + 1.1 - horizonDotNadir);\n\
@@ -68,7 +68,7 @@ export default "vec3 proceduralIBL(\n\
     float luminance = model_luminanceAtZenith * (numerator / denominator);\n\
     #endif \n\
 \n\
-    vec2 brdfLut = texture2D(czm_brdfLut, vec2(NdotV, roughness)).rg;\n\
+    vec2 brdfLut = texture(czm_brdfLut, vec2(NdotV, roughness)).rg;\n\
     vec3 iblColor = (diffuseIrradiance * diffuseColor * model_iblFactor.x) + (specularIrradiance * czm_srgbToLinear(specularColor * brdfLut.x + brdfLut.y) * model_iblFactor.y);\n\
     float maximumComponent = max(max(lightColorHdr.x, lightColorHdr.y), lightColorHdr.z);\n\
     vec3 lightColor = lightColorHdr / max(maximumComponent, 1.0);\n\
@@ -123,7 +123,7 @@ vec3 textureIBL(\n\
     vec3 r90 = vec3(clamp(reflectance * 25.0, 0.0, 1.0));\n\
     vec3 F = fresnelSchlick2(r0, r90, VdotH);\n\
     \n\
-    vec2 brdfLut = texture2D(czm_brdfLut, vec2(NdotV, roughness)).rg;\n\
+    vec2 brdfLut = texture(czm_brdfLut, vec2(NdotV, roughness)).rg;\n\
       #ifdef CUSTOM_SPECULAR_IBL \n\
       vec3 specularIBL = czm_sampleOctahedralProjection(model_specularEnvironmentMaps, model_specularEnvironmentMapsSize, cubeDir, roughness * model_specularEnvironmentMapsMaximumLOD, model_specularEnvironmentMapsMaximumLOD);\n\
       #else \n\

package/Source/Shaders/Model/MaterialStageFS.glsl

@@ -34,10 +34,10 @@ vec3 computeNormal(ProcessedAttributes attributes)
         vec3 t = attributes.tangentEC;
         vec3 b = attributes.bitangentEC;
         mat3 tbn = mat3(t, b, ng);
-        vec3 n = texture2D(u_normalTexture, normalTexCoords).rgb;
+        vec3 n = texture(u_normalTexture, normalTexCoords).rgb;
         normal = normalize(tbn * (2.0 * n - 1.0));
-        #elif defined(GL_OES_standard_derivatives)
-        // Compute tangents
+        #elif (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))
+        // If derivatives are available (not IE 10), compute tangents
         vec3 positionEC = attributes.positionEC;
         vec3 pos_dx = dFdx(positionEC);
         vec3 pos_dy = dFdy(positionEC);
@@ -47,7 +47,7 @@ vec3 computeNormal(ProcessedAttributes attributes)
         t = normalize(t - ng * dot(ng, t));
         vec3 b = normalize(cross(ng, t));
         mat3 tbn = mat3(t, b, ng);
-        vec3 n = texture2D(u_normalTexture, normalTexCoords).rgb;
+        vec3 n = texture(u_normalTexture, normalTexCoords).rgb;
         normal = normalize(tbn * (2.0 * n - 1.0));
         #endif
     #endif
@@ -77,7 +77,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         baseColorTexCoords = computeTextureTransform(baseColorTexCoords, u_baseColorTextureTransform);
         #endif
 
-    baseColorWithAlpha = czm_srgbToLinear(texture2D(u_baseColorTexture, baseColorTexCoords));
+    baseColorWithAlpha = czm_srgbToLinear(texture(u_baseColorTexture, baseColorTexCoords));
 
         #ifdef HAS_BASE_COLOR_FACTOR
         baseColorWithAlpha *= u_baseColorFactor;
@@ -109,7 +109,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         #ifdef HAS_OCCLUSION_TEXTURE_TRANSFORM
         occlusionTexCoords = computeTextureTransform(occlusionTexCoords, u_occlusionTextureTransform);
         #endif
-    material.occlusion = texture2D(u_occlusionTexture, occlusionTexCoords).r;
+    material.occlusion = texture(u_occlusionTexture, occlusionTexCoords).r;
     #endif
 
     #ifdef HAS_EMISSIVE_TEXTURE
@@ -118,7 +118,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         emissiveTexCoords = computeTextureTransform(emissiveTexCoords, u_emissiveTextureTransform);
         #endif
 
-    vec3 emissive = czm_srgbToLinear(texture2D(u_emissiveTexture, emissiveTexCoords).rgb);
+    vec3 emissive = czm_srgbToLinear(texture(u_emissiveTexture, emissiveTexCoords).rgb);
         #ifdef HAS_EMISSIVE_FACTOR
         emissive *= u_emissiveFactor;
         #endif
@@ -134,7 +134,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
           specularGlossinessTexCoords = computeTextureTransform(specularGlossinessTexCoords, u_specularGlossinessTextureTransform);
           #endif
 
-        vec4 specularGlossiness = czm_srgbToLinear(texture2D(u_specularGlossinessTexture, specularGlossinessTexCoords));
+        vec4 specularGlossiness = czm_srgbToLinear(texture(u_specularGlossinessTexture, specularGlossinessTexCoords));
         vec3 specular = specularGlossiness.rgb;
         float glossiness = specularGlossiness.a;
             #ifdef HAS_SPECULAR_FACTOR
@@ -164,7 +164,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
             diffuseTexCoords = computeTextureTransform(diffuseTexCoords, u_diffuseTextureTransform);
             #endif
 
-        vec4 diffuse = czm_srgbToLinear(texture2D(u_diffuseTexture, diffuseTexCoords));
+        vec4 diffuse = czm_srgbToLinear(texture(u_diffuseTexture, diffuseTexCoords));
             #ifdef HAS_DIFFUSE_FACTOR
             diffuse *= u_diffuseFactor;
             #endif
@@ -191,7 +191,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
             metallicRoughnessTexCoords = computeTextureTransform(metallicRoughnessTexCoords, u_metallicRoughnessTextureTransform);
             #endif
 
-        vec3 metallicRoughness = texture2D(u_metallicRoughnessTexture, metallicRoughnessTexCoords).rgb;
+        vec3 metallicRoughness = texture(u_metallicRoughnessTexture, metallicRoughnessTexCoords).rgb;
         float metalness = clamp(metallicRoughness.b, 0.0, 1.0);
         float roughness = clamp(metallicRoughness.g, 0.04, 1.0);
             #ifdef HAS_METALLIC_FACTOR

package/Source/Shaders/Model/MaterialStageFS.js

@@ -35,10 +35,10 @@ vec3 computeNormal(ProcessedAttributes attributes)\n\
         vec3 t = attributes.tangentEC;\n\
         vec3 b = attributes.bitangentEC;\n\
         mat3 tbn = mat3(t, b, ng);\n\
-        vec3 n = texture2D(u_normalTexture, normalTexCoords).rgb;\n\
+        vec3 n = texture(u_normalTexture, normalTexCoords).rgb;\n\
         normal = normalize(tbn * (2.0 * n - 1.0));\n\
-        #elif defined(GL_OES_standard_derivatives)\n\
-        // Compute tangents\n\
+        #elif (__VERSION__ == 300 || defined(GL_OES_standard_derivatives))\n\
+        // If derivatives are available (not IE 10), compute tangents\n\
         vec3 positionEC = attributes.positionEC;\n\
         vec3 pos_dx = dFdx(positionEC);\n\
         vec3 pos_dy = dFdy(positionEC);\n\
@@ -48,7 +48,7 @@ vec3 computeNormal(ProcessedAttributes attributes)\n\
         t = normalize(t - ng * dot(ng, t));\n\
         vec3 b = normalize(cross(ng, t));\n\
         mat3 tbn = mat3(t, b, ng);\n\
-        vec3 n = texture2D(u_normalTexture, normalTexCoords).rgb;\n\
+        vec3 n = texture(u_normalTexture, normalTexCoords).rgb;\n\
         normal = normalize(tbn * (2.0 * n - 1.0));\n\
         #endif\n\
     #endif\n\
@@ -78,7 +78,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         baseColorTexCoords = computeTextureTransform(baseColorTexCoords, u_baseColorTextureTransform);\n\
         #endif\n\
 \n\
-    baseColorWithAlpha = czm_srgbToLinear(texture2D(u_baseColorTexture, baseColorTexCoords));\n\
+    baseColorWithAlpha = czm_srgbToLinear(texture(u_baseColorTexture, baseColorTexCoords));\n\
 \n\
         #ifdef HAS_BASE_COLOR_FACTOR\n\
         baseColorWithAlpha *= u_baseColorFactor;\n\
@@ -110,7 +110,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         #ifdef HAS_OCCLUSION_TEXTURE_TRANSFORM\n\
         occlusionTexCoords = computeTextureTransform(occlusionTexCoords, u_occlusionTextureTransform);\n\
         #endif\n\
-    material.occlusion = texture2D(u_occlusionTexture, occlusionTexCoords).r;\n\
+    material.occlusion = texture(u_occlusionTexture, occlusionTexCoords).r;\n\
     #endif\n\
 \n\
     #ifdef HAS_EMISSIVE_TEXTURE\n\
@@ -119,7 +119,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
         emissiveTexCoords = computeTextureTransform(emissiveTexCoords, u_emissiveTextureTransform);\n\
         #endif\n\
 \n\
-    vec3 emissive = czm_srgbToLinear(texture2D(u_emissiveTexture, emissiveTexCoords).rgb);\n\
+    vec3 emissive = czm_srgbToLinear(texture(u_emissiveTexture, emissiveTexCoords).rgb);\n\
         #ifdef HAS_EMISSIVE_FACTOR\n\
         emissive *= u_emissiveFactor;\n\
         #endif\n\
@@ -135,7 +135,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
           specularGlossinessTexCoords = computeTextureTransform(specularGlossinessTexCoords, u_specularGlossinessTextureTransform);\n\
           #endif\n\
 \n\
-        vec4 specularGlossiness = czm_srgbToLinear(texture2D(u_specularGlossinessTexture, specularGlossinessTexCoords));\n\
+        vec4 specularGlossiness = czm_srgbToLinear(texture(u_specularGlossinessTexture, specularGlossinessTexCoords));\n\
         vec3 specular = specularGlossiness.rgb;\n\
         float glossiness = specularGlossiness.a;\n\
             #ifdef HAS_SPECULAR_FACTOR\n\
@@ -165,7 +165,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
             diffuseTexCoords = computeTextureTransform(diffuseTexCoords, u_diffuseTextureTransform);\n\
             #endif\n\
 \n\
-        vec4 diffuse = czm_srgbToLinear(texture2D(u_diffuseTexture, diffuseTexCoords));\n\
+        vec4 diffuse = czm_srgbToLinear(texture(u_diffuseTexture, diffuseTexCoords));\n\
             #ifdef HAS_DIFFUSE_FACTOR\n\
             diffuse *= u_diffuseFactor;\n\
             #endif\n\
@@ -192,7 +192,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
             metallicRoughnessTexCoords = computeTextureTransform(metallicRoughnessTexCoords, u_metallicRoughnessTextureTransform);\n\
             #endif\n\
 \n\
-        vec3 metallicRoughness = texture2D(u_metallicRoughnessTexture, metallicRoughnessTexCoords).rgb;\n\
+        vec3 metallicRoughness = texture(u_metallicRoughnessTexture, metallicRoughnessTexCoords).rgb;\n\
         float metalness = clamp(metallicRoughness.b, 0.0, 1.0);\n\
         float roughness = clamp(metallicRoughness.g, 0.04, 1.0);\n\
             #ifdef HAS_METALLIC_FACTOR\n\

package/Source/Shaders/Model/ModelClippingPlanesStageFS.glsl

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

package/Source/Shaders/Model/ModelClippingPlanesStageFS.js

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

package/Source/Shaders/Model/ModelFS.glsl

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

package/Source/Shaders/Model/ModelFS.js

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

package/Source/Shaders/Model/PrimitiveOutlineStageFS.glsl

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

package/Source/Shaders/Model/PrimitiveOutlineStageFS.js

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

package/Source/Shaders/Model/SelectedFeatureIdStageCommon.glsl

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

package/Source/Shaders/Model/SelectedFeatureIdStageCommon.js

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

package/Source/Shaders/OctahedralProjectionAtlasFS.glsl

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

package/Source/Shaders/OctahedralProjectionAtlasFS.js

@@ -1,5 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec2 v_textureCoordinates;\n\
+export default "in vec2 v_textureCoordinates;\n\
 \n\
 uniform float originalSize;\n\
 uniform sampler2D texture0;\n\
@@ -61,31 +61,31 @@ void main()\n\
 \n\
     if(mipLevel == 0.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture0, uv);\n\
+        out_FragColor = texture(texture0, uv);\n\
     }\n\
     else if(mipLevel == 1.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture1, uv);\n\
+        out_FragColor = texture(texture1, uv);\n\
     }\n\
     else if(mipLevel == 2.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture2, uv);\n\
+        out_FragColor = texture(texture2, uv);\n\
     }\n\
     else if(mipLevel == 3.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture3, uv);\n\
+        out_FragColor = texture(texture3, uv);\n\
     }\n\
     else if(mipLevel == 4.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture4, uv);\n\
+        out_FragColor = texture(texture4, uv);\n\
     }\n\
     else if(mipLevel == 5.0)\n\
     {\n\
-        gl_FragColor = texture2D(texture5, uv);\n\
+        out_FragColor = texture(texture5, uv);\n\
     }\n\
     else\n\
     {\n\
-        gl_FragColor = vec4(0.0);\n\
+        out_FragColor = vec4(0.0);\n\
     }\n\
 }\n\
 ";

package/Source/Shaders/OctahedralProjectionFS.glsl

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

package/Source/Shaders/OctahedralProjectionFS.js

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

package/Source/Shaders/OctahedralProjectionVS.glsl

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

package/Source/Shaders/OctahedralProjectionVS.js

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

package/Source/Shaders/PointPrimitiveCollectionFS.glsl

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