BrowserGpuMemoryBufferManager::IsNativeGpuMemoryBuffersEnabled() return true if at least one native…

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 <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 84 matching lines @@
     case gfx::OZONE_NATIVE_PIXMAP:
       return GpuMemoryBufferFactoryOzoneNativePixmap::
           IsGpuMemoryBufferConfigurationSupported(format, usage);
 #endif
     default:
       NOTREACHED();
       return false;
   }
 }
 
-GpuMemoryBufferConfigurationSet GetNativeGpuMemoryBufferConfigurations() {
+GpuMemoryBufferConfigurationSet
+GetNativeGpuMemoryBufferConfigurationsForTileUpdate() {
+  // Disable native buffers when using Mesa.
+  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kUseGL) == gfx::kGLImplementationOSMesaName) {
+    return GpuMemoryBufferConfigurationSet();
+  }
+
+#if defined(OS_MACOSX)
+  bool enabled_in_command_line =
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableNativeGpuMemoryBuffers);
+#else
+  bool enabled_in_command_line =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableNativeGpuMemoryBuffers);
+#endif
+
   GpuMemoryBufferConfigurationSet configurations;
-
-  if (BrowserGpuMemoryBufferManager::IsNativeGpuMemoryBuffersEnabled()) {
+  if (enabled_in_command_line) {
     const gfx::BufferFormat kNativeFormats[] = {
         gfx::BufferFormat::R_8,       gfx::BufferFormat::RGBA_4444,
         gfx::BufferFormat::RGBA_8888, gfx::BufferFormat::BGRA_8888,
         gfx::BufferFormat::UYVY_422,  gfx::BufferFormat::YUV_420_BIPLANAR};
     const gfx::BufferUsage kNativeUsages[] = {
         gfx::BufferUsage::GPU_READ, gfx::BufferUsage::SCANOUT,
         gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,
         gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT};
     for (auto& format : kNativeFormats) {
       for (auto& usage : kNativeUsages) {
         if (IsNativeGpuMemoryBufferFactoryConfigurationSupported(format, usage))
           configurations.insert(std::make_pair(format, usage));
       }
     }
   }
 
+  return configurations;
+}
+
+GpuMemoryBufferConfigurationSet GetNativeGpuMemoryBufferConfigurations() {
+  GpuMemoryBufferConfigurationSet configurations =
+      GetNativeGpuMemoryBufferConfigurationsForTileUpdate();
+
 #if defined(USE_OZONE) || defined(OS_MACOSX)
   // Disable native buffers only when using Mesa.
   bool force_native_gpu_read_write_formats =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kUseGL) != gfx::kGLImplementationOSMesaName;
 #else
   bool force_native_gpu_read_write_formats = false;
 #endif
   if (force_native_gpu_read_write_formats) {
     const gfx::BufferFormat kGPUReadWriteFormats[] = {
@@ skipping 47 matching lines @@
       gfx::BufferFormat format,
       int client_id)
       : CreateGpuMemoryBufferRequest(size,
                                      format,
                                      gfx::BufferUsage::GPU_READ,
                                      client_id,
                                      0),
         handle(handle) {}
   ~CreateGpuMemoryBufferFromHandleRequest() {}
   gfx::GpuMemoryBufferHandle handle;
 };

[reveman, 2016/01/29 19:27:12]

This represents the value of the command line flags in combination with what's
default on the platform. I'd rather not change that.

[dshwang, 2016/01/29 19:35:26]

It's not changed.
This CL change only behavior of
BrowserGpuMemoryBufferManager::IsNativeGpuMemoryBuffersEnabled().

[reveman, 2016/01/29 19:38:11]

hm, not sure how this comment ended up here. I was trying to comment on
IsNativeGpuMemoryBuffersEnabled().
Yes, that's what my comment was supposed to be about. I don't think we should
change BrowserGpuMemoryBufferManager::IsNativeGpuMemoryBuffersEnabled().

 
 BrowserGpuMemoryBufferManager::BrowserGpuMemoryBufferManager(
     int gpu_client_id,
     uint64_t gpu_client_tracing_id)
     : native_configurations_(GetNativeGpuMemoryBufferConfigurations()),
       gpu_client_id_(gpu_client_id),
       gpu_client_tracing_id_(gpu_client_tracing_id),
       gpu_host_id_(0) {
   DCHECK(!g_gpu_memory_buffer_manager);
   g_gpu_memory_buffer_manager = this;
 }
 
 BrowserGpuMemoryBufferManager::~BrowserGpuMemoryBufferManager() {
   g_gpu_memory_buffer_manager = nullptr;
 }
 
 // static
 BrowserGpuMemoryBufferManager* BrowserGpuMemoryBufferManager::current() {
   return g_gpu_memory_buffer_manager;
 }
 
 // static
 bool BrowserGpuMemoryBufferManager::IsNativeGpuMemoryBuffersEnabled() {
-  // Disable native buffers when using Mesa.
-  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kUseGL) == gfx::kGLImplementationOSMesaName) {
-    return false;
-  }
-
-#if defined(OS_MACOSX)
-  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableNativeGpuMemoryBuffers);
-#else
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableNativeGpuMemoryBuffers);
-#endif
+  GpuMemoryBufferConfigurationSet configurations =
+      GetNativeGpuMemoryBufferConfigurationsForTileUpdate();
+  return !configurations.empty();
 }
 
 // static
 uint32_t BrowserGpuMemoryBufferManager::GetImageTextureTarget(
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
   GpuMemoryBufferConfigurationSet native_configurations =
       GetNativeGpuMemoryBufferConfigurations();
   if (native_configurations.find(std::make_pair(format, usage)) ==
       native_configurations.end()) {
@@ skipping 508 matching lines @@
     return gpu_client_tracing_id_;
   }
 
   // In normal cases, |client_id| is a child process id, so we can perform
   // the standard conversion.
   return ChildProcessHostImpl::ChildProcessUniqueIdToTracingProcessId(
       client_id);
 }
 
 }  // namespace content