Bug 1291084: Return the correct device in GetDeviceForCurrentThread. r=mattwoodrow a=ritu
authorBas Schouten <bschouten@mozilla.com>
Wed, 05 Oct 2016 23:37:31 +0000
changeset 350569 e432b80ec56b7a4988be19eba490069fdc81988b
parent 350568 b0d514b7bf0cb2ce484ce0cbd1524670c0d8975f
child 350570 6a4f08e8bbe882117b369fbe8b4bec1e909649bd
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow, ritu
bugs1291084
milestone50.0
Bug 1291084: Return the correct device in GetDeviceForCurrentThread. r=mattwoodrow a=ritu
gfx/thebes/DeviceManagerD3D11.cpp
--- a/gfx/thebes/DeviceManagerD3D11.cpp
+++ b/gfx/thebes/DeviceManagerD3D11.cpp
@@ -644,17 +644,17 @@ DeviceManagerD3D11::GetContentDevice()
 }
 
 RefPtr<ID3D11Device>
 DeviceManagerD3D11::GetDeviceForCurrentThread()
 {
   if (NS_IsMainThread()) {
     return GetContentDevice();
   }
-  return GetCompositorDevice();
+  return GetImageBridgeDevice();
 }
 
 unsigned
 DeviceManagerD3D11::GetD3D11Version() const
 {
   MOZ_ASSERT(NS_IsMainThread());
   if (!mCompositorDevice) {
     return 0;