@cesium/engine 1.1.0 → 2.0.0

package/Source/Scene/getClippingFunction.js

@@ -122,7 +122,7 @@ function getClippingPlaneFloat(width, height) {
     `    int pixX = clippingPlaneNumber - (pixY * ${width});\n` +
     `    float u = (float(pixX) + 0.5) * ${pixelWidthString};\n` + // sample from center of pixel
     `    float v = (float(pixY) + 0.5) * ${pixelHeightString};\n` +
-    `    vec4 plane = texture2D(packedClippingPlanes, vec2(u, v));\n` +
+    `    vec4 plane = texture(packedClippingPlanes, vec2(u, v));\n` +
     `    return czm_transformPlane(plane, transform);\n` +
     `}\n`;
   return functionString;
@@ -151,11 +151,11 @@ function getClippingPlaneUint8(width, height) {
     `    int pixX = clippingPlaneStartIndex - (pixY * ${width});\n` +
     `    float u = (float(pixX) + 0.5) * ${pixelWidthString};\n` + // sample from center of pixel
     `    float v = (float(pixY) + 0.5) * ${pixelHeightString};\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 + ${pixelWidthString}, v)));\n` +
+    `    plane.w = czm_unpackFloat(texture(packedClippingPlanes, vec2(u + ${pixelWidthString}, v)));\n` +
     `    return czm_transformPlane(plane, transform);\n` +
     `}\n`;
   return functionString;

package/Source/Scene/processVoxelProperties.js

@@ -340,7 +340,7 @@ function processVoxelProperties(renderResources, primitive) {
       const componentType = componentTypes[i];
       const glslTextureSwizzle = getGlslTextureSwizzle(type, componentType);
       shaderBuilder.addFunctionLines(functionId, [
-        `properties.${name} = texture2D(u_megatextureTextures[${i}], texcoord)${glslTextureSwizzle};`,
+        `properties.${name} = texture(u_megatextureTextures[${i}], texcoord)${glslTextureSwizzle};`,
       ]);
     }
     shaderBuilder.addFunctionLines(functionId, [

package/Source/Shaders/AdjustTranslucentFS.glsl

@@ -1,21 +1,24 @@
 #ifdef MRT
-#extension GL_EXT_draw_buffers : enable
+layout (location = 0) out vec4 out_FragData_0;
+layout (location = 1) out vec4 out_FragData_1;
+#else
+layout (location = 0) out vec4 out_FragColor;
 #endif
 
 uniform vec4 u_bgColor;
 uniform sampler2D u_depthTexture;
 
-varying vec2 v_textureCoordinates;
+in vec2 v_textureCoordinates;
 
 void main()
 {
-    if (texture2D(u_depthTexture, v_textureCoordinates).r < 1.0)
+    if (texture(u_depthTexture, v_textureCoordinates).r < 1.0)
     {
 #ifdef MRT
-        gl_FragData[0] = u_bgColor;
-        gl_FragData[1] = vec4(u_bgColor.a);
+        out_FragData_0 = u_bgColor;
+        out_FragData_1 = vec4(u_bgColor.a);
 #else
-        gl_FragColor = u_bgColor;
+        out_FragColor = u_bgColor;
 #endif
         return;
     }

package/Source/Shaders/AdjustTranslucentFS.js

@@ -1,22 +1,25 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "#ifdef MRT\n\
-#extension GL_EXT_draw_buffers : enable\n\
+layout (location = 0) out vec4 out_FragData_0;\n\
+layout (location = 1) out vec4 out_FragData_1;\n\
+#else\n\
+layout (location = 0) out vec4 out_FragColor;\n\
 #endif\n\
 \n\
 uniform vec4 u_bgColor;\n\
 uniform sampler2D u_depthTexture;\n\
 \n\
-varying vec2 v_textureCoordinates;\n\
+in vec2 v_textureCoordinates;\n\
 \n\
 void main()\n\
 {\n\
-    if (texture2D(u_depthTexture, v_textureCoordinates).r < 1.0)\n\
+    if (texture(u_depthTexture, v_textureCoordinates).r < 1.0)\n\
     {\n\
 #ifdef MRT\n\
-        gl_FragData[0] = u_bgColor;\n\
-        gl_FragData[1] = vec4(u_bgColor.a);\n\
+        out_FragData_0 = u_bgColor;\n\
+        out_FragData_1 = vec4(u_bgColor.a);\n\
 #else\n\
-        gl_FragColor = u_bgColor;\n\
+        out_FragColor = u_bgColor;\n\
 #endif\n\
         return;\n\
     }\n\

package/Source/Shaders/Appearances/AllMaterialAppearanceFS.glsl

@@ -1,8 +1,8 @@
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec3 v_tangentEC;
-varying vec3 v_bitangentEC;
-varying vec2 v_st;
+in vec3 v_positionEC;
+in vec3 v_normalEC;
+in vec3 v_tangentEC;
+in vec3 v_bitangentEC;
+in vec2 v_st;
 
 void main()
 {
@@ -22,8 +22,8 @@ void main()
     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
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 #endif
 }

package/Source/Shaders/Appearances/AllMaterialAppearanceFS.js

@@ -1,9 +1,9 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec3 v_tangentEC;\n\
-varying vec3 v_bitangentEC;\n\
-varying vec2 v_st;\n\
+export default "in vec3 v_positionEC;\n\
+in vec3 v_normalEC;\n\
+in vec3 v_tangentEC;\n\
+in vec3 v_bitangentEC;\n\
+in vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\
@@ -23,9 +23,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/AllMaterialAppearanceVS.glsl

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

package/Source/Shaders/Appearances/AllMaterialAppearanceVS.js

@@ -1,17 +1,17 @@
 //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 vec3 tangent;\n\
-attribute vec3 bitangent;\n\
-attribute vec2 st;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 normal;\n\
+in vec3 tangent;\n\
+in vec3 bitangent;\n\
+in vec2 st;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec3 v_tangentEC;\n\
-varying vec3 v_bitangentEC;\n\
-varying vec2 v_st;\n\
+out vec3 v_positionEC;\n\
+out vec3 v_normalEC;\n\
+out vec3 v_tangentEC;\n\
+out vec3 v_bitangentEC;\n\
+out vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/BasicMaterialAppearanceFS.glsl

@@ -1,5 +1,5 @@
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
+in vec3 v_positionEC;
+in vec3 v_normalEC;
 
 void main()
 {
@@ -16,8 +16,8 @@ void main()
     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
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 #endif
 }

package/Source/Shaders/Appearances/BasicMaterialAppearanceFS.js

@@ -1,6 +1,6 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
+export default "in vec3 v_positionEC;\n\
+in vec3 v_normalEC;\n\
 \n\
 void main()\n\
 {\n\
@@ -17,9 +17,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/BasicMaterialAppearanceVS.glsl

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

package/Source/Shaders/Appearances/BasicMaterialAppearanceVS.js

@@ -1,11 +1,11 @@
 //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 float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 normal;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
+out vec3 v_positionEC;\n\
+out vec3 v_normalEC;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/EllipsoidSurfaceAppearanceFS.glsl

@@ -1,6 +1,6 @@
-varying vec3 v_positionMC;
-varying vec3 v_positionEC;
-varying vec2 v_st;
+in vec3 v_positionMC;
+in vec3 v_positionEC;
+in vec2 v_st;
 
 void main()
 {
@@ -26,8 +26,8 @@ void main()
     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
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 #endif
 }

package/Source/Shaders/Appearances/EllipsoidSurfaceAppearanceFS.js

@@ -1,7 +1,7 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec3 v_positionMC;\n\
-varying vec3 v_positionEC;\n\
-varying vec2 v_st;\n\
+export default "in vec3 v_positionMC;\n\
+in vec3 v_positionEC;\n\
+in vec2 v_st;\n\
 \n\
 void main()\n\
 {\n\
@@ -27,9 +27,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/EllipsoidSurfaceAppearanceVS.glsl

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

package/Source/Shaders/Appearances/EllipsoidSurfaceAppearanceVS.js

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

package/Source/Shaders/Appearances/PerInstanceColorAppearanceFS.glsl

@@ -1,6 +1,6 @@
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec4 v_color;
+in vec3 v_positionEC;
+in vec3 v_normalEC;
+in vec4 v_color;
 
 void main()
 {
@@ -20,5 +20,5 @@ void main()
     material.diffuse = color.rgb;
     material.alpha = color.a;
 
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 }

package/Source/Shaders/Appearances/PerInstanceColorAppearanceFS.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 vec4 v_color;\n\
+export default "in vec3 v_positionEC;\n\
+in vec3 v_normalEC;\n\
+in vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\
@@ -21,6 +21,6 @@ void main()\n\
     material.diffuse = color.rgb;\n\
     material.alpha = color.a;\n\
 \n\
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);\n\
 }\n\
 ";

package/Source/Shaders/Appearances/PerInstanceColorAppearanceVS.glsl

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

package/Source/Shaders/Appearances/PerInstanceColorAppearanceVS.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 vec4 color;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 normal;\n\
+in vec4 color;\n\
+in float batchId;\n\
 \n\
-varying vec3 v_positionEC;\n\
-varying vec3 v_normalEC;\n\
-varying vec4 v_color;\n\
+out vec3 v_positionEC;\n\
+out vec3 v_normalEC;\n\
+out vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/PerInstanceFlatColorAppearanceFS.glsl

@@ -1,6 +1,6 @@
-varying vec4 v_color;
+in vec4 v_color;
 
 void main()
 {
-    gl_FragColor = czm_gammaCorrect(v_color);
+    out_FragColor = czm_gammaCorrect(v_color);
 }

package/Source/Shaders/Appearances/PerInstanceFlatColorAppearanceFS.js

@@ -1,8 +1,8 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "varying vec4 v_color;\n\
+export default "in vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\
-    gl_FragColor = czm_gammaCorrect(v_color);\n\
+    out_FragColor = czm_gammaCorrect(v_color);\n\
 }\n\
 ";

package/Source/Shaders/Appearances/PerInstanceFlatColorAppearanceVS.glsl

@@ -1,9 +1,9 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec4 color;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec4 color;
+in float batchId;
 
-varying vec4 v_color;
+out vec4 v_color;
 
 void main()
 {

package/Source/Shaders/Appearances/PerInstanceFlatColorAppearanceVS.js

@@ -1,10 +1,10 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec4 color;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec4 color;\n\
+in float batchId;\n\
 \n\
-varying vec4 v_color;\n\
+out vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/PolylineColorAppearanceVS.glsl

@@ -1,14 +1,14 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 prevPosition3DHigh;
-attribute vec3 prevPosition3DLow;
-attribute vec3 nextPosition3DHigh;
-attribute vec3 nextPosition3DLow;
-attribute vec2 expandAndWidth;
-attribute vec4 color;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 prevPosition3DHigh;
+in vec3 prevPosition3DLow;
+in vec3 nextPosition3DHigh;
+in vec3 nextPosition3DLow;
+in vec2 expandAndWidth;
+in vec4 color;
+in float batchId;
 
-varying vec4 v_color;
+out vec4 v_color;
 
 void main()
 {

package/Source/Shaders/Appearances/PolylineColorAppearanceVS.js

@@ -1,15 +1,15 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 prevPosition3DHigh;\n\
-attribute vec3 prevPosition3DLow;\n\
-attribute vec3 nextPosition3DHigh;\n\
-attribute vec3 nextPosition3DLow;\n\
-attribute vec2 expandAndWidth;\n\
-attribute vec4 color;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 prevPosition3DHigh;\n\
+in vec3 prevPosition3DLow;\n\
+in vec3 nextPosition3DHigh;\n\
+in vec3 nextPosition3DLow;\n\
+in vec2 expandAndWidth;\n\
+in vec4 color;\n\
+in float batchId;\n\
 \n\
-varying vec4 v_color;\n\
+out vec4 v_color;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/PolylineMaterialAppearanceVS.glsl

@@ -1,16 +1,16 @@
-attribute vec3 position3DHigh;
-attribute vec3 position3DLow;
-attribute vec3 prevPosition3DHigh;
-attribute vec3 prevPosition3DLow;
-attribute vec3 nextPosition3DHigh;
-attribute vec3 nextPosition3DLow;
-attribute vec2 expandAndWidth;
-attribute vec2 st;
-attribute float batchId;
+in vec3 position3DHigh;
+in vec3 position3DLow;
+in vec3 prevPosition3DHigh;
+in vec3 prevPosition3DLow;
+in vec3 nextPosition3DHigh;
+in vec3 nextPosition3DLow;
+in vec2 expandAndWidth;
+in vec2 st;
+in float batchId;
 
-varying float v_width;
-varying vec2 v_st;
-varying float v_polylineAngle;
+out float v_width;
+out vec2 v_st;
+out float v_polylineAngle;
 
 void main()
 {

package/Source/Shaders/Appearances/PolylineMaterialAppearanceVS.js

@@ -1,17 +1,17 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec3 position3DHigh;\n\
-attribute vec3 position3DLow;\n\
-attribute vec3 prevPosition3DHigh;\n\
-attribute vec3 prevPosition3DLow;\n\
-attribute vec3 nextPosition3DHigh;\n\
-attribute vec3 nextPosition3DLow;\n\
-attribute vec2 expandAndWidth;\n\
-attribute vec2 st;\n\
-attribute float batchId;\n\
+export default "in vec3 position3DHigh;\n\
+in vec3 position3DLow;\n\
+in vec3 prevPosition3DHigh;\n\
+in vec3 prevPosition3DLow;\n\
+in vec3 nextPosition3DHigh;\n\
+in vec3 nextPosition3DLow;\n\
+in vec2 expandAndWidth;\n\
+in vec2 st;\n\
+in float batchId;\n\
 \n\
-varying float v_width;\n\
-varying vec2 v_st;\n\
-varying float v_polylineAngle;\n\
+out float v_width;\n\
+out vec2 v_st;\n\
+out float v_polylineAngle;\n\
 \n\
 void main()\n\
 {\n\

package/Source/Shaders/Appearances/TexturedMaterialAppearanceFS.glsl

@@ -1,6 +1,6 @@
-varying vec3 v_positionEC;
-varying vec3 v_normalEC;
-varying vec2 v_st;
+in vec3 v_positionEC;
+in vec3 v_normalEC;
+in vec2 v_st;
 
 void main()
 {
@@ -18,8 +18,8 @@ void main()
     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
-    gl_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
+    out_FragColor = czm_phong(normalize(positionToEyeEC), material, czm_lightDirectionEC);
 #endif
 }