ui: Use single buffer SurfaceTexture mode for native GpuMemoryBuffers on Android.

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/bind.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 11 matching lines @@
 #include "gpu/GLES2/gl2extchromium.h"
 #include "ui/gfx/buffer_format_util.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"
+#include "ui/gl/android/surface_texture.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"
 #endif
 
 namespace content {
 namespace {
 
 void HostCreateGpuMemoryBuffer(
@@ skipping 167 matching lines @@
 }
 
 // static
 bool BrowserGpuMemoryBufferManager::IsNativeGpuMemoryBuffersEnabled() {
   // Disable native buffers when using Mesa.
   if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kUseGL) == gfx::kGLImplementationOSMesaName) {
     return false;
   }
 
+#if defined(OS_ANDROID)
+  // Single buffer SurfaceTexture mode is required for native buffers on
+  // Android.
+  if (!gfx::SurfaceTexture::IsSingleBufferModeSupported())
+    return false;
+#endif
+
 #if defined(OS_MACOSX)
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableNativeGpuMemoryBuffers);
 #else
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableNativeGpuMemoryBuffers);
 #endif
 }
 
 // static
 uint32 BrowserGpuMemoryBufferManager::GetImageTextureTarget(
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
   GpuMemoryBufferConfigurationSet native_configurations =
       GetNativeGpuMemoryBufferConfigurations();
   if (native_configurations.find(std::make_pair(format, usage)) ==
       native_configurations.end()) {
     return GL_TEXTURE_2D;
   }
 
   switch (GpuMemoryBufferFactory::GetNativeType()) {
-    case gfx::SURFACE_TEXTURE_BUFFER:
     case gfx::OZONE_NATIVE_PIXMAP:
-      // GPU memory buffers that are shared with the GL using EGLImages
+      // GPU memory buffers that are bound to GL textures using EGLImages
       // require TEXTURE_EXTERNAL_OES.
       return GL_TEXTURE_EXTERNAL_OES;
     case gfx::IO_SURFACE_BUFFER:
       // IOSurface backed images require GL_TEXTURE_RECTANGLE_ARB.
       return GL_TEXTURE_RECTANGLE_ARB;
+    case gfx::SURFACE_TEXTURE_BUFFER:
+      // GPU memory buffers that require a copy expects GL_TEXTURE_2D as target.
+      return GL_TEXTURE_2D;
     case gfx::SHARED_MEMORY_BUFFER:
-      return GL_TEXTURE_2D;
     case gfx::EMPTY_BUFFER:
       NOTREACHED();
       return GL_TEXTURE_2D;
   }
 
   NOTREACHED();
   return GL_TEXTURE_2D;
 }
 
 scoped_ptr<gfx::GpuMemoryBuffer>
@@ skipping 483 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