Move force glFlush in compositing_iosurface_mac.mm to gpu driver bug list

BUG=351452
TEST=bots
R=kbr@chromium.org,bajones@chromium.org,ccameron@chromium.org

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

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

4 files changed, 37 insertions, 8 deletions

diff --git a/gpu/command_buffer/service/gpu_switches.cc b/gpu/command_buffer/service/gpu_switches.cc
index bff23c3..3f03bdf 100644
--- a/gpu/command_buffer/service/gpu_switches.cc
+++ b/gpu/command_buffer/service/gpu_switches.cc
@@ -40,11 +40,6 @@ const char kDisableGpuProgramCache[]        = "disable-gpu-program-cache";
 // Enforce GL minimums.
 const char kEnforceGLMinimums[]             = "enforce-gl-minimums";
 
-// Force the use of a workaround for graphics hangs seen on certain
-// Mac OS systems. Enabled by default (and can't be disabled) on known
-// affected systems.
-const char kForceGLFinishWorkaround[]       = "force-glfinish-workaround";
-
 // Sets the total amount of memory that may be allocated for GPU resources
 const char kForceGpuMemAvailableMb[]        = "force-gpu-mem-available-mb";
 
@@ -75,7 +70,6 @@ const char* kGpuSwitches[] = {
   kEnableGPUServiceLoggingGPU,
   kDisableGpuProgramCache,
   kEnforceGLMinimums,
-  kForceGLFinishWorkaround,
   kForceGpuMemAvailableMb,
   kForceSynchronousGLReadPixels,
   kGpuDriverBugWorkarounds,
diff --git a/gpu/command_buffer/service/gpu_switches.h b/gpu/command_buffer/service/gpu_switches.h
index 7916d690..f76a2f0 100644
--- a/gpu/command_buffer/service/gpu_switches.h
+++ b/gpu/command_buffer/service/gpu_switches.h
@@ -21,7 +21,6 @@ GPU_EXPORT extern const char kEnableGPUDebugging[];
 GPU_EXPORT extern const char kEnableGPUServiceLoggingGPU[];
 GPU_EXPORT extern const char kDisableGpuProgramCache[];
 GPU_EXPORT extern const char kEnforceGLMinimums[];
-GPU_EXPORT extern const char kForceGLFinishWorkaround[];
 GPU_EXPORT extern const char kForceGpuMemAvailableMb[];
 GPU_EXPORT extern const char kForceSynchronousGLReadPixels[];
 GPU_EXPORT extern const char kGpuDriverBugWorkarounds[];
diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc
index ec04f8b..8d1f98f 100644
--- a/gpu/config/gpu_driver_bug_list_json.cc
+++ b/gpu/config/gpu_driver_bug_list_json.cc
@@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
 {
   "name": "gpu driver bug list",
   // Please update the version number whenever you change this file.
-  "version": "4.6",
+  "version": "4.7",
   "entries": [
     {
       "id": 1,
@@ -874,6 +874,40 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
       "features": [
         "init_vertex_attributes"
       ]
+    },
+    {
+      "id": 66,
+      "description": "Force glFinish() after compositing on older OS X",
+      "cr_bugs": [123409],
+      "os": {
+        "type": "macosx",
+        "version": {
+          "op": "<=",
+          "value": "10.7"
+        }
+      },
+      "vendor_id": "0x8086",
+      "multi_gpu_category": "any",
+      "features": [
+        "force_gl_finish_after_compositing"
+      ]
+    },
+    {
+      "id": 67,
+      "description": "Force glFinish() after compositing on Mavericks with Retina MacBook Pro",
+      // TODO(ccameron): Get rid of this when we move to CoreAnimation.
+      "cr_bugs": [318877],
+      "os": {
+        "type": "macosx",
+        "version": {
+          "op": ">=",
+          "value": "10.9"
+        }
+      },
+      "multi_gpu_style": "optimus",
+      "features": [
+        "force_gl_finish_after_compositing"
+      ]
     }
   ]
 }
diff --git a/gpu/config/gpu_driver_bug_workaround_type.h b/gpu/config/gpu_driver_bug_workaround_type.h
index 925cdfc..922d971 100644
--- a/gpu/config/gpu_driver_bug_workaround_type.h
+++ b/gpu/config/gpu_driver_bug_workaround_type.h
@@ -42,6 +42,8 @@
          exit_on_context_lost)                               \
   GPU_OP(FORCE_DISCRETE_GPU,                                 \
          force_discrete_gpu)                                 \
+  GPU_OP(FORCE_GL_FINISH_AFTER_COMPOSITING,                  \
+         force_gl_finish_after_compositing)                  \
   GPU_OP(FORCE_INTEGRATED_GPU,                               \
          force_integrated_gpu)                               \
   GPU_OP(INIT_GL_POSITION_IN_VERTEX_SHADER,                  \