Backed out changeset f5a4eadc760e (bug 1305326)

Brli · Oct 6, 2016 · 149347c · 149347c
1 parent c27ede2
commit 149347c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 19 deletions.
diff --git a/gfx/ipc/GraphicsMessages.ipdlh b/gfx/ipc/GraphicsMessages.ipdlh
@@ -19,7 +19,6 @@ struct D3D11DeviceStatus
 {
   bool isWARP;
   bool textureSharingWorks;
-  bool alphaTextureSharingWorks;
   uint32_t featureLevel;
   DxgiAdapterDesc adapter;
 };

diff --git a/gfx/layers/IMFYCbCrImage.cpp b/gfx/layers/IMFYCbCrImage.cpp
@@ -237,8 +237,7 @@ IMFYCbCrImage::GetTextureClient(KnowsCompositor* aForwarder)
     return nullptr;
   }
 
-  if (!gfx::DeviceManagerDx::Get()->CanInitializeKeyedMutexTextures() ||
-      !gfx::DeviceManagerDx::Get()->AlphaTextureSharingWorks()) {
+  if (!gfx::DeviceManagerDx::Get()->CanInitializeKeyedMutexTextures()) {
     return nullptr;
   }
 

diff --git a/gfx/thebes/DeviceManagerDx.cpp b/gfx/thebes/DeviceManagerDx.cpp
@@ -328,7 +328,6 @@ DeviceManagerDx::CreateCompositorDevice(FeatureState& d3d11)
   // Only test this when not using WARP since it can fail and cause
   // GetDeviceRemovedReason to return weird values.
   bool textureSharingWorks = D3D11Checks::DoesTextureSharingWork(device);
-  bool alphaTextureSharingWorks = D3D11Checks::DoesAlphaTextureSharingWork(device);
 
   DXGI_ADAPTER_DESC desc;
   PodZero(&desc);
@@ -356,7 +355,6 @@ DeviceManagerDx::CreateCompositorDevice(FeatureState& d3d11)
     mDeviceStatus = Some(D3D11DeviceStatus(
       false,
       textureSharingWorks,
-      alphaTextureSharingWorks,
       featureLevel,
       DxgiAdapterDesc::From(desc)));
   }
@@ -411,10 +409,8 @@ DeviceManagerDx::CreateWARPCompositorDevice()
   // Only test for texture sharing on Windows 8 since it puts the device into
   // an unusable state if used on Windows 7
   bool textureSharingWorks = false;
-  bool alphaTextureSharingWorks = false;
   if (IsWin8OrLater()) {
     textureSharingWorks = D3D11Checks::DoesTextureSharingWork(device);
-    alphaTextureSharingWorks = D3D11Checks::DoesAlphaTextureSharingWork(device);
   }
 
   DxgiAdapterDesc nullAdapter;
@@ -427,7 +423,6 @@ DeviceManagerDx::CreateWARPCompositorDevice()
     mDeviceStatus = Some(D3D11DeviceStatus(
       true,
       textureSharingWorks,
-      alphaTextureSharingWorks,
       featureLevel,
       nullAdapter));
   }
@@ -675,16 +670,6 @@ DeviceManagerDx::TextureSharingWorks()
   return mDeviceStatus->textureSharingWorks();
 }
 
-bool
-DeviceManagerDx::AlphaTextureSharingWorks()
-{
-  MutexAutoLock lock(mDeviceLock);
-  if (!mDeviceStatus) {
-    return false;
-  }
-  return mDeviceStatus->alphaTextureSharingWorks();
-}
-
 bool
 DeviceManagerDx::CanInitializeKeyedMutexTextures()
 {

diff --git a/gfx/thebes/DeviceManagerDx.h b/gfx/thebes/DeviceManagerDx.h
@@ -58,7 +58,6 @@ class DeviceManagerDx final
 
   unsigned GetCompositorFeatureLevel() const;
   bool TextureSharingWorks();
-  bool AlphaTextureSharingWorks();
   bool IsWARP();
 
   // Returns true if we can create a texture with