Change CHROMIUM_image declarations to support multi planar input.

content/common/gpu/client/command_buffer_proxy_impl.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/common/gpu/client/command_buffer_proxy_impl.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "base/stl_util.h"
@@ skipping 329 matching lines @@
   if (last_state_.error != gpu::error::kNoError)
     return;
 
   Send(new GpuCommandBufferMsg_DestroyTransferBuffer(route_id_, id));
 }
 
 gpu::Capabilities CommandBufferProxyImpl::GetCapabilities() {
   return capabilities_;
 }
 
-int32_t CommandBufferProxyImpl::CreateImage(ClientBuffer buffer,
+int32_t CommandBufferProxyImpl::CreateImage(ClientBuffer* const buffers,
                                             size_t width,
                                             size_t height,
                                             unsigned internalformat) {
   CheckLock();
   if (last_state_.error != gpu::error::kNoError)
     return -1;
 
   int32 new_id = channel_->ReserveImageId();
 
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       channel_->gpu_memory_buffer_manager();
-  gfx::GpuMemoryBuffer* gpu_memory_buffer =
-      gpu_memory_buffer_manager->GpuMemoryBufferFromClientBuffer(buffer);
-  DCHECK(gpu_memory_buffer);
 
-  // This handle is owned by the GPU process and must be passed to it or it
-  // will leak. In otherwords, do not early out on error between here and the
-  // sending of the CreateImage IPC below.
-  bool requires_sync_point = false;
-  gfx::GpuMemoryBufferHandle handle =
-      channel_->ShareGpuMemoryBufferToGpuProcess(gpu_memory_buffer->GetHandle(),
-                                                 &requires_sync_point);
+  int num_buffers =
+      gpu::ImageFactory::GpuMemoryBufferCountForImageFormat(internalformat);
 
-  DCHECK(gpu::ImageFactory::IsImageFormatCompatibleWithGpuMemoryBufferFormat(
-      internalformat, gpu_memory_buffer->GetFormat()));
+  gfx::GpuMemoryBuffer* gpu_memory_buffers[num_buffers];
+  gfx::GpuMemoryBufferHandle* handles[num_buffers];

[reveman, 2015/03/04 05:56:00]

A pointer to a handle is different from before. I think that's wrong.

[emircan, 2015/03/04 23:31:50]

Changed it std::vector<gfx::GpuMemoryBufferHandle>

+  gfx::GpuMemoryBuffer::Format formats[num_buffers];
+  bool requires_sync_point[num_buffers];
+  for (int i = 0; i < num_buffers; ++i) {
+    gpu_memory_buffers[i] =
+        gpu_memory_buffer_manager->GpuMemoryBufferFromClientBuffer(buffers[0]);
+    DCHECK(gpu_memory_buffers[i]);
+
+    formats[i] = gpu_memory_buffers[i]->GetFormat();
+    DCHECK(gpu::ImageFactory::IsImageFormatCompatibleWithGpuMemoryBufferFormat(
+        internalformat, formats[i]));
+
+    requires_sync_point[i] = false;
+
+    // This handle is owned by the GPU process and must be passed to it or it
+    // will leak. In other words, do not early out on error between here and the
+    // sending of the CreateImage IPC below.
+    handles[i] = channel_->ShareGpuMemoryBufferToGpuProcess(
+        gpu_memory_buffers[i]->GetHandle(), &requires_sync_point[i]);
+  }
+
   if (!Send(new GpuCommandBufferMsg_CreateImage(route_id_,
                                                 new_id,
-                                                handle,
+                                                handles,

[reveman, 2015/03/04 05:56:00]

This doesn't work. You can't pass pointers over IPC. 

[emircan, 2015/03/04 23:31:50]

Changed it std::vector<gfx::GpuMemoryBufferHandle>

                                                 gfx::Size(width, height),
-                                                gpu_memory_buffer->GetFormat(),
+                                                formats,

[reveman, 2015/03/04 05:56:00]

ditto

[emircan, 2015/03/04 23:31:50]

Changed it std::vector<gfx::GpuMemoryBuffer::Format>

                                                 internalformat))) {
     return -1;
   }
 
-  if (requires_sync_point) {
-    gpu_memory_buffer_manager->SetDestructionSyncPoint(gpu_memory_buffer,
-                                                       InsertSyncPoint());
+  for (size_t i = 0; i < num_buffers; ++i) {
+    if (requires_sync_point[i]) {
+      gpu_memory_buffer_manager->SetDestructionSyncPoint(gpu_memory_buffers[i],
+                                                         InsertSyncPoint());
+    }
   }
 
   return new_id;
 }
 
 void CommandBufferProxyImpl::DestroyImage(int32 id) {
   CheckLock();
   if (last_state_.error != gpu::error::kNoError)
     return;
 
   Send(new GpuCommandBufferMsg_DestroyImage(route_id_, id));
 }
 
 int32_t CommandBufferProxyImpl::CreateGpuMemoryBufferImage(
     size_t width,
     size_t height,
     unsigned internalformat,
     unsigned usage) {
   CheckLock();
-  scoped_ptr<gfx::GpuMemoryBuffer> buffer(
-      channel_->gpu_memory_buffer_manager()->AllocateGpuMemoryBuffer(
-          gfx::Size(width, height),
-          gpu::ImageFactory::ImageFormatToGpuMemoryBufferFormat(internalformat),
-          gpu::ImageFactory::ImageUsageToGpuMemoryBufferUsage(usage)));
-  if (!buffer)
-    return -1;
 
-  return CreateImage(buffer->AsClientBuffer(), width, height, internalformat);
+  std::vector<gfx::GpuMemoryBuffer::Format> gpu_memory_buffer_formats;
+  gpu::ImageFactory::ImageFormatToGpuMemoryBufferFormats(
+      internalformat, &gpu_memory_buffer_formats);
+  int num_buffers = gpu_memory_buffer_formats.size();
+
+  DCHECK_GE(num_buffers, 1);

[reveman, 2015/03/04 05:56:00]

if we're going to assume one buffer here, why deal with all this vector code?

[emircan, 2015/03/04 23:31:50]

We assume >=1 buffer.

I tried to account for the case when CreateGpuMemoryBufferImage is called with a
multi-buffer format such as GL_RGB_YUV420, where things need to be backed with
multiple buffers. 

[reveman, 2015/03/05 19:35:31]

Sorry, misread that DCHECK.

+  DCHECK(channel_->gpu_memory_buffer_manager());

[reveman, 2015/03/04 05:56:00]

any reason for adding this DCHECK? doesn't look like we had it before..

[emircan, 2015/03/04 23:31:50]

Removed.

+
+  ScopedVector<gfx::GpuMemoryBuffer> buffers;
+  ClientBuffer client_buffers[num_buffers];
+  for (int i = 0; i < num_buffers; ++i) {
+    buffers.push_back(
+        channel_->gpu_memory_buffer_manager()->AllocateGpuMemoryBuffer(
+            gfx::Size(width, height), gpu_memory_buffer_formats[i],
+            gpu::ImageFactory::ImageUsageToGpuMemoryBufferUsage(usage)));
+
+    if (!buffers[i])
+      return -1;
+
+    client_buffers[i] = buffers[i]->AsClientBuffer();
+  }
+  return CreateImage(client_buffers, width, height, internalformat);
 }
 
 int CommandBufferProxyImpl::GetRouteID() const {
   return route_id_;
 }
 
 uint32 CommandBufferProxyImpl::CreateStreamTexture(uint32 texture_id) {
   CheckLock();
   if (last_state_.error != gpu::error::kNoError)
     return 0;
@@ skipping 176 matching lines @@
   }
 }
 
 void CommandBufferProxyImpl::OnUpdateVSyncParameters(base::TimeTicks timebase,
                                                      base::TimeDelta interval) {
   if (!update_vsync_parameters_completion_callback_.is_null())
     update_vsync_parameters_completion_callback_.Run(timebase, interval);
 }
 
 }  // namespace content