Bug 790086 - Try removing the Optimus WebGL/ANGLE blacklist - r=jgilbert
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 21 Sep 2012 13:44:35 -0400
changeset 107731 b6ac16c3a5c75e41fb54a0423742dbd6c745c8ca
parent 107730 5c5001289c3679c9c40ef8d64e5e0d9931dc9437
child 107732 b8981694b0cc7f1a6e9725c1a155d7c24199bd70
push id23507
push userryanvm@gmail.com
push dateSat, 22 Sep 2012 02:38:57 +0000
treeherdermozilla-central@8f359a9d1f19 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs790086
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 790086 - Try removing the Optimus WebGL/ANGLE blacklist - r=jgilbert What could possibly go wrong?
widget/windows/GfxInfo.cpp
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -904,25 +904,16 @@ GfxInfo::GetFeatureStatusImpl(int32_t aF
         adapterVendorID.Equals(GfxDriverInfo::GetDeviceVendor(VendorNVIDIA), nsCaseInsensitiveStringComparator()) &&
         adapterDeviceID.LowerCaseEqualsLiteral("0x0861") && // GeForce 9400
         driverVersion == V(6,14,11,7756))
     {
       *aStatus = FEATURE_NO_INFO;
       return NS_OK;
     }
 
-    // ANGLE currently uses D3D10 <-> D3D9 interop, which crashes on Optimus
-    // machines.
-    if (aFeature == FEATURE_WEBGL_ANGLE &&
-        gfxWindowsPlatform::IsOptimus())
-    {
-      *aStatus = FEATURE_BLOCKED_DEVICE;
-      return NS_OK;
-    }
-
     // Windows Server 2003 should be just like Windows XP for present purpose, but still has a different version number.
     // OTOH Windows Server 2008 R1 and R2 already have the same version numbers as Vista and Seven respectively
     if (os == DRIVER_OS_WINDOWS_SERVER_2003)
       os = DRIVER_OS_WINDOWS_XP;
 
     if (mHasDriverVersionMismatch) {
       if (aFeature == nsIGfxInfo::FEATURE_DIRECT3D_10_LAYERS ||
           aFeature == nsIGfxInfo::FEATURE_DIRECT3D_10_1_LAYERS ||