Workaround for Intel 6xxx clear to 0/1 bug

gpu/ipc/service/gpu_init.cc

 // Copyright 2016 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 "gpu/ipc/service/gpu_init.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
@@ skipping 66 matching lines @@
         if (gpu_info.secondary_gpus[i].vendor_id == active_vendor_id &&
             gpu_info.secondary_gpus[i].device_id == active_device_id) {
           gpu_info.secondary_gpus[i].active = true;
           break;
         }
       }
     }
   }
 }
 
-#if !defined(OS_MACOSX)
 void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
   TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
 
   gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info);
   switch (result) {
     case gpu::kCollectInfoFatalFailure:
       LOG(ERROR) << "gpu::CollectGraphicsInfo failed (fatal).";
       break;
     case gpu::kCollectInfoNonFatalFailure:
       DVLOG(1) << "gpu::CollectGraphicsInfo failed (non-fatal).";
       break;
     case gpu::kCollectInfoNone:
       NOTREACHED();
       break;
     case gpu::kCollectInfoSuccess:
       break;
   }
 
 #if defined(OS_WIN)
   if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2 &&
       gl::GLSurfaceEGL::IsDirectCompositionSupported() &&
       DirectCompositionSurfaceWin::AreOverlaysSupported()) {
     gpu_info.supports_overlays = true;
   }
 #endif  // defined(OS_WIN)
 }
-#endif  // defined(OS_MACOSX)
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 bool CanAccessNvidiaDeviceFile() {
   bool res = true;
   base::ThreadRestrictions::AssertIOAllowed();
   if (access("/dev/nvidiactl", R_OK) != 0) {
     DVLOG(1) << "NVIDIA device file /dev/nvidiactl access denied";
     res = false;
   }
   return res;
@@ skipping 104 matching lines @@
     return false;
   }
 
   // We need to collect GL strings (VENDOR, RENDERER) for blacklisting purposes.
   // However, on Mac we don't actually use them. As documented in
   // crbug.com/222934, due to some driver issues, glGetString could take
   // multiple seconds to finish, which in turn cause the GPU process to crash.
   // By skipping the following code on Mac, we don't really lose anything,
   // because the basic GPU information is passed down from the host process.
   base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now();
-#if !defined(OS_MACOSX)
-  CollectGraphicsInfo(gpu_info_);
-  if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure)
-    return false;
+  bool skipCollectGraphicsInfo = false;
+#if defined(OS_MACOSX)
+  if (gpu_info_.gpu.vendor_id == 0x10de)  // NVIDIA
+    skipCollectGraphicsInfo = true;
+#endif  // defined(OS_MACOSX)
+  if (!skipCollectGraphicsInfo) {
+    CollectGraphicsInfo(gpu_info_);
+    if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure)
+      return false;
 
-  // Recompute gpu driver bug workarounds.
-  // This is necessary on systems where vendor_id/device_id aren't available
-  // (Chrome OS, Android) or where workarounds may be dependent on GL_VENDOR
-  // and GL_RENDERER strings which are lazily computed (Linux).
-  if (!command_line.HasSwitch(switches::kDisableGpuDriverBugWorkarounds)) {
-    // TODO: this can not affect disabled extensions, since they're already
-    // initialized in the bindings. This should be moved before bindings
-    // initialization. However, populating GPUInfo fully works only on Android.
-    // Other platforms would need the bindings to query GL strings.
-    gpu::ApplyGpuDriverBugWorkarounds(
-        gpu_info_, const_cast<base::CommandLine*>(&command_line));
+    // Recompute gpu driver bug workarounds.
+    // This is necessary on systems where vendor_id/device_id aren't available
+    // (Chrome OS, Android) or where workarounds may be dependent on GL_VENDOR
+    // and GL_RENDERER strings which are lazily computed (Linux).
+    if (!command_line.HasSwitch(switches::kDisableGpuDriverBugWorkarounds)) {
+      // TODO: this can not affect disabled extensions, since they're already
+      // initialized in the bindings. This should be moved before bindings
+      // initialization. However, populating GPUInfo fully works only on
+      // Android. Other platforms would need the bindings to query GL strings.
+      gpu::ApplyGpuDriverBugWorkarounds(
+          gpu_info_, const_cast<base::CommandLine*>(&command_line));
+    }
   }
-#endif  // !defined(OS_MACOSX)
 
   gpu_feature_info_ = gpu::GetGpuFeatureInfo(gpu_info_, command_line);
 
   base::TimeDelta collect_context_time =
       base::TimeTicks::Now() - before_collect_context_graphics_info;
   UMA_HISTOGRAM_TIMES("GPU.CollectContextGraphicsInfo", collect_context_time);
 
   base::TimeDelta initialize_one_off_time =
       base::TimeTicks::Now() - before_initialize_one_off;
   UMA_HISTOGRAM_MEDIUM_TIMES("GPU.InitializeOneOffMediumTime",
@@ skipping 11 matching lines @@
 
   if (!gpu_info_.sandboxed && !attempted_startsandbox) {
     gpu_info_.sandboxed =
         sandbox_helper_->EnsureSandboxInitialized(watchdog_thread_.get());
   }
 
   return true;
 }
 
 }  // namespace gpu