Commit 98dc3ec1 authored by Ray Kraesig's avatar Ray Kraesig
Browse files

Bug 1830792 - [3/4] Remove is-nightly check for bug 1704954 mitigation r=gfx-reviewers,bradwerth 

This mitigation exposed bug 1763981. Unfortunately, not applying it on
Nightly made it look like bug 1763981 was _fixed_ in Nightly, tricking
several users and developers and making testing needlessly more
difficult even after this was discovered.

Apply the mitigation across the board, regardless of release channel.
Developers may still set `gfx.webrender.dcomp-apply-1704954` to override
this as needed for testing (e.g.) fixes for bug 1638709.

Differential Revision: https://phabricator.services.mozilla.com/D176843
parent 8254d78e

gfx/config/gfxConfigManager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -273,8 +273,7 @@ void gfxConfigManager::ConfigureWebRender() { 
                             "FEATURE_FAILURE_NO_GPU_PROCESS"_ns);

  }



  if (!mIsNightly &&

      StaticPrefs::gfx_webrender_dcomp_apply_1704954_AtStartup()) {

  if (StaticPrefs::gfx_webrender_dcomp_apply_1704954_AtStartup()) {

    // Disable DirectComposition for NVIDIA users with high/mixed refresh rate

    // monitors due to rendering artifacts. (But allow users to override this

    // disabling due to bug 1763981.)

gfx/tests/gtest/TestConfigManager.cpp

+1 −21
Original line number Diff line number Diff line
@@ -645,27 +645,7 @@ TEST_F(GfxConfigManager, WebRenderIntelBatteryNoHwStretchingNotNightly) { 
  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());

}



TEST_F(GfxConfigManager, WebRenderNvidiaHighMixedRefreshRateNightly) {

  mIsNightly = true;

  mMockGfxInfo->mMaxRefreshRate = 120;

  mMockGfxInfo->mHasMixedRefreshRate = true;

  ConfigureWebRender();



  EXPECT_TRUE(mFeatures.mWr.IsEnabled());

  EXPECT_TRUE(mFeatures.mWrCompositor.IsEnabled());

  EXPECT_TRUE(mFeatures.mWrAngle.IsEnabled());

  EXPECT_TRUE(mFeatures.mWrDComp.IsEnabled());

  EXPECT_TRUE(mFeatures.mWrPartial.IsEnabled());

  EXPECT_TRUE(mFeatures.mWrShaderCache.IsEnabled());

  EXPECT_TRUE(mFeatures.mWrOptimizedShaders.IsEnabled());

  EXPECT_TRUE(mFeatures.mWrScissoredCacheClears.IsEnabled());

  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());

  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());

  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());

}



TEST_F(GfxConfigManager, WebRenderNvidiaHighMixedRefreshRateNotNightly) {

  mIsNightly = mIsEarlyBetaOrEarlier = false;

TEST_F(GfxConfigManager, WebRenderNvidiaHighMixedRefreshRate) {

  mMockGfxInfo->mMaxRefreshRate = 120;

  mMockGfxInfo->mHasMixedRefreshRate = true;

  ConfigureWebRender();