Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset cdb8f29d1ec7 (bug 1116540) for breaking WinXP hardware acceleration.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2016-05-17 21:36:12 -04:00
parent 4ef57cf4cf
commit 591aa16396
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -499,7 +499,11 @@ gfxWindowsPlatform::UpdateBackendPrefs()
uint32_t canvasMask = BackendTypeBit(SOFTWARE_BACKEND);
uint32_t contentMask = BackendTypeBit(SOFTWARE_BACKEND);
BackendType defaultBackend = SOFTWARE_BACKEND;
if (gfxConfig::IsEnabled(Feature::DIRECT2D) && Factory::GetD2D1Device()) {
if (gfxConfig::IsEnabled(Feature::DIRECT2D)) {
MOZ_RELEASE_ASSERT(Factory::GetDirect3D11Device());
MOZ_RELEASE_ASSERT(Factory::GetD2D1Device());
MOZ_RELEASE_ASSERT(Factory::SupportsD2D1());
contentMask |= BackendTypeBit(BackendType::DIRECT2D1_1);
canvasMask |= BackendTypeBit(BackendType::DIRECT2D1_1);
defaultBackend = BackendType::DIRECT2D1_1;
@ -1967,11 +1971,6 @@ gfxWindowsPlatform::InitializeD3D9Config()
FeatureState& d3d9 = gfxConfig::GetFeature(Feature::D3D9_COMPOSITING);
if (!gfxConfig::IsEnabled(Feature::D3D9_COMPOSITING)) {
d3d9.DisableByDefault(FeatureStatus::Unavailable, "Hardware compositing is disabled");
return;
}
if (!IsVistaOrLater()) {
d3d9.EnableByDefault();
} else {
@ -2529,18 +2528,15 @@ gfxWindowsPlatform::InitializeD2DConfig()
if (!gfxConfig::IsEnabled(Feature::D3D11_COMPOSITING)) {
d2d1.DisableByDefault(FeatureStatus::Unavailable, "Direct2D requires Direct3D 11 compositing");
return;
}
if (!IsVistaOrLater()) {
} else if (!IsVistaOrLater()) {
d2d1.DisableByDefault(FeatureStatus::Unavailable, "Direct2D is not available on Windows XP");
return;
} else {
d2d1.SetDefaultFromPref(
gfxPrefs::GetDirect2DDisabledPrefName(),
false,
gfxPrefs::GetDirect2DDisabledPrefDefault());
}
d2d1.SetDefaultFromPref(
gfxPrefs::GetDirect2DDisabledPrefName(),
false,
gfxPrefs::GetDirect2DDisabledPrefDefault());
nsCString message;
if (!IsGfxInfoStatusOkay(nsIGfxInfo::FEATURE_DIRECT2D, &message)) {
d2d1.Disable(FeatureStatus::Blacklisted, message.get());