Bug 1264062 - Don't bother checking which accelerated layer. r=milan, a=test-only
authorGeorge Wright <george@mozilla.com>
Tue, 12 Apr 2016 16:54:02 -0400
changeset 324023 2387e00d2ce89a2cd641df7ca92af4feeeebe556
parent 324022 803140bf65ab3dd48fdd9bfe01e4142c874277c0
child 324024 17dce614e823265075f2f5edaa21cdfe0fccd624
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmilan, test-only
bugs1264062
milestone47.0a2
Bug 1264062 - Don't bother checking which accelerated layer. r=milan, a=test-only From 3add8735ef0fe8a9bd68aee8f6b65f3e96997296 Mon Sep 17 00:00:00 2001 types are available if they're all disabled by pref --- gfx/thebes/gfxPlatform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -1993,17 +1993,17 @@ InitLayersAccelerationPrefs()
     sPrefBrowserTabsRemoteAutostart = BrowserTabsRemoteAutostart();
 
     nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
     int32_t status;
 #ifdef XP_WIN
     if (gfxPrefs::LayersAccelerationForceEnabled()) {
       sLayersSupportsD3D9 = true;
       sLayersSupportsD3D11 = true;
-    } else if (gfxInfo) {
+    } else if (!gfxPrefs::LayersAccelerationDisabled() && gfxInfo) {
       if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_9_LAYERS, &status))) {
         if (status == nsIGfxInfo::FEATURE_STATUS_OK) {
           if (sPrefBrowserTabsRemoteAutostart && !IsVistaOrLater()) {
             gfxWarning() << "Disallowing D3D9 on Windows XP with E10S - see bug 1237770";
           } else {
             sLayersSupportsD3D9 = true;
           }
         }