From 5a41ea33e086eb570e127a379102513ae3875a3f Mon Sep 17 00:00:00 2001 From: Andrew Osmond Date: Thu, 28 May 2020 13:24:29 +0000 Subject: [PATCH] Bug 1641510 - Ensure we allow WebRender on beta/release for 60 Hz monitors. r=jrmuizel Differential Revision: https://phabricator.services.mozilla.com/D77234 --- gfx/config/gfxConfigManager.cpp | 2 +- gfx/tests/gtest/TestConfigManager.cpp | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gfx/config/gfxConfigManager.cpp b/gfx/config/gfxConfigManager.cpp index dcc44ff5d649..74138d060a37 100644 --- a/gfx/config/gfxConfigManager.cpp +++ b/gfx/config/gfxConfigManager.cpp @@ -181,7 +181,7 @@ bool gfxConfigManager::ConfigureWebRenderQualified() { } int32_t maxRefreshRate = mGfxInfo->GetMaxRefreshRate(); - if (maxRefreshRate >= 60) { + if (maxRefreshRate > 60) { mFeatureWrQualified->Disable(FeatureStatus::Blocked, "Monitor refresh rate too high", NS_LITERAL_CSTRING("REFRESH_RATE_TOO_HIGH")); diff --git a/gfx/tests/gtest/TestConfigManager.cpp b/gfx/tests/gtest/TestConfigManager.cpp index 5adbce636937..e2e4f6977c4a 100644 --- a/gfx/tests/gtest/TestConfigManager.cpp +++ b/gfx/tests/gtest/TestConfigManager.cpp @@ -725,3 +725,19 @@ TEST_F(GfxConfigManager, WebRenderHighRefreshRateNotNightly) { EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled()); EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled()); } + +TEST_F(GfxConfigManager, WebRenderAtRefreshRateThreshold) { + mIsNightly = false; + mMockGfxInfo->mMaxRefreshRate = 60; + ConfigureWebRender(); + + EXPECT_TRUE(mFeatures.mWrQualified.IsEnabled()); + 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.mHwCompositing.IsEnabled()); + EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled()); + EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled()); +}