Change CHROMIUM_image declarations to support multi planar input.

gpu/command_buffer/client/gles2_implementation.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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
@@ skipping 4695 matching lines @@
     case GL_MAP_CHROMIUM:
     case GL_SCANOUT_CHROMIUM:
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace
 
-GLuint GLES2Implementation::CreateImageCHROMIUMHelper(ClientBuffer buffer,
+GLuint GLES2Implementation::CreateImageCHROMIUMHelper(ClientBuffer* buffers,
                                                       GLsizei width,
                                                       GLsizei height,
                                                       GLenum internalformat) {
+  if (buffers == nullptr) {
+    SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "invalid buffers");

[mcasas, 2015/02/28 01:14:26]

nit: s/buffers/|buffers|/, although I don't see this being respected below.

[emircan, 2015/02/28 02:33:36]

Changed this and the ones below.

+    return 0;
+  }
+
   if (width <= 0) {
     SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "width <= 0");
     return 0;
   }
 
   if (height <= 0) {
     SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "height <= 0");
     return 0;
   }
 
   if (!ValidImageFormat(internalformat)) {
-    SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "invalid format");
+    SetGLError(GL_INVALID_ENUM, "glCreateImageCHROMIUM", "invalid format");
     return 0;
   }
 
   int32_t image_id =
-      gpu_control_->CreateImage(buffer, width, height, internalformat);
+      gpu_control_->CreateImage(buffers[0], width, height, internalformat);

[mcasas, 2015/02/28 01:14:26]

Add a TODO() while you prepare and land the other, subsequent, CLs.

[emircan, 2015/02/28 02:33:36]

Added referencing the original bug reported.

   if (image_id < 0) {
     SetGLError(GL_OUT_OF_MEMORY, "glCreateImageCHROMIUM", "image_id < 0");
     return 0;
   }
   return image_id;
 }
 
-GLuint GLES2Implementation::CreateImageCHROMIUM(ClientBuffer buffer,
+GLuint GLES2Implementation::CreateImageCHROMIUM(ClientBuffer* buffers,
                                                 GLsizei width,
                                                 GLsizei height,
                                                 GLenum internalformat) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateImageCHROMIUM(" << width
                      << ", " << height << ", "
                      << GLES2Util::GetStringImageInternalFormat(internalformat)
                      << ")");
   GLuint image_id =
-      CreateImageCHROMIUMHelper(buffer, width, height, internalformat);
+      CreateImageCHROMIUMHelper(buffers, width, height, internalformat);
   CheckGLError();
   return image_id;
 }
 
 void GLES2Implementation::DestroyImageCHROMIUMHelper(GLuint image_id) {
   // Flush the command stream to make sure all pending commands
   // that may refer to the image_id are executed on the service side.
   helper_->CommandBufferHelper::Flush();
   gpu_control_->DestroyImage(image_id);
 }
@@ skipping 226 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu