mozilla-central: changeset 212411:095cbdd41f210178b82daed72a01b8ce6ec0914b

author	Benoit Jacob <bjacob@mozilla.com>
	Sun, 26 Oct 2014 18:46:09 -0400
changeset 212411	095cbdd41f210178b82daed72a01b8ce6ec0914b
parent 212410	fdc638286435acc7b0c9d4c1e53890e7c0f9fe44
child 212412	a02e1ebafc1394abe817f4ea260345e972dd2447
push id	27710
push user	cbook@mozilla.com
push date	Mon, 27 Oct 2014 14:52:01 +0000
treeherder	mozilla-central@d65d20dc0ac2 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	Bas, jmuizelaar
bugs	1083071
milestone	36.0a1
first release with	nightly linux32 da125623d9cb / 36.0a1 / 20141027113017 / files nightly linux64 da125623d9cb / 36.0a1 / 20141027113017 / files nightly mac da125623d9cb / 36.0a1 / 20141027113017 / files nightly win32 da125623d9cb / 36.0a1 / 20141027113017 / files nightly win64 da125623d9cb / 36.0a1 / 20141027113017 / files
last release without	nightly linux32 8230834302c9 / 36.0a1 / 20141027030204 / files nightly linux64 8230834302c9 / 36.0a1 / 20141027030204 / files nightly mac 8230834302c9 / 36.0a1 / 20141027030204 / files nightly win32 8230834302c9 / 36.0a1 / 20141027030204 / files nightly win64 8230834302c9 / 36.0a1 / 20141027030204 / files

--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -1567,16 +1567,26 @@ bool DoesD3D11DeviceSupportResourceShari
   return true;
 }
 
 void
 gfxWindowsPlatform::InitD3D11Devices()
 {
   mD3D11DeviceInitialized = true;
 
+  nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
+  if (gfxInfo) {
+    int32_t status;
+    if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS, &status))) {
+      if (status != nsIGfxInfo::FEATURE_STATUS_OK) {
+        return;
+      }
+    }
+  }
+
   nsModuleHandle d3d11Module(LoadLibrarySystem32(L"d3d11.dll"));
   decltype(D3D11CreateDevice)* d3d11CreateDevice = (decltype(D3D11CreateDevice)*)
     GetProcAddress(d3d11Module, "D3D11CreateDevice");
 
   if (!d3d11CreateDevice) {
     return;
   }