summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2021-11-17 20:39:21 +0000
committerMoonchild <moonchild@palemoon.org>2022-04-04 22:14:00 +0200
commitcff9ef7fb81b46264caea00ac3c7a99677d8b856 (patch)
treefa4b88f4c64506dd4db0407fd88f2e0166dde7c4
parent124a5a8eb7e4413d112b76d3034eeda57ed83429 (diff)
downloaduxp-cff9ef7fb81b46264caea00ac3c7a99677d8b856.tar.gz
Issue #1841 - Part 1: Ignore the values for D3D9 preferences, forcing
them to their current default, in preparation for the removal.
-rw-r--r--gfx/thebes/gfxPrefs.h4
-rw-r--r--modules/libpref/init/all.js3
2 files changed, 2 insertions, 5 deletions
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index a0bb7586c7..c061a3f04b 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -450,7 +450,7 @@ private:
DECL_GFX_PREF(Live, "layers.acceleration.draw-fps.print-histogram", FPSPrintHistogram, bool, false);
DECL_GFX_PREF(Live, "layers.acceleration.draw-fps.write-to-file", WriteFPSToFile, bool, false);
DECL_GFX_PREF(Once, "layers.acceleration.force", LayersAccelerationForceEnabledDoNotUseDirectly, bool, false);
- DECL_GFX_PREF(Once, "layers.allow-d3d9-fallback", LayersAllowD3D9Fallback, bool, false);
+ DECL_GFX_PREF(Skip, "layers.allow-d3d9-fallback", LayersAllowD3D9Fallback, bool, false);
DECL_GFX_PREF(Once, "layers.amd-switchable-gfx.enabled", LayersAMDSwitchableGfxEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.async-pan-zoom.enabled", AsyncPanZoomEnabledDoNotUseDirectly, bool, true);
DECL_GFX_PREF(Once, "layers.async-pan-zoom.separate-event-thread", AsyncPanZoomSeparateEventThread, bool, false);
@@ -495,7 +495,7 @@ private:
DECL_GFX_PREF(Live, "layers.offmainthreadcomposition.frame-rate", LayersCompositionFrameRate, int32_t,-1);
DECL_GFX_PREF(Live, "layers.orientation.sync.timeout", OrientationSyncMillis, uint32_t, (uint32_t)0);
DECL_GFX_PREF(Once, "layers.overzealous-gralloc-unlocking", OverzealousGrallocUnlocking, bool, false);
- DECL_GFX_PREF(Once, "layers.prefer-d3d9", LayersPreferD3D9, bool, false);
+ DECL_GFX_PREF(Skip, "layers.prefer-d3d9", LayersPreferD3D9, bool, false);
DECL_GFX_PREF(Once, "layers.prefer-opengl", LayersPreferOpenGL, bool, false);
DECL_GFX_PREF(Live, "layers.progressive-paint", ProgressivePaint, bool, false);
DECL_GFX_PREF(Live, "layers.shared-buffer-provider.enabled", PersistentBufferProviderSharedEnabled, bool, false);
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 8e7c5eea01..0473447f23 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4016,9 +4016,6 @@ pref("gfx.direct2d.disabled", false);
pref("gfx.direct2d.force-enabled", false);
pref("layers.prefer-opengl", false);
-pref("layers.prefer-d3d9", false);
-// Enable fallback if d3d11 can't be used. See bug #1262187
-pref("layers.allow-d3d9-fallback", true);
#endif
// Copy-on-write canvas