gl, ozone: enable GLImageBindTest unittests

ui/gl/gl_image_memory.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 "ui/gl/gl_image_memory.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gfx/buffer_format_util.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
+#include "ui/gl/gl_utils.h"
 #include "ui/gl/gl_version_info.h"
 
 using gfx::BufferFormat;
 
 namespace gl {
 namespace {
 
 bool ValidInternalFormat(unsigned internalformat) {
   switch (internalformat) {
     case GL_ATC_RGB_AMD:
@@ skipping 54 matching lines @@
     case BufferFormat::YUV_420_BIPLANAR:
     case BufferFormat::UYVY_422:
       NOTREACHED();
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
-GLenum TextureFormat(BufferFormat format) {
-  switch (format) {
-    case BufferFormat::ATC:
-      return GL_ATC_RGB_AMD;
-    case BufferFormat::ATCIA:
-      return GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD;
-    case BufferFormat::DXT1:
-      return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-    case BufferFormat::DXT5:
-      return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-    case BufferFormat::ETC1:
-      return GL_ETC1_RGB8_OES;
-    case BufferFormat::R_8:
-      return GL_RED;
-    case BufferFormat::RGBA_4444:
-    case BufferFormat::RGBA_8888:
-      return GL_RGBA;
-    case BufferFormat::BGRA_8888:
-      return GL_BGRA_EXT;
-    case BufferFormat::RGBX_8888:
-    case BufferFormat::BGRX_8888:
-      return GL_RGB;
-    case BufferFormat::YUV_420:
-    case BufferFormat::YUV_420_BIPLANAR:
-    case BufferFormat::UYVY_422:
-      NOTREACHED();
-      return 0;
-  }
-
-  NOTREACHED();
-  return 0;
-}
-
 GLenum DataFormat(BufferFormat format) {
   switch (format) {
     case BufferFormat::RGBX_8888:
       return GL_RGBA;
     case BufferFormat::BGRX_8888:
       return GL_BGRA_EXT;
     case BufferFormat::RGBA_4444:
     case BufferFormat::RGBA_8888:
     case BufferFormat::BGRA_8888:
     case BufferFormat::R_8:
     case BufferFormat::ATC:
     case BufferFormat::ATCIA:
     case BufferFormat::DXT1:
     case BufferFormat::DXT5:
     case BufferFormat::ETC1:
-      return TextureFormat(format);
+      return GetTextureFormatFrom(format);
     case BufferFormat::YUV_420:
     case BufferFormat::YUV_420_BIPLANAR:
     case BufferFormat::UYVY_422:
       NOTREACHED();
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
@@ skipping 202 matching lines @@
 bool GLImageMemory::CopyTexImage(unsigned target) {
   TRACE_EVENT2("gpu", "GLImageMemory::CopyTexImage", "width", size_.width(),
                "height", size_.height());
 
   // GL_TEXTURE_EXTERNAL_OES is not a supported target.
   if (target == GL_TEXTURE_EXTERNAL_OES)
     return false;
 
   if (IsCompressedFormat(format_)) {
     glCompressedTexImage2D(
-        target, 0, TextureFormat(format_), size_.width(), size_.height(), 0,
-        static_cast<GLsizei>(BufferSizeForBufferFormat(size_, format_)),
+        target, 0, GetTextureFormatFrom(format_), size_.width(), size_.height(),
+        0, static_cast<GLsizei>(BufferSizeForBufferFormat(size_, format_)),
         memory_);
   } else {
     GLenum data_format = DataFormat(format_);
     GLenum data_type = DataType(format_);
     GLint data_row_length = DataRowLength(stride_, format_);
     scoped_ptr<uint8_t[]> gles2_data;
 
     if (gfx::GLContext::GetCurrent()->GetVersionInfo()->is_es) {
       gles2_data = GLES2Data(size_, format_, stride_, memory_, &data_format,
                              &data_type, &data_row_length);
     }
 
     if (data_row_length != size_.width())
       glPixelStorei(GL_UNPACK_ROW_LENGTH, data_row_length);
 
-    glTexImage2D(target, 0, TextureFormat(format_), size_.width(),
+    glTexImage2D(target, 0, GetTextureFormatFrom(format_), size_.width(),
                  size_.height(), 0, data_format, data_type,
                  gles2_data ? gles2_data.get() : memory_);
 
     if (data_row_length != size_.width())
       glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
   }
 
   return true;
 }
 
@@ skipping 48 matching lines @@
 }
 
 bool GLImageMemory::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                                          int z_order,
                                          gfx::OverlayTransform transform,
                                          const gfx::Rect& bounds_rect,
                                          const gfx::RectF& crop_rect) {
   return false;
 }
 
-// static
-unsigned GLImageMemory::GetInternalFormatForTesting(BufferFormat format) {
-  DCHECK(ValidFormat(format));
-  return TextureFormat(format);
-}
-
 }  // namespace gl