Upstream: GL implementation on Android

ui/gfx/gl/gl_surface_egl.cc

 // Copyright (c) 2011 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/gfx/gl/gl_surface_egl.h"
 
 #include "build/build_config.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#if !defined(OS_ANDROID)
 #include "third_party/angle/include/EGL/egl.h"
 #include "third_party/angle/include/EGL/eglext.h"
+#endif
 #include "ui/gfx/gl/egl_util.h"
 
+#if defined(OS_ANDROID)
+#include <EGL/egl.h>
+#endif
+
 // This header must come after the above third-party include, as
 // it brings in #defines that cause conflicts.
 #include "ui/gfx/gl/gl_bindings.h"
 
 #if defined(USE_X11) && !defined(USE_WAYLAND)
 extern "C" {
 #include <X11/Xlib.h>
 }
 #endif
 
@@ skipping 79 matching lines @@
                        &g_config,
                        1,
                        &num_configs)) {
     LOG(ERROR) << "eglChooseConfig failed with error "
                << GetLastEGLErrorString();
     return false;
   }
 
   initialized = true;
 
-#if defined(USE_X11)
+#if defined(USE_X11) || defined(OS_ANDROID)
   return true;
 #else
   g_software_native_display = EGL_SOFTWARE_DISPLAY_ANGLE;
 #endif
   g_software_display = eglGetDisplay(g_software_native_display);
   if (!g_software_display) {
     return true;
   }
 
   if (!eglInitialize(g_software_display, NULL, NULL)) {
@@ skipping 53 matching lines @@
       supports_post_sub_buffer_(false)
 {
   software_ = software;
 }
 
 NativeViewGLSurfaceEGL::~NativeViewGLSurfaceEGL() {
   Destroy();
 }
 
 bool NativeViewGLSurfaceEGL::Initialize() {
+#if defined(OS_ANDROID)

[jonathan.backer, 2011/11/18 19:33:32]

NOTREACHED()?

[michaelbai, 2011/11/21 18:28:58]

Done.

+  return false;
+#else
   DCHECK(!surface_);
 
   if (!GetDisplay()) {
     LOG(ERROR) << "Trying to create surface with invalid display.";
     return false;
   }
 
   static const EGLint egl_window_attributes_sub_buffer[] = {
     EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_TRUE,
     EGL_NONE
@@ skipping 15 matching lines @@
   }
 
   EGLint surfaceVal;
   EGLBoolean retVal = eglQuerySurface(GetDisplay(),
                                       surface_,
                                       EGL_POST_SUB_BUFFER_SUPPORTED_NV,
                                       &surfaceVal);
   supports_post_sub_buffer_ = (surfaceVal && retVal) == EGL_TRUE;
 
   return true;
+#endif
 }
 
 void NativeViewGLSurfaceEGL::Destroy() {
   if (surface_) {
     if (!eglDestroySurface(GetDisplay(), surface_)) {
       LOG(ERROR) << "eglDestroySurface failed with error "
                  << GetLastEGLErrorString();
     }
     surface_ = NULL;
   }
@@ skipping 112 matching lines @@
   Destroy();
   size_ = size;
   return Initialize();
 }
 
 EGLSurface PbufferGLSurfaceEGL::GetHandle() {
   return surface_;
 }
 
 void* PbufferGLSurfaceEGL::GetShareHandle() {
+#if defined(OS_ANDROID)

[jonathan.backer, 2011/11/18 19:33:32]

NOTREACHED()?

[michaelbai, 2011/11/21 18:28:58]

Done.

+  return NULL;
+#else
   const char* extensions = eglQueryString(g_display, EGL_EXTENSIONS);
   if (!strstr(extensions, "EGL_ANGLE_query_surface_pointer"))
     return NULL;
 
   void* handle;
   if (!eglQuerySurfacePointerANGLE(g_display,
                                    GetHandle(),
                                    EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
                                    &handle)) {
     return NULL;
   }
 
   return handle;
+#endif
 }
 
 }  // namespace gfx