Add PERSISTENT_MAP usage for GpuMemoryBuffers.

content/browser/gpu/browser_gpu_channel_host_factory.cc

 // Copyright (c) 2012 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_channel_host_factory.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/child_process_host_impl.h"
+#include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_client.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_forwarding_message_filter.h"
 #include "ipc/message_filter.h"
 
@@ skipping 218 matching lines @@
   g_enabled_gpu_memory_buffer_usages.Get().insert(usage);
 }
 
 // static
 bool BrowserGpuChannelHostFactory::IsGpuMemoryBufferFactoryUsageEnabled(
     gfx::GpuMemoryBuffer::Usage usage) {
   return g_enabled_gpu_memory_buffer_usages.Get().count(usage) != 0;
 }
 
 // static
-uint32 BrowserGpuChannelHostFactory::GetImageTextureTarget() {
-  if (!IsGpuMemoryBufferFactoryUsageEnabled(gfx::GpuMemoryBuffer::MAP))
+uint32 BrowserGpuChannelHostFactory::GetImageTextureTarget(
+    gfx::GpuMemoryBuffer::Format format,
+    gfx::GpuMemoryBuffer::Usage usage) {
+  if (!IsGpuMemoryBufferFactoryUsageEnabled(usage))
     return GL_TEXTURE_2D;
 
   std::vector<gfx::GpuMemoryBufferType> supported_types;
   GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);
   DCHECK(!supported_types.empty());
 
-  // The GPU service will always use the preferred type.
+  // The GPU service will always use the preferred type, if the |format| and
+  // |usage| allows.
   gfx::GpuMemoryBufferType type = supported_types[0];
+  // If the native buffer type does not support the |format| and |usage| then
+  // we must fallback to shared memory buffers, which do support them.

[reveman, 2015/05/20 14:26:07]

The condition for |format| and |usage| not being supported is exactly the same
as the UsageEnabled(usage) check above. If the factory is not going to be used
for this usage+format then GL_TEXTURE_2D should be returned. No need to mention
anything about a shared memory implementation here.

[danakj, 2015/05/20 17:51:14]

Done.

+  if (!IsGpuMemoryBufferConfigurationSupportedInternal(format, usage)) {
+    DCHECK(GpuMemoryBufferImplSharedMemory::IsFormatSupported(format));
+    DCHECK(GpuMemoryBufferImplSharedMemory::IsUsageSupported(usage));
+    type = gfx::SHARED_MEMORY_BUFFER;

[reveman, 2015/05/20 14:26:08]

I don't see a good reason for handling this differently than the
UsageEnabled(usage) check. Please replace this line with "return GL_TEXTURE_2D;"
and remove the DCHECKs.

[danakj, 2015/05/20 17:51:14]

Done.

+  }
 
   switch (type) {
     case gfx::SURFACE_TEXTURE_BUFFER:
     case gfx::OZONE_NATIVE_BUFFER:
       // GPU memory buffers that are shared with the GL 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;
@@ skipping 183 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   GpuProcessHost* host = GpuProcessHost::FromID(host_id);
   if (host)
     host->AddFilter(filter.get());
 }
 
 bool BrowserGpuChannelHostFactory::IsGpuMemoryBufferConfigurationSupported(
     gfx::GpuMemoryBuffer::Format format,
     gfx::GpuMemoryBuffer::Usage usage) {
+  return IsGpuMemoryBufferConfigurationSupportedInternal(format, usage);
+}
+
+// static
+bool BrowserGpuChannelHostFactory::
+    IsGpuMemoryBufferConfigurationSupportedInternal(
+        gfx::GpuMemoryBuffer::Format format,
+        gfx::GpuMemoryBuffer::Usage usage) {
   // Return early if usage is not enabled.
   if (!IsGpuMemoryBufferFactoryUsageEnabled(usage))

[reveman, 2015/05/20 14:26:07]

Please remove this check from this helper function so it's not done twice.

[danakj, 2015/05/20 17:51:14]

Done.

     return false;
 
-  // Preferred type is always used by factory.
   std::vector<gfx::GpuMemoryBufferType> supported_types;
   GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);

[reveman, 2015/05/20 14:26:07]

Please pass the type as a parameter to this helper function instead of calling
::GetSupportedTypes twice.

[danakj, 2015/05/20 17:51:14]

Done.

   DCHECK(!supported_types.empty());
   switch (supported_types[0]) {
     case gfx::SHARED_MEMORY_BUFFER:
       // Shared memory buffers must be created in-process.
       return false;
 #if defined(OS_MACOSX)
     case gfx::IO_SURFACE_BUFFER:
       return GpuMemoryBufferFactoryIOSurface::
           IsGpuMemoryBufferConfigurationSupported(format, usage);
 #endif
@@ skipping 71 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   CreateGpuMemoryBufferCallbackMap::iterator iter =
       create_gpu_memory_buffer_requests_.find(request_id);
   DCHECK(iter != create_gpu_memory_buffer_requests_.end());
   iter->second.Run(handle);
   create_gpu_memory_buffer_requests_.erase(iter);
 }
 
 }  // namespace content