corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to the Direct3D9 compositor. (bug 1318558 part 1, r=mattwoodrow)

Browse Source
This commit is contained in:
David Anderson
2017-03-08 00:17:36 -08:00
parent d5bb16672a
commit 80fa3494e1
21 changed files with 140 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/layers/client/TextureClient.cpp
View File

@@ -34,9 +34,7 @@
#include "mozilla/ipc/CrossProcessSemaphore.h"
#ifdef XP_WIN
#include "DeviceManagerD3D9.h"
#include "mozilla/gfx/DeviceManagerDx.h"
#include "mozilla/layers/TextureD3D9.h"
#include "mozilla/layers/TextureD3D11.h"
#include "mozilla/layers/TextureDIB.h"
#include "gfxWindowsPlatform.h"
@@ -1051,15 +1049,6 @@ TextureClient::CreateForDrawing(TextureForwarder* aAllocator,
{
data = DXGITextureData::Create(aSize, aFormat, aAllocFlags);
}
if (aLayersBackend == LayersBackend::LAYERS_D3D9 &&
moz2DBackend == gfx::BackendType::CAIRO &&
aAllocator->IsSameProcess() &&
aSize.width <= aMaxTextureSize &&
aSize.height <= aMaxTextureSize &&
NS_IsMainThread() &&
DeviceManagerD3D9::GetDevice()) {
data = D3D9TextureData::Create(aSize, aFormat, aAllocFlags);
}
if (aLayersBackend != LayersBackend::LAYERS_WR &&
!data && aFormat == SurfaceFormat::B8G8R8X8 &&