Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/gpu/gpu_data_manager_impl_private_unittest.cc

Issue 2715563002: Moving SwiftShader from component to bundled library (Closed)
Patch Set: Fixed nits and some unit tests Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/browser/gpu/gpu_data_manager_impl_private.cc ('K') | « content/browser/gpu/gpu_data_manager_impl_private.cc ('k') | content/public/browser/gpu_data_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
index 880a83fe77f85d13a6bc49778cb7ce6e6645addc..aa7743fa4143dd0013c9aa44a2ea4f545f2c802a 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
@@ -179,16 +179,32 @@ TEST_F(GpuDataManagerImplPrivateTest, GpuSideBlacklisting) {
EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
EXPECT_TRUE(reason.empty());
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
- EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ EXPECT_FALSE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ } else {
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ }
gpu_info.gl_vendor = "NVIDIA";
gpu_info.gl_renderer = "NVIDIA GeForce GT 120";
manager->UpdateGpuInfo(gpu_info);
- EXPECT_FALSE(manager->GpuAccessAllowed(&reason));
- EXPECT_FALSE(reason.empty());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
+ EXPECT_TRUE(reason.empty());
+ } else {
+ EXPECT_FALSE(manager->GpuAccessAllowed(&reason));
+ EXPECT_FALSE(reason.empty());
+ }
EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
- EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_FALSE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2));
+ } else {
+ EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ EXPECT_FALSE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2));
+ }
EXPECT_TRUE(manager->IsFeatureBlacklisted(
gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
}
@@ -234,7 +250,11 @@ TEST_F(GpuDataManagerImplPrivateTest, GpuSideBlacklistingWebGL) {
EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
EXPECT_TRUE(reason.empty());
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ }
EXPECT_TRUE(manager->IsFeatureBlacklisted(
gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
@@ -243,10 +263,18 @@ TEST_F(GpuDataManagerImplPrivateTest, GpuSideBlacklistingWebGL) {
manager->UpdateGpuInfo(gpu_info);
EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
EXPECT_TRUE(reason.empty());
- EXPECT_EQ(3u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_EQ(3u, manager->GetBlacklistedFeatureCount());
+ }
EXPECT_TRUE(manager->IsFeatureBlacklisted(
gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
- EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_FALSE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ } else {
+ EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
+ }
EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2));
}
@@ -280,13 +308,17 @@ TEST_F(GpuDataManagerImplPrivateTest, GpuSideExceptions) {
manager->InitializeForTesting(blacklist_json, gpu_info);
EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ EXPECT_EQ(manager->ShouldUseSwiftShader() ? 2u : 1u,
+ manager->GetBlacklistedFeatureCount());
// Now assume gpu process launches and full GPU info is collected.
gpu_info.gl_renderer = "NVIDIA GeForce GT 120";
manager->UpdateGpuInfo(gpu_info);
EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
- EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
+ // Since SwiftShader was enabled by first gpu_info, UpdateGpuInfo
+ // should have failed and SwiftShader should still be active
+ EXPECT_EQ(manager->ShouldUseSwiftShader() ? 2u : 0u,
+ manager->GetBlacklistedFeatureCount());
}
TEST_F(GpuDataManagerImplPrivateTest, DisableHardwareAcceleration) {
@@ -298,10 +330,16 @@ TEST_F(GpuDataManagerImplPrivateTest, DisableHardwareAcceleration) {
EXPECT_TRUE(reason.empty());
manager->DisableHardwareAcceleration();
- EXPECT_FALSE(manager->GpuAccessAllowed(&reason));
- EXPECT_FALSE(reason.empty());
- EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
- manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
+ EXPECT_TRUE(reason.empty());
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_FALSE(manager->GpuAccessAllowed(&reason));
+ EXPECT_FALSE(reason.empty());
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+ manager->GetBlacklistedFeatureCount());
+ }
}
TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering) {
@@ -313,18 +351,17 @@ TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering) {
EXPECT_FALSE(manager->ShouldUseSwiftShader());
manager->DisableHardwareAcceleration();
- EXPECT_FALSE(manager->GpuAccessAllowed(NULL));
- EXPECT_FALSE(manager->ShouldUseSwiftShader());
-
- // If SwiftShader is enabled, even if we blacklist GPU,
- // GPU process is still allowed.
- const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath"));
- manager->RegisterSwiftShaderPath(test_path);
- EXPECT_TRUE(manager->ShouldUseSwiftShader());
- EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_FALSE(manager->GpuAccessAllowed(NULL));
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+ manager->GetBlacklistedFeatureCount());
+ }
EXPECT_TRUE(manager->IsFeatureBlacklisted(
gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
+ EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2));
}
TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering2) {
@@ -335,18 +372,18 @@ TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering2) {
EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
EXPECT_FALSE(manager->ShouldUseSwiftShader());
- const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath"));
- manager->RegisterSwiftShaderPath(test_path);
- EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
- EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
- EXPECT_FALSE(manager->ShouldUseSwiftShader());
-
manager->DisableHardwareAcceleration();
- EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
- EXPECT_TRUE(manager->ShouldUseSwiftShader());
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_FALSE(manager->GpuAccessAllowed(NULL));
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+ manager->GetBlacklistedFeatureCount());
+ }
EXPECT_TRUE(manager->IsFeatureBlacklisted(
gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
+ EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2));
}
TEST_F(GpuDataManagerImplPrivateTest, GpuInfoUpdate) {
@@ -375,10 +412,11 @@ TEST_F(GpuDataManagerImplPrivateTest, NoGpuInfoUpdateWithSwiftShader) {
manager->InitializeForTesting("", gpu::GPUInfo());
manager->DisableHardwareAcceleration();
- const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath"));
- manager->RegisterSwiftShaderPath(test_path);
- EXPECT_TRUE(manager->ShouldUseSwiftShader());
- EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
+ } else {
+ EXPECT_FALSE(manager->GpuAccessAllowed(NULL));
+ }
{
base::RunLoop run_loop;
@@ -399,7 +437,12 @@ TEST_F(GpuDataManagerImplPrivateTest, NoGpuInfoUpdateWithSwiftShader) {
base::RunLoop run_loop;
run_loop.RunUntilIdle();
}
- EXPECT_FALSE(observer.gpu_info_updated());
+ if (manager->ShouldUseSwiftShader()) {
+ // Once SwiftShader is enabled, the gpu info can no longer be updated
+ EXPECT_FALSE(observer.gpu_info_updated());
+ } else {
+ EXPECT_TRUE(observer.gpu_info_updated());
+ }
}
TEST_F(GpuDataManagerImplPrivateTest, GPUVideoMemoryUsageStatsUpdate) {
@@ -748,17 +791,14 @@ TEST_F(GpuDataManagerImplPrivateTest, BlacklistAllFeatures) {
gpu_info.gpu.device_id = 0x0640;
manager->InitializeForTesting(blacklist_json, gpu_info);
- EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
- manager->GetBlacklistedFeatureCount());
- // TODO(zmo): remove the Linux specific behavior once we fix
- // crbug.com/238466.
-#if defined(OS_LINUX)
- EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
- EXPECT_TRUE(reason.empty());
-#else
- EXPECT_FALSE(manager->GpuAccessAllowed(&reason));
- EXPECT_FALSE(reason.empty());
-#endif
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
+ EXPECT_TRUE(reason.empty());
+ } else {
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+ manager->GetBlacklistedFeatureCount());
+ }
}
TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) {
@@ -796,7 +836,11 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) {
TestObserver observer;
manager->AddObserver(&observer);
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ }
// Update with the same Intel GPU active.
EXPECT_FALSE(manager->UpdateActiveGpu(0x8086, 0x04a1));
@@ -805,7 +849,11 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) {
run_loop.RunUntilIdle();
}
EXPECT_FALSE(observer.gpu_info_updated());
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ }
// Set NVIDIA GPU to be active.
EXPECT_TRUE(manager->UpdateActiveGpu(0x10de, 0x0640));
@@ -814,7 +862,11 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) {
run_loop.RunUntilIdle();
}
EXPECT_TRUE(observer.gpu_info_updated());
- EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
+ }
observer.Reset();
EXPECT_FALSE(observer.gpu_info_updated());
@@ -826,7 +878,11 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) {
run_loop.RunUntilIdle();
}
EXPECT_FALSE(observer.gpu_info_updated());
- EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
+ }
// Set Intel GPU to be active.
EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1));
@@ -835,7 +891,11 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) {
run_loop.RunUntilIdle();
}
EXPECT_TRUE(observer.gpu_info_updated());
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ if (manager->ShouldUseSwiftShader()) {
+ EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
+ } else {
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+ }
}
} // namespace content
« content/browser/gpu/gpu_data_manager_impl_private.cc ('K') | « content/browser/gpu/gpu_data_manager_impl_private.cc ('k') | content/public/browser/gpu_data_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698