Change CHROMIUM_image declarations to support multi planar input.

cc/resources/resource_provider.cc

 // Copyright 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 "cc/resources/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 1068 matching lines @@
     GLES2Interface* gl = resource_provider_->ContextGL();
     DCHECK(gl);
 
 #if defined(OS_CHROMEOS)
     // TODO(reveman): GL_COMMANDS_ISSUED_CHROMIUM is used for synchronization
     // on ChromeOS to avoid some performance issues. This only works with
     // shared memory backed buffers. crbug.com/436314
     DCHECK_EQ(gpu_memory_buffer_->GetHandle().type, gfx::SHARED_MEMORY_BUFFER);
 #endif
 
-    resource_->image_id =
-        gl->CreateImageCHROMIUM(gpu_memory_buffer_->AsClientBuffer(),
-                                size_.width(),
-                                size_.height(),
-                                GL_RGBA);
+    const ClientBuffer& client_buffer = gpu_memory_buffer_->AsClientBuffer();

[reveman, 2015/03/02 20:09:55]

why a const ref? is this temporary variable needed at all? can we just do
"&gpu_memory_buffer_->AsClientBuffer()" below instead?

[emircan, 2015/03/03 02:02:18]

The temporaray is an rvalue and throws the error below. This is to turn it into
an lvalue.

http://thbecker.net/articles/rvalue_references/section_01.html

../../cc/resources/resource_provider.cc:1090:51: error: cannot take the address
of an rvalue of type 'ClientBuffer' (aka '_ClientBuffer *')
    resource_->image_id =
gl->CreateImageCHROMIUM(&(gpu_memory_buffer_->AsClientBuffer()), size_.width(),

[reveman, 2015/03/03 05:30:13]

Ok, how about this:

ClientBuffer buffers[] = {
  gpu_memory_buffer_->AsClientBuffer()
};
CreateImageCHROMIUM(buffers, ...);

makes it more clear that we're passing an array with one buffer to CreateImage.

[emircan, 2015/03/04 03:03:15]

Done.

+    resource_->image_id = gl->CreateImageCHROMIUM(&client_buffer, size_.width(),
+                                                  size_.height(), GL_RGBA);
   }
 
   std::swap(resource_->gpu_memory_buffer, gpu_memory_buffer_);
   resource_->allocated = true;
   resource_->dirty_image = true;
 
   // GpuMemoryBuffer provides direct access to the memory used by the GPU.
   // Read lock fences are required to ensure that we're not trying to map a
   // buffer that is currently in-use by the GPU.
   resource_->read_lock_fences_enabled = true;
@@ skipping 1067 matching lines @@
 }
 
 class GrContext* ResourceProvider::GrContext(bool worker_context) const {
   ContextProvider* context_provider =
       worker_context ? output_surface_->worker_context_provider()
                      : output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
 }  // namespace cc