Enable SwiftShader fallback on desktop Linux.

content/browser/gpu/gpu_data_manager_impl_private_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 167 matching lines @@
   gpu_info.gl_vendor = "NVIDIA";
   gpu_info.gl_renderer = "NVIDIA GeForce GT 120";
   manager->UpdateGpuInfo(gpu_info);
   if (manager->ShouldUseSwiftShader()) {
     EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
     EXPECT_TRUE(reason.empty());
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
     EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2));
   } else {
-    EXPECT_FALSE(manager->GpuAccessAllowed(&reason));
-    EXPECT_FALSE(reason.empty());
+    EXPECT_TRUE(manager->GpuAccessAllowed(&reason));
+    EXPECT_TRUE(reason.empty());
     EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount());
     EXPECT_FALSE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2));
   }
   EXPECT_TRUE(
       manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
   EXPECT_TRUE(manager->IsFeatureBlacklisted(
       gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
 }
 
 TEST_F(GpuDataManagerImplPrivateTest, GpuSideBlacklistingWebGL) {
@@ skipping 363 matching lines @@
   };
   const gpu::GpuControlListData kData("1.0", 1, kEntries);
 
   gpu::GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x8086;
   gpu_info.gpu.device_id = 0x0042;
   manager->InitializeForTesting(kData, gpu_info);
 
   // Not enough GPUInfo.
   EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
-  EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  if (manager->ShouldUseSwiftShader()) {
+    EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+              manager->GetBlacklistedFeatureCount());
+  } else {
+    EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  }
 
   // Now assume browser gets GL strings from local state.
   // The entry applies, blacklist more features than from the preliminary step.
   // However, GPU process is not blocked because this is all browser side and
   // happens before renderer launching.
   manager->SetGLStrings(kGLVendorMesa, kGLRendererMesa, kGLVersionMesa801);
   EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
-  EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  if (manager->ShouldUseSwiftShader()) {
+    EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+              manager->GetBlacklistedFeatureCount());
+  } else {
+    EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  }
   EXPECT_TRUE(
       manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
 }
 
 TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsNoEffects) {
   const char* kGLVendorMesa = "Tungsten Graphics, Inc";
   const char* kGLRendererMesa = "Mesa DRI Intel(R) G41";
   const char* kGLVersionMesa801 = "2.1 Mesa 8.0.1-DEVEL";
   const char* kGLVersionMesa802 = "2.1 Mesa 8.0.2-DEVEL";
 
@@ skipping 12 matching lines @@
   gpu_info.gpu.device_id = 0x0042;
   gpu_info.gl_vendor = kGLVendorMesa;
   gpu_info.gl_renderer = kGLRendererMesa;
   gpu_info.gl_version = kGLVersionMesa801;
   gpu_info.driver_vendor = "Mesa";
   gpu_info.driver_version = "8.0.1";
   manager->InitializeForTesting(kData, gpu_info);
 
   // Full GPUInfo, the entry applies.
   EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
-  EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  if (manager->ShouldUseSwiftShader()) {
+    EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+              manager->GetBlacklistedFeatureCount());
+  } else {
+    EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  }
   EXPECT_TRUE(
       manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
 
   // Now assume browser gets GL strings from local state.
   // SetGLStrings() has no effects because GPUInfo already got these strings.
   // (Otherwise the entry should not apply.)
   manager->SetGLStrings(kGLVendorMesa, kGLRendererMesa, kGLVersionMesa802);
   EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
-  EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  if (manager->ShouldUseSwiftShader()) {
+    EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+              manager->GetBlacklistedFeatureCount());
+  } else {
+    EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  }
   EXPECT_TRUE(
       manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
 }
 
 TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsDefered) {
   const char* kGLVendorMesa = "Tungsten Graphics, Inc";
   const char* kGLRendererMesa = "Mesa DRI Intel(R) G41";
   const char* kGLVersionMesa801 = "2.1 Mesa 8.0.1-DEVEL";
 
   ScopedGpuDataManagerImplPrivate manager;
@@ skipping 10 matching lines @@
 
   // Assume browser gets GL strings from local state.
   manager->SetGLStrings(kGLVendorMesa, kGLRendererMesa, kGLVersionMesa801);
 
   gpu::GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x8086;
   gpu_info.gpu.device_id = 0x0042;
   manager->InitializeForTesting(kData, gpu_info);
 
   EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
-  EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  if (manager->ShouldUseSwiftShader()) {
+    EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
+              manager->GetBlacklistedFeatureCount());
+  } else {
+    EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+  }
+
   EXPECT_TRUE(
       manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
 }
 #endif  // OS_LINUX
 
 TEST_F(GpuDataManagerImplPrivateTest, GpuDriverBugListSingle) {
   ScopedGpuDataManagerImplPrivate manager;
   manager->gpu_driver_bugs_.insert(5);
 
   base::CommandLine command_line(0, NULL);
@@ skipping 73 matching lines @@
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
 
     // Update to previous Intel GPU.
     EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1));
     {
       base::RunLoop run_loop;
       run_loop.RunUntilIdle();
     }
     EXPECT_TRUE(observer.gpu_info_updated());
-
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
   } else {
     EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
 
-    // Update with the same Intel GPU active.
+    // Update to previous Intel GPU.
     EXPECT_FALSE(manager->UpdateActiveGpu(0x8086, 0x04a1));
     {
       base::RunLoop run_loop;
       run_loop.RunUntilIdle();
     }
     EXPECT_FALSE(observer.gpu_info_updated());
-
     EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
   }
 
   // Set NVIDIA GPU to be active.
   EXPECT_TRUE(manager->UpdateActiveGpu(0x10de, 0x0640));
   {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
   EXPECT_TRUE(observer.gpu_info_updated());
   if (manager->ShouldUseSwiftShader()) {
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
   } else {
     EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
   }
 
   observer.Reset();
   EXPECT_FALSE(observer.gpu_info_updated());
 
+  // Update to previous NVIDIA GPU.
+  EXPECT_FALSE(manager->UpdateActiveGpu(0x10de, 0x0640));
+  {
+    base::RunLoop run_loop;
+    run_loop.RunUntilIdle();
+  }
+  EXPECT_FALSE(observer.gpu_info_updated());

[Ken Russell (switch to Gerrit), 2017/04/11 22:03:45]

It's a little confusing to me that the EXPECT_TRUEs which were previously used
for these two tests when SwiftShader was active are now changed to
EXPECT_FALSEs, but I assume the reason is understood.

+
   if (manager->ShouldUseSwiftShader()) {
-    // Update to previous NVIDIA GPU.
-    EXPECT_TRUE(manager->UpdateActiveGpu(0x10de, 0x0640));
-    {
-      base::RunLoop run_loop;
-      run_loop.RunUntilIdle();
-    }
-    EXPECT_TRUE(observer.gpu_info_updated());
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
   } else {
-    // Update with the same NVIDIA GPU active.
-    EXPECT_FALSE(manager->UpdateActiveGpu(0x10de, 0x0640));
-    {
-      base::RunLoop run_loop;
-      run_loop.RunUntilIdle();
-    }
-    EXPECT_FALSE(observer.gpu_info_updated());
     EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
   }
 
   // Set Intel GPU to be active.
   EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1));
   {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
   EXPECT_TRUE(observer.gpu_info_updated());
   if (manager->ShouldUseSwiftShader()) {
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
   } else {
     EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
   }
 }
 
 }  // namespace content