Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset cb107011caf5 (bug 1549965) for causing assertion failures on gfxFeature.cpp . CLOSED TREE

Browse Source
This commit is contained in:
Narcis Beleuzu 2019-05-30 23:54:36 +03:00
parent 197c57d894
commit 4938f48e9f
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gfx/thebes/gfxPlatform.cpp
View File

@ -2923,23 +2923,13 @@ void gfxPlatform::InitWebRenderConfig() {
}
}
#if defined(MOZ_WIDGET_GTK)
else {
if (gfxConfig::IsEnabled(Feature::HW_COMPOSITING)) {
// Hardware compositing should be disabled by default if we aren't using
// WebRender. We had to check if it is enabled at all, because it may
// already have been forced disabled (e.g. safe mode, headless). It may
// still be forced on by the user, and if so, this should have no effect.
gfxConfig::Disable(Feature::HW_COMPOSITING, FeatureStatus::Blocked,
"Acceleration blocked by platform");
}
if (!gfxConfig::IsEnabled(Feature::HW_COMPOSITING) &&
!StaticPrefs::GPUProcessAllowSoftware()) {
// We have neither WebRender nor OpenGL, and we don't allow the GPU
// process for basic compositor.
gfxConfig::Disable(Feature::GPU_PROCESS, FeatureStatus::Unavailable,
"Hardware compositing is unavailable.");
}
else if (gfxConfig::IsEnabled(Feature::HW_COMPOSITING)) {
// Hardware compositing should be disabled by default if we aren't using
// WebRender. We had to check if it is enabled at all, because it may
// already have been forced disabled (e.g. safe mode, headless). It may
// still be forced on by the user, and if so, this should have no effect.
gfxConfig::Disable(Feature::HW_COMPOSITING, FeatureStatus::Blocked,
"Acceleration blocked by platform");
}
#endif

9
modules/libpref/init/all.js
View File

@ -5013,19 +5013,14 @@ pref("layers.acceleration.disabled", false);
// and output the result to stderr.
pref("layers.bench.enabled", false);
#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
#if defined(XP_WIN)
pref("layers.gpu-process.enabled", true);
pref("layers.gpu-process.allow-software", true);
#ifdef NIGHTLY_BUILD
pref("layers.gpu-process.max_restarts", 3);
#endif
#endif
#if defined(XP_WIN)
pref("layers.gpu-process.allow-software", true);
#elif defined(MOZ_WIDGET_GTK)
pref("layers.gpu-process.allow-software", false);
#endif
// Whether to force acceleration on, ignoring blacklists.
#ifdef ANDROID
// bug 838603 -- on Android, accidentally blacklisting OpenGL layers