Mac h264: Add GLImage copy support for non-rectangle targets

ui/gl/gl_image_io_surface.mm

 // Copyright 2013 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 "ui/gl/gl_image_io_surface.h"
 
 #include <map>
 
 #include "base/callback_helpers.h"
 #include "base/mac/bind_objc_block.h"
@@ skipping 256 matching lines @@
                       base::TimeTicks::Now() - start_time);
   return true;
 }
 
 bool GLImageIOSurface::CopyTexImage(unsigned target) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (format_ != gfx::BufferFormat::YUV_420_BIPLANAR)
     return false;
 
-  if (target != GL_TEXTURE_RECTANGLE_ARB) {
-    LOG(ERROR) << "YUV_420_BIPLANAR requires GL_TEXTURE_RECTANGLE_ARB target";
-    return false;
-  }
-
   GLContext* gl_context = GLContext::GetCurrent();
   DCHECK(gl_context);
 
   YUVToRGBConverter* yuv_to_rgb_converter = gl_context->GetYUVToRGBConverter();
   DCHECK(yuv_to_rgb_converter);
 
   ScopedSetGLToRealGLApi scoped_set_gl_api;
 
   // Note that state restoration is done explicitly instead of scoped binders to
   // avoid https://crbug.com/601729.
   GLint rgb_texture = 0;
-  glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &rgb_texture);
+  GLenum target_getter = 0;
+  switch (target) {
+    case GL_TEXTURE_2D:
+      target_getter = GL_TEXTURE_BINDING_2D;
+      break;
+    case GL_TEXTURE_CUBE_MAP:
+      target_getter = GL_TEXTURE_BINDING_CUBE_MAP;
+      break;
+    case GL_TEXTURE_EXTERNAL_OES:
+      target_getter = GL_TEXTURE_BINDING_EXTERNAL_OES;
+      break;
+    case GL_TEXTURE_RECTANGLE_ARB:
+      target_getter = GL_TEXTURE_BINDING_RECTANGLE_ARB;
+      break;
+    default:
+      NOTIMPLEMENTED() << " Target not supported.";
+      return false;
+  }
+  glGetIntegerv(target_getter, &rgb_texture);
   base::ScopedClosureRunner destroy_resources_runner(base::BindBlock(^{
-    glBindTexture(GL_TEXTURE_RECTANGLE_ARB, rgb_texture);
+    glBindTexture(target, rgb_texture);
   }));
 
   CGLContextObj cgl_context = CGLGetCurrentContext();
   {
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, yuv_to_rgb_converter->y_texture());
     CGLError cgl_error = CGLTexImageIOSurface2D(
         cgl_context, GL_TEXTURE_RECTANGLE_ARB, GL_RED, size_.width(),
         size_.height(), GL_RED, GL_UNSIGNED_BYTE, io_surface_, 0);
     if (cgl_error != kCGLNoError) {
       LOG(ERROR) << "Error in CGLTexImageIOSurface2D for the Y plane. "
                  << cgl_error;
       return false;
     }
   }
   {
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, yuv_to_rgb_converter->uv_texture());
     CGLError cgl_error = CGLTexImageIOSurface2D(
         cgl_context, GL_TEXTURE_RECTANGLE_ARB, GL_RG, size_.width() / 2,
         size_.height() / 2, GL_RG, GL_UNSIGNED_BYTE, io_surface_, 1);
     if (cgl_error != kCGLNoError) {
       LOG(ERROR) << "Error in CGLTexImageIOSurface2D for the UV plane. "
                  << cgl_error;
       return false;
     }
   }
 
-  yuv_to_rgb_converter->CopyYUV420ToRGB(
-      GL_TEXTURE_RECTANGLE_ARB,
-      size_,
-      rgb_texture);
+  yuv_to_rgb_converter->CopyYUV420ToRGB(target, size_, rgb_texture);
   return true;
 }
 
 bool GLImageIOSurface::CopyTexSubImage(unsigned target,
                                        const gfx::Point& offset,
                                        const gfx::Rect& rect) {
   return false;
 }
 
 bool GLImageIOSurface::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
@@ skipping 52 matching lines @@
 }
 
 // static
 GLImageIOSurface* GLImageIOSurface::FromGLImage(GLImage* image) {
   if (!image || image->GetType() != Type::IOSURFACE)
     return nullptr;
   return static_cast<GLImageIOSurface*>(image);
 }
 
 }  // namespace gl