Bug 1711118 - Part 3. Allow D3D11 compositing with Software WebRender in release. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D115081
This commit is contained in:
Andrew Osmond 2021-05-14 13:01:22 +00:00
parent 8f5da297a9
commit 05d9f058fd
2 changed files with 1 additions and 13 deletions

View File

@ -2671,18 +2671,6 @@ void gfxPlatform::InitWebRenderConfig() {
bool hasHardware = gfxConfig::IsEnabled(Feature::WEBRENDER);
bool hasSoftware = gfxConfig::IsEnabled(Feature::WEBRENDER_SOFTWARE);
#if defined(XP_WIN) && !defined(EARLY_BETA_OR_EARLIER)
// If we have D3D11 compositing, and Software WebRender isn't forced on, then
// we should prefer D3D11 compositing over Software WebRender in late beta and
// release by default. We may chose to fallback to Software WebRender in
// gfxPlatform::FallbackFromAcceleration.
if (gfxConfig::IsEnabled(Feature::D3D11_COMPOSITING) &&
!gfxConfig::IsForcedOnByUser(Feature::WEBRENDER_SOFTWARE)) {
hasSoftware = false;
}
#endif
bool hasWebRender = hasHardware || hasSoftware;
#ifdef XP_WIN

View File

@ -5012,7 +5012,7 @@
# Whether or not to fallback from WebRender to Software WebRender + D3D11.
- name: gfx.webrender.fallback.software-d3d11
type: bool
value: @IS_NIGHTLY_BUILD@
value: true
mirror: once
#endif