Re-land: content: Enable native GpuMemoryBuffers by default on MacOSX.

content/browser/gpu/browser_gpu_memory_buffer_manager.cc

 // Copyright 2014 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 "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
 #include "content/common/gpu/gpu_memory_buffer_factory_shared_memory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/GLES2/gl2extchromium.h"
+#include "ui/gl/gl_switches.h"
 
 #if defined(OS_MACOSX)
 #include "content/common/gpu/gpu_memory_buffer_factory_io_surface.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "content/common/gpu/gpu_memory_buffer_factory_surface_texture.h"
 #endif
 
 #if defined(USE_OZONE)
@@ skipping 48 matching lines @@
   GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);
   DCHECK(!supported_types.empty());
 
   // The GPU service will always use the preferred type.
   return supported_types[0];
 }
 
 std::vector<GpuMemoryBufferFactory::Configuration>
 GetSupportedGpuMemoryBufferConfigurations(gfx::GpuMemoryBufferType type) {
   std::vector<GpuMemoryBufferFactory::Configuration> configurations;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableNativeGpuMemoryBuffers)) {
+#if defined(OS_MACOSX)
+  bool enable_native_gpu_memory_buffers =
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableNativeGpuMemoryBuffers);
+#else
+  bool enable_native_gpu_memory_buffers =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableNativeGpuMemoryBuffers);
+#endif
+
+  // Disable native buffers when using Mesa.
+  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kUseGL) == gfx::kGLImplementationOSMesaName) {
+    enable_native_gpu_memory_buffers = false;
+  }
+
+  if (enable_native_gpu_memory_buffers) {
     const GpuMemoryBufferFactory::Configuration kNativeConfigurations[] = {
         {gfx::GpuMemoryBuffer::R_8, gfx::GpuMemoryBuffer::MAP},
         {gfx::GpuMemoryBuffer::R_8, gfx::GpuMemoryBuffer::PERSISTENT_MAP},
         {gfx::GpuMemoryBuffer::RGBA_4444, gfx::GpuMemoryBuffer::MAP},
         {gfx::GpuMemoryBuffer::RGBA_4444, gfx::GpuMemoryBuffer::PERSISTENT_MAP},
         {gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::MAP},
         {gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::PERSISTENT_MAP},
         {gfx::GpuMemoryBuffer::BGRA_8888, gfx::GpuMemoryBuffer::MAP},
         {gfx::GpuMemoryBuffer::BGRA_8888,
          gfx::GpuMemoryBuffer::PERSISTENT_MAP}};
@@ skipping 458 matching lines @@
   }
 
   GpuProcessHost* host = GpuProcessHost::FromID(buffer_it->second.gpu_host_id);
   if (host)
     host->DestroyGpuMemoryBuffer(id, client_id, sync_point);
 
   buffers.erase(buffer_it);
 }
 
 }  // namespace content