Merge pull request #2432 from AnalyticalGraphicsInc/fix-firefox

Workaround issue in Firefox 35
CesiumGS · Jan 29, 2015 · 8a43c4e · 8a43c4e
2 parents fb3df24 + c107a19
commit 8a43c4e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/Source/Core/FeatureDetection.js b/Source/Core/FeatureDetection.js
@@ -124,6 +124,15 @@ define([
         return isFirefoxResult;
     }
 
+    var isWindowsResult;
+    function isWindows() {
+        if (!defined(isWindowsResult)) {
+            isWindowsResult = /Windows/i.test(navigator.appVersion);
+        }
+        return isWindowsResult;
+    }
+
+
     function firefoxVersion() {
         return isFirefox() && firefoxVersionResult;
     }
@@ -146,6 +155,7 @@ define([
         internetExplorerVersion : internetExplorerVersion,
         isFirefox : isFirefox,
         firefoxVersion : firefoxVersion,
+        isWindows : isWindows,
         hardwareConcurrency : defaultValue(navigator.hardwareConcurrency, 3)
     };
 

diff --git a/Source/Renderer/Context.js b/Source/Renderer/Context.js
@@ -9,6 +9,7 @@ define([
         '../Core/defineProperties',
         '../Core/destroyObject',
         '../Core/DeveloperError',
+        '../Core/FeatureDetection',
         '../Core/Geometry',
         '../Core/GeometryAttribute',
         '../Core/IndexDatatype',
@@ -47,6 +48,7 @@ define([
         defineProperties,
         destroyObject,
         DeveloperError,
+        FeatureDetection,
         Geometry,
         GeometryAttribute,
         IndexDatatype,
@@ -208,10 +210,18 @@ define([
 
         // Override select WebGL defaults
         webglOptions.alpha = defaultValue(webglOptions.alpha, false); // WebGL default is true
-        // TODO: WebGL default is false. This works around a bug in Canary and can be removed when fixed: https://code.google.com/p/chromium/issues/detail?id=335273
-        webglOptions.stencil = defaultValue(webglOptions.stencil, false);
         webglOptions.failIfMajorPerformanceCaveat = defaultValue(webglOptions.failIfMajorPerformanceCaveat, true); // WebGL default is false
 
+        // Firefox 35 with ANGLE has a regression that causes alpha : false to affect all framebuffers
+        // Since we can't detect for ANGLE without a context, we just detect for Windows.
+        // https://github.com/AnalyticalGraphicsInc/cesium/issues/2431
+        if (FeatureDetection.isFirefox() && FeatureDetection.isWindows()) {
+            var firefoxVersion = FeatureDetection.firefoxVersion();
+            if (firefoxVersion[0] === 35) {
+                webglOptions.alpha = true;
+            }
+        }
+
         this._originalGLContext = canvas.getContext('webgl', webglOptions) || canvas.getContext('experimental-webgl', webglOptions) || undefined;
 
         if (!defined(this._originalGLContext)) {

diff --git a/Source/Shaders/Builtin/Functions/cosineAndSine.glsl b/Source/Shaders/Builtin/Functions/cosineAndSine.glsl
@@ -1,6 +1,3 @@
-// Firefox 33-34 has a regression that prevents the CORDIC implementation from compiling
-#ifndef DISABLE_CORDIC
-
 /**
  * @private
  */
@@ -211,6 +208,4 @@ vec2 czm_cosineAndSine(float angle)
     {
         return cordic(angle);
     }
-}
-
-#endif
+}