diff --git a/gfx/config/gfxConfigManager.cpp b/gfx/config/gfxConfigManager.cpp index a9df4b2e19a9..5b6367bbd79a 100644 --- a/gfx/config/gfxConfigManager.cpp +++ b/gfx/config/gfxConfigManager.cpp @@ -201,15 +201,7 @@ void gfxConfigManager::ConfigureWebRenderQualified() { // Disable WebRender if we don't have DirectComposition nsAutoString adapterVendorID; mGfxInfo->GetAdapterVendorID(adapterVendorID); - if (adapterVendorID == u"0x8086") { - bool mixed; - int32_t maxRefreshRate = mGfxInfo->GetMaxRefreshRate(&mixed); - if (maxRefreshRate > 75) { - mFeatureWrQualified->Disable(FeatureStatus::Blocked, - "Monitor refresh rate too high", - "REFRESH_RATE_TOO_HIGH"_ns); - } - } else if (adapterVendorID == u"0x10de") { + if (adapterVendorID == u"0x10de") { bool mixed = false; int32_t maxRefreshRate = mGfxInfo->GetMaxRefreshRate(&mixed); if (maxRefreshRate > 60 && mixed) { diff --git a/gfx/tests/gtest/TestConfigManager.cpp b/gfx/tests/gtest/TestConfigManager.cpp index 16d526036cd9..8fb4ff14902a 100644 --- a/gfx/tests/gtest/TestConfigManager.cpp +++ b/gfx/tests/gtest/TestConfigManager.cpp @@ -607,60 +607,6 @@ TEST_F(GfxConfigManager, WebRenderIntelBatteryNoHwStretchingNotNightly) { EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled()); } -TEST_F(GfxConfigManager, WebRenderIntelHighRefreshRateNightly) { - mIsNightly = true; - mMockGfxInfo->mMaxRefreshRate = 120; - mMockGfxInfo->mVendorId = "0x8086"; - 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()); - EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled()); -} - -TEST_F(GfxConfigManager, WebRenderIntelHighRefreshRateNotNightly) { - mIsNightly = false; - mMockGfxInfo->mMaxRefreshRate = 120; - mMockGfxInfo->mVendorId = "0x8086"; - ConfigureWebRender(); - - EXPECT_FALSE(mFeatures.mWrQualified.IsEnabled()); - EXPECT_FALSE(mFeatures.mWr.IsEnabled()); - EXPECT_FALSE(mFeatures.mWrCompositor.IsEnabled()); - EXPECT_FALSE(mFeatures.mWrAngle.IsEnabled()); - EXPECT_FALSE(mFeatures.mWrDComp.IsEnabled()); - EXPECT_FALSE(mFeatures.mWrPartial.IsEnabled()); - EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled()); - EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled()); - EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled()); - EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled()); -} - -TEST_F(GfxConfigManager, WebRenderIntelAtRefreshRateThreshold) { - mIsNightly = false; - mMockGfxInfo->mMaxRefreshRate = 75; - mMockGfxInfo->mVendorId = "0x8086"; - 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()); - EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled()); -} - TEST_F(GfxConfigManager, WebRenderNvidiaHighMixedRefreshRateNightly) { mIsNightly = true; mMockGfxInfo->mMaxRefreshRate = 120;