gpu: Allow overriding GPU driver workarounds via command line

This change allows you to enable GPU driver workarounds by providing command
line switches with the name of the workaround. These workarounds are used
instead of the workarounds loaded from the JSON data. The command line switch
will be propagated into the GPU process allowing these to be applied both with
in-process GPU and without.

BUG=347130
TEST=run content_gl_test or chromium with and without switches and observe
workarounds being applied.

Review URL: https://codereview.chromium.org/180243012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254629 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 29 insertions, 7 deletions

diff --git a/gpu/config/gpu_driver_bug_list.cc b/gpu/config/gpu_driver_bug_list.cc
index d845c16..68014aa 100644
--- a/gpu/config/gpu_driver_bug_list.cc
+++ b/gpu/config/gpu_driver_bug_list.cc
@@ -5,8 +5,10 @@
 #include "gpu/config/gpu_driver_bug_list.h"
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
+#include "gpu/config/gpu_util.h"
 
 namespace gpu {
 
@@ -17,6 +19,12 @@ struct DriverBugInfo {
   std::string feature_name;
 };
 
+const DriverBugInfo kFeatureList[] = {
+#define GPU_OP(type, name) { type, #name },
+  GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)
+#undef GPU_OP
+};
+
 }  // namespace anonymous
 
 GpuDriverBugList::GpuDriverBugList()
@@ -30,11 +38,6 @@ GpuDriverBugList::~GpuDriverBugList() {
 GpuDriverBugList* GpuDriverBugList::Create() {
   GpuDriverBugList* list = new GpuDriverBugList();
 
-  const DriverBugInfo kFeatureList[] = {
-#define GPU_OP(type, name) { type, #name },
-    GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)
-#undef GPU_OP
-  };
   DCHECK_EQ(static_cast<int>(arraysize(kFeatureList)),
             NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES);
   for (int i = 0; i < NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES; ++i) {
@@ -55,5 +58,16 @@ std::string GpuDriverBugWorkaroundTypeToString(
   };
 }
 
+std::set<int> WorkaroundsFromCommandLine(CommandLine* command_line) {
+  std::set<int> workarounds;
+
+  for (int i = 0; i < NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES; i++) {
+    if (command_line->HasSwitch(kFeatureList[i].feature_name))
+      workarounds.insert(kFeatureList[i].feature_type);
+  }
+
+  return workarounds;
+}
+
 }  // namespace gpu
 
diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
index f2c861b..641914f 100644
--- a/gpu/config/gpu_util.cc
+++ b/gpu/config/gpu_util.cc
@@ -65,8 +65,11 @@ void ApplyGpuDriverBugWorkarounds(
   scoped_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
   list->LoadList(kGpuDriverBugListJson,
                  GpuControlList::kCurrentOsOnly);
-  std::set<int> workarounds = list->MakeDecision(
-      GpuControlList::kOsAny, std::string(), gpu_info);
+  std::set<int> workarounds = WorkaroundsFromCommandLine(command_line);
+  if (workarounds.empty()) {
+    workarounds = list->MakeDecision(
+        GpuControlList::kOsAny, std::string(), gpu_info);
+  }
   if (!workarounds.empty()) {
     command_line->AppendSwitchASCII(switches::kGpuDriverBugWorkarounds,
                                     IntSetToString(workarounds));
diff --git a/gpu/config/gpu_util.h b/gpu/config/gpu_util.h
index 39aeb20..c10cca6 100644
--- a/gpu/config/gpu_util.h
+++ b/gpu/config/gpu_util.h
@@ -8,6 +8,7 @@
 #include <set>
 #include <string>
 
+#include "base/command_line.h"
 #include "build/build_config.h"
 #include "gpu/gpu_export.h"
 
@@ -34,6 +35,10 @@ GPU_EXPORT void ApplyGpuDriverBugWorkarounds(
 GPU_EXPORT void StringToFeatureSet(
     const std::string& str, std::set<int>* feature_set);
 
+// Get the set of workarounds from switches provided in |command_line|
+GPU_EXPORT std::set<int> WorkaroundsFromCommandLine(
+    CommandLine* command_line);
+
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_UTIL_H_