From d0676451343e826e49d9c5732320f080d4c11c8d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 23 Jan 2015 00:48:16 +0100
Subject: Bug 1096 - Expose EGL to public: com.jogamp.opengl.egl.EGL ;
 EGLDrawableFactory: Validate static EGL func-ptr, probe EGL/ES2 first

- Move EGL to public package
  jogamp.opengl.egl.EGL -> com.jogamp.opengl.egl.EGL

- EGLDrawableFactory
  - Validate static EGL func-ptr against EGL/ES2,
    ignoring EGL/[ES|GL] collisions w/ diff. native EGL implementations
    due to static EGL usage.

  - Probe EGL/ES2 first
---
 src/jogl/classes/jogamp/opengl/egl/EGLSurface.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/jogl/classes/jogamp/opengl/egl/EGLSurface.java')

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLSurface.java b/src/jogl/classes/jogamp/opengl/egl/EGLSurface.java
index d00656a34..796a9e2c8 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLSurface.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLSurface.java
@@ -37,11 +37,12 @@ import javax.media.opengl.GLCapabilitiesImmutable;
 import javax.media.opengl.GLException;
 
 import com.jogamp.common.nio.Buffers;
+import com.jogamp.nativewindow.GenericUpstreamSurfacelessHook;
+import com.jogamp.opengl.egl.EGL;
 
 import jogamp.nativewindow.ProxySurfaceImpl;
 import jogamp.nativewindow.WrappedSurface;
 import jogamp.opengl.GLDrawableImpl;
-import jogamp.opengl.egl.EGL;
 
 /**
  * <pre>
@@ -80,10 +81,10 @@ public class EGLSurface extends WrappedSurface {
         }
     }
 
-    public static EGLSurface createSurfaceless(final EGLGraphicsConfiguration cfg, final EGLUpstreamSurfacelessHook upstream, final boolean ownsDevice) {
+    public static EGLSurface createSurfaceless(final EGLGraphicsConfiguration cfg, final GenericUpstreamSurfacelessHook upstream, final boolean ownsDevice) {
         return new EGLSurface(cfg, upstream, ownsDevice);
     }
-    private EGLSurface(final EGLGraphicsConfiguration cfg, final EGLUpstreamSurfacelessHook upstream, final boolean ownsDevice) {
+    private EGLSurface(final EGLGraphicsConfiguration cfg, final GenericUpstreamSurfacelessHook upstream, final boolean ownsDevice) {
         super(cfg, EGL.EGL_NO_SURFACE, upstream, ownsDevice);
         if(EGLDrawableFactory.DEBUG) {
             System.err.println("EGLSurface.ctor().3: "+this);
-- 
cgit v1.2.3