Bug 1158089 - Remove LAYERS_D3D10 enum value since it's unused. r=Bas

This commit is contained in:
Matt Woodrow 2015-05-11 16:22:51 +12:00
parent 8fb9f8dab2
commit 541516a4f0
6 changed files with 1 additions and 8 deletions

View File

@ -156,7 +156,6 @@ WMFVideoMFTManager::InitializeDXVA(bool aForceD3D9)
// to a halt, and makes playback performance *worse*.
if (!mDXVAEnabled ||
(mLayersBackend != LayersBackend::LAYERS_D3D9 &&
mLayersBackend != LayersBackend::LAYERS_D3D10 &&
mLayersBackend != LayersBackend::LAYERS_D3D11)) {
return false;
}

View File

@ -108,7 +108,6 @@ WMFReader::InitializeDXVA()
LayersBackend backend = layerManager->GetCompositorBackendType();
if (backend != LayersBackend::LAYERS_D3D9 &&
backend != LayersBackend::LAYERS_D3D10 &&
backend != LayersBackend::LAYERS_D3D11) {
return false;
}

View File

@ -44,7 +44,6 @@ enum class LayersBackend : int8_t {
LAYERS_BASIC,
LAYERS_OPENGL,
LAYERS_D3D9,
LAYERS_D3D10,
LAYERS_D3D11,
LAYERS_CLIENT,
LAYERS_LAST

View File

@ -108,7 +108,6 @@ ClientCanvasLayer::Initialize(const Data& aData)
}
break;
}
case mozilla::layers::LayersBackend::LAYERS_D3D10:
case mozilla::layers::LayersBackend::LAYERS_D3D11: {
#ifdef XP_WIN
if (mGLContext->IsANGLE() && DoesD3D11TextureSharingWork(gfxWindowsPlatform::GetPlatform()->GetD3D11Device())) {

View File

@ -740,7 +740,6 @@ ClientLayerManager::GetBackendName(nsAString& aName)
case LayersBackend::LAYERS_BASIC: aName.AssignLiteral("Basic"); return;
case LayersBackend::LAYERS_OPENGL: aName.AssignLiteral("OpenGL"); return;
case LayersBackend::LAYERS_D3D9: aName.AssignLiteral("Direct3D 9"); return;
case LayersBackend::LAYERS_D3D10: aName.AssignLiteral("Direct3D 10"); return;
case LayersBackend::LAYERS_D3D11: {
#ifdef XP_WIN
if (gfxWindowsPlatform::GetPlatform()->IsWARP()) {

View File

@ -993,9 +993,7 @@ PuppetWidget::Paint()
nsAutoCString("PuppetWidget"), 0);
#endif
if (mozilla::layers::LayersBackend::LAYERS_D3D10 == mLayerManager->GetBackendType()) {
mAttachedWidgetListener->PaintWindow(this, region);
} else if (mozilla::layers::LayersBackend::LAYERS_CLIENT == mLayerManager->GetBackendType()) {
if (mozilla::layers::LayersBackend::LAYERS_CLIENT == mLayerManager->GetBackendType()) {
// Do nothing, the compositor will handle drawing
if (mTabChild) {
mTabChild->NotifyPainted();