Change CHROMIUM_image declarations to support multi planar input.

gpu/command_buffer/service/image_factory.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 "gpu/command_buffer/service/image_factory.h"
 
 #include "ui/gl/gl_bindings.h"
 
 namespace gpu {
 
 ImageFactory::ImageFactory() {
 }
 
 ImageFactory::~ImageFactory() {
 }
 
 // static
-gfx::GpuMemoryBuffer::Format ImageFactory::ImageFormatToGpuMemoryBufferFormat(
-    unsigned internalformat) {
+int ImageFactory::GpuMemoryBufferCountForImageFormat(unsigned internalformat) {
   switch (internalformat) {
     case GL_RGB:
-      return gfx::GpuMemoryBuffer::RGBX_8888;
     case GL_RGBA:
-      return gfx::GpuMemoryBuffer::RGBA_8888;
     case GL_ATC_RGB_AMD:
-      return gfx::GpuMemoryBuffer::ATC;
     case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
-      return gfx::GpuMemoryBuffer::ATCIA;
     case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-      return gfx::GpuMemoryBuffer::DXT1;
     case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-      return gfx::GpuMemoryBuffer::DXT5;
     case GL_ETC1_RGB8_OES:
-      return gfx::GpuMemoryBuffer::ETC1;
+      return 1;
     default:
       NOTREACHED();
-      return gfx::GpuMemoryBuffer::RGBA_8888;
+      return 1;

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

return 0 in this case?

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

Done.

   }
 }
 
+// static
+void ImageFactory::ImageFormatToGpuMemoryBufferFormats(
+    unsigned internalformat,
+    std::vector<gfx::GpuMemoryBuffer::Format>* formats) {
+  switch (internalformat) {
+    case GL_RGB:
+    case GL_RGBA:
+      formats->push_back(gfx::GpuMemoryBuffer::RGBA_8888);
+      return;
+    case GL_ATC_RGB_AMD:
+      formats->push_back(gfx::GpuMemoryBuffer::ATC);
+      return;
+    case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
+      formats->push_back(gfx::GpuMemoryBuffer::ATCIA);
+      return;
+    case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+      formats->push_back(gfx::GpuMemoryBuffer::DXT1);
+      return;
+    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      formats->push_back(gfx::GpuMemoryBuffer::DXT5);
+      return;
+    case GL_ETC1_RGB8_OES:
+      formats->push_back(gfx::GpuMemoryBuffer::ETC1);
+      return;
+    default:
+      NOTREACHED();
+      formats->push_back(gfx::GpuMemoryBuffer::RGBA_8888);
+      return;
+  }
+}
+
 // static
 gfx::GpuMemoryBuffer::Usage ImageFactory::ImageUsageToGpuMemoryBufferUsage(
     unsigned usage) {
   switch (usage) {
     case GL_MAP_CHROMIUM:
       return gfx::GpuMemoryBuffer::MAP;
     case GL_SCANOUT_CHROMIUM:
       return gfx::GpuMemoryBuffer::SCANOUT;
     default:
       NOTREACHED();
@@ skipping 36 matching lines @@
       }
       NOTREACHED();
       return false;
     default:
       NOTREACHED();
       return false;
   }
 }
 
 }  // namespace gpu