From 501074de7016fe51c594a3cf9cf880938f14cdac Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Wed, 12 Nov 2014 11:48:01 -0500
Subject: [PATCH] Bug 1095575 - DoesD3D11DeviceWork() should be overridable by
 force-enable prefs - r=bas

---
 gfx/thebes/gfxWindowsPlatform.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index 2157c5ff98c..078fa5d0730 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -1548,6 +1548,13 @@ bool DoesD3D11DeviceWork(ID3D11Device *device)
       return result;
   checked = true;
 
+  if (gfxPrefs::Direct2DForceEnabled() ||
+      gfxPrefs::LayersAccelerationForceEnabled())
+  {
+    result = true;
+    return true;
+  }
+
   if (GetModuleHandleW(L"dlumd32.dll") && GetModuleHandleW(L"igd10umd32.dll")) {
     nsString displayLinkModuleVersionString;
     gfxWindowsPlatform::GetDLLVersion(L"dlumd32.dll", displayLinkModuleVersionString);