Merge pull request #2359 from AnalyticalGraphicsInc/ieCompileFailure

Fix shader compilation failure in IE11.
CesiumGS · Dec 30, 2014 · 65dfeea · 65dfeea
2 parents b28c879 + a29b0ac
commit 65dfeea
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/Source/Scene/GlobeSurfaceShaderSet.js b/Source/Scene/GlobeSurfaceShaderSet.js
@@ -155,21 +155,19 @@ define([
 
             vs.sources.push(getPositionMode);
 
-            if (sceneMode !== SceneMode.SCENE3D) {
-                var get2DYPositionFractionGeographicProjection = 'float get2DYPositionFraction() { return get2DGeographicYPositionFraction(); }';
-                var get2DYPositionFractionMercatorProjection = 'float get2DYPositionFraction() { return get2DMercatorYPositionFraction(); }';
+            var get2DYPositionFractionGeographicProjection = 'float get2DYPositionFraction() { return get2DGeographicYPositionFraction(); }';
+            var get2DYPositionFractionMercatorProjection = 'float get2DYPositionFraction() { return get2DMercatorYPositionFraction(); }';
 
-                var get2DYPositionFraction;
+            var get2DYPositionFraction;
 
-                if (useWebMercatorProjection) {
-                    get2DYPositionFraction = get2DYPositionFractionMercatorProjection;
-                } else {
-                    get2DYPositionFraction = get2DYPositionFractionGeographicProjection;
-                }
-
-                vs.sources.push(get2DYPositionFraction);
+            if (useWebMercatorProjection) {
+                get2DYPositionFraction = get2DYPositionFractionMercatorProjection;
+            } else {
+                get2DYPositionFraction = get2DYPositionFractionGeographicProjection;
             }
 
+            vs.sources.push(get2DYPositionFraction);
+
             var shader = context.createShaderProgram(vs, fs, this._attributeLocations);
             surfaceShader = shadersByFlags[flags] = new GlobeSurfaceShader(numberOfDayTextures, flags, shader);
         }