gl: Move platform-specific EGL code into separate files

gl: Move platform-specific EGL code into separate files

This splits ozone & android GLSurface creation into their own files,
matching all of the other platforms.

Also, all platforms that support EGL now implement
GetPlatformDefaultEGLNativeDisplay() to determine the EGL display to
use, eliminating an ifdef.

This is cleaning things up in preparation for introducing a new
ozone-specific GLSurfaceEGL subclass without adding more ifdefs.

TEST=ui_unittests, content_shell --ozone-platform={file,dri}
BUG=353788
R=piman@chromium.org, rjkroege@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259923

[spang, 2014-03-20 17:23:02]

This depends on https://codereview.chromium.org/202683003/

[rjkroege, 2014-03-24 15:27:25]

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_android.cc
File ui/gl/gl_surface_android.cc (right):

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_android.cc#...
ui/gl/gl_surface_android.cc:71: } else
can you put the { in please.

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_egl.cc
File ui/gl/gl_surface_egl.cc (right):

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_egl.cc#newc...
ui/gl/gl_surface_egl.cc:120: bool
GLSurfaceEGL::InitializeOneOff(EGLNativeDisplayType native_display) {
I like this transformation of pulling the platform-specific stuff out but rather
than change the InitializeOneOff entry point, I think it would be better to call
a private platform specific function from inside of here to determine the
g_native_display and preserve the InitializeOneOff call across all GL
implementations.

In particular: gpu_main calls InitializeOneOff and you've not changed it.
(https://code.google.com/p/chromium/codesearch#chromium/src/content/gpu/gpu_ma...)

Maybe I'm missing something.

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_ozone.cc
File ui/gl/gl_surface_ozone.cc (right):

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_ozone.cc#ne...
ui/gl/gl_surface_ozone.cc:20: EGLNativeDisplayType GetEGLDisplay() {
per other comment: you've already done what I suggested here... I think you'd
get to delete code.

[spang, 2014-03-24 18:17:08]

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_android.cc
File ui/gl/gl_surface_android.cc (right):

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_android.cc#...
ui/gl/gl_surface_android.cc:71: } else
On 2014/03/24 15:27:25, rjkroege wrote:
> can you put the { in please.

Haha. Oops.

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_egl.cc
File ui/gl/gl_surface_egl.cc (right):

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_egl.cc#newc...
ui/gl/gl_surface_egl.cc:120: bool
GLSurfaceEGL::InitializeOneOff(EGLNativeDisplayType native_display) {
On 2014/03/24 15:27:25, rjkroege wrote:
> I like this transformation of pulling the platform-specific stuff out but
rather
> than change the InitializeOneOff entry point, I think it would be better to
call
> a private platform specific function from inside of here to determine the
> g_native_display and preserve the InitializeOneOff call across all GL
> implementations.
> 
> In particular: gpu_main calls InitializeOneOff and you've not changed it.
>
(https://code.google.com/p/chromium/codesearch#chromium/src/content/gpu/gpu_ma...)
> 
> Maybe I'm missing something.

Per our discussion, I added GetPlatformDefaultEGLDisplay(). That does seem
better.

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_ozone.cc
File ui/gl/gl_surface_ozone.cc (right):

https://codereview.chromium.org/196403008/diff/1/ui/gl/gl_surface_ozone.cc#ne...
ui/gl/gl_surface_ozone.cc:20: EGLNativeDisplayType GetEGLDisplay() {
On 2014/03/24 15:27:25, rjkroege wrote:
> per other comment: you've already done what I suggested here... I think you'd
> get to delete code.

Move to GetPlatformDefaultEGLNativeDisplay().

[rjkroege, 2014-03-24 20:06:23]

lgtm with nits: I think that you need to update the CL description appropriately
for having not changed the InitializeOneOff API

[spang, 2014-03-26 16:45:43]

+piman

[piman, 2014-03-26 18:09:11]

lgtm

[spang, 2014-03-26 18:41:09]

The CQ bit was checked by spang@chromium.org

[commit-bot: I haz the power, 2014-03-26 18:42:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/spang@chromium.org/196403008/170001

[commit-bot: I haz the power, 2014-03-26 23:55:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-26 23:55:31]

Retried try job too often on win_rel for step(s) media_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[spang, 2014-03-27 15:29:29]

The CQ bit was checked by spang@chromium.org

[commit-bot: I haz the power, 2014-03-27 15:30:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/spang@chromium.org/196403008/170001

[commit-bot: I haz the power, 2014-03-27 15:31:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-27 15:31:26]

Failed to apply patch for ui/gl/gl_surface_egl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/gl/gl_surface_egl.cc
  Hunk #3 FAILED at 121.
  Hunk #4 succeeded at 185 (offset -1 lines).
  Hunk #5 succeeded at 322 (offset -1 lines).
  Hunk #6 succeeded at 754 (offset -1 lines).
  1 out of 6 hunks FAILED -- saving rejects to file ui/gl/gl_surface_egl.cc.rej

Patch:       ui/gl/gl_surface_egl.cc
Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index
227fb0597d2b5a898721d7f3e16953aff1d61ffa..e8e301a957f6dd096a222b27a21f651b594d2612
100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -13,7 +13,6 @@
 #include "base/android/sys_utils.h"
 #endif
 
-#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -38,11 +37,6 @@ extern "C" {
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 #endif
 
-// From ANGLE's egl/eglext.h.
-#if !defined(EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE)
-#define EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE \
-    reinterpret_cast<EGLNativeDisplayType>(-2)
-#endif
 #if !defined(EGL_FIXED_SIZE_ANGLE)
 #define EGL_FIXED_SIZE_ANGLE 0x3201
 #endif
@@ -127,26 +121,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
   if (initialized)
     return true;
 
-#if defined(USE_X11)
-  g_native_display = base::MessagePumpForUI::GetDefaultXDisplay();
-#elif defined(OS_WIN)
-  g_native_display = EGL_DEFAULT_DISPLAY;
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableD3D11) &&
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableD3D11)) {
-    g_native_display = EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE;
-  }
-#elif defined(USE_OZONE)
-  gfx::SurfaceFactoryOzone* surface_factory =
-      gfx::SurfaceFactoryOzone::GetInstance();
-  if (surface_factory->InitializeHardware() !=
-      gfx::SurfaceFactoryOzone::INITIALIZED) {
-    LOG(ERROR) << "OZONE failed to initialize hardware";
-    return false;
-  }
-  g_native_display = surface_factory->GetNativeDisplay();
-#else
-  g_native_display = EGL_DEFAULT_DISPLAY;
-#endif
+  g_native_display = GetPlatformDefaultEGLNativeDisplay();
   g_display = eglGetDisplay(g_native_display);
   if (!g_display) {
     LOG(ERROR) << "eglGetDisplay failed with error " <<
GetLastEGLErrorString();
@@ -192,7 +167,8 @@ bool GLSurfaceEGL::InitializeOneOff() {
 
 #if defined(USE_OZONE)
   const EGLint* config_attribs =
-      surface_factory->GetEGLSurfaceProperties(choose_attributes);
+      SurfaceFactoryOzone::GetInstance()->GetEGLSurfaceProperties(
+          choose_attributes);
 #else
   const EGLint* config_attribs = choose_attributes;
 #endif
@@ -328,6 +304,10 @@ bool GLSurfaceEGL::IsCreateContextRobustnessSupported() {
   return g_egl_create_context_robustness_supported;
 }
 
+bool GLSurfaceEGL::IsEGLSurfacelessContextSupported() {
+  return g_egl_surfaceless_context_supported;
+}
+
 GLSurfaceEGL::~GLSurfaceEGL() {}
 
 NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(EGLNativeWindowType window)
@@ -756,114 +736,4 @@ void* SurfacelessEGL::GetShareHandle() {
 SurfacelessEGL::~SurfacelessEGL() {
 }
 
-#if defined(ANDROID) || defined(USE_OZONE)
-
-// A thin subclass of |GLSurfaceOSMesa| that can be used in place
-// of a native hardware-provided surface when a native surface
-// provider is not available.
-class GLSurfaceOSMesaHeadless : public GLSurfaceOSMesa {
- public:
-  explicit GLSurfaceOSMesaHeadless();
-
-  virtual bool IsOffscreen() OVERRIDE;
-  virtual bool SwapBuffers() OVERRIDE;
-
- protected:
-  virtual ~GLSurfaceOSMesaHeadless();
-
- private:
-
-  DISALLOW_COPY_AND_ASSIGN(GLSurfaceOSMesaHeadless);
-};
-
-bool GLSurfaceOSMesaHeadless::IsOffscreen() { return false; }
-
-bool GLSurfaceOSMesaHeadless::SwapBuffers() { return true; }
-
-GLSurfaceOSMesaHeadless::GLSurfaceOSMesaHeadless()
-    : GLSurfaceOSMesa(OSMESA_BGRA, gfx::Size(1, 1)) {}
-
-GLSurfaceOSMesaHeadless::~GLSurfaceOSMesaHeadless() { Destroy(); }
-
-// static
-bool GLSurface::InitializeOneOffInternal() {
-  switch (GetGLImplementation()) {
-    case kGLImplementationEGLGLES2:
-      if (!GLSurfaceEGL::InitializeOneOff()) {
-        LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
-        return false;
-      }
-    default:
-      break;
-  }
-  return true;
-}
-
-// static
-scoped_refptr<GLSurface>
-GLSurface::CreateViewGLSurface(gfx::AcceleratedWidget window) {
-
-  if (GetGLImplementation() == kGLImplementationOSMesaGL) {
-    scoped_refptr<GLSurface> surface(new GLSurfaceOSMesaHeadless());
-    if (!surface->Initialize())
-      return NULL;
-    return surface;
-  }
-  DCHECK(GetGLImplementation() == kGLImplementationEGLGLES2);
-  if (window != kNullAcceleratedWidget) {
-    EGLNativeWindowType egl_window;
-    scoped_refptr<NativeViewGLSurfaceEGL> surface;
-    scoped_ptr<VSyncProvider> sync_provider;
-#if defined(USE_OZONE)
-    egl_window =
-        gfx::SurfaceFactoryOzone::GetInstance()->RealizeAcceleratedWidget(
-            window);
-    sync_provider =
-        gfx::SurfaceFactoryOzone::GetInstance()->CreateVSyncProvider(
-            egl_window);
-#else
-    egl_window = window;
-#endif
-    surface = new NativeViewGLSurfaceEGL(egl_window);
-    if(surface->Initialize(sync_provider.Pass()))
-      return surface;
-  } else {
-    scoped_refptr<GLSurface> surface = new GLSurfaceStub();
-    if (surface->Initialize())
-      return surface;
-  }
-  return NULL;
-}
-
-// static
-scoped_refptr<GLSurface>
-GLSurface::CreateOffscreenGLSurface(const gfx::Size& size) {
-  switch (GetGLImplementation()) {
-    case kGLImplementationOSMesaGL: {
-      scoped_refptr<GLSurface> surface(new GLSurfaceOSMesa(1, size));
-      if (!surface->Initialize())
-        return NULL;
-
-      return surface;
-    }
-    case kGLImplementationEGLGLES2: {
-      scoped_refptr<GLSurface> surface;
-      if (g_egl_surfaceless_context_supported &&
-         (size.width() == 0 && size.height() == 0)) {
-        surface = new SurfacelessEGL(size);
-      } else
-        surface = new PbufferGLSurfaceEGL(size);
-
-      if (!surface->Initialize())
-        return NULL;
-      return surface;
-    }
-    default:
-      NOTREACHED();
-      return NULL;
-  }
-}
-
-#endif
-
 }  // namespace gfx

[spang, 2014-03-27 15:43:44]

The CQ bit was checked by spang@chromium.org

[commit-bot: I haz the power, 2014-03-27 15:43:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/spang@chromium.org/196403008/190001

[commit-bot: I haz the power, 2014-03-27 15:53:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-27 15:53:59]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_chromeos_clang_dbg

[spang, 2014-03-27 15:55:25]

The CQ bit was checked by spang@chromium.org

[commit-bot: I haz the power, 2014-03-27 15:55:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/spang@chromium.org/196403008/190001

[commit-bot: I haz the power, 2014-03-27 16:11:09]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-27 16:11:10]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_clang_dbg

[spang, 2014-03-27 16:24:55]

The CQ bit was checked by spang@chromium.org

[commit-bot: I haz the power, 2014-03-27 16:25:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/spang@chromium.org/196403008/190001

[commit-bot: I haz the power, 2014-03-27 16:31:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-27 16:31:36]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_chromeos_rel

[spang, 2014-03-27 17:11:14]

The CQ bit was checked by spang@chromium.org

[commit-bot: I haz the power, 2014-03-27 17:11:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/spang@chromium.org/196403008/190001

[spang, 2014-03-27 17:25:34]

Committed patchset #6 manually as r259923 (presubmit successful).