Bug 1156: EGL-GBM: Fix Cleanup (Newt package relocation / hack default GBM)

Now: TYPE_EGL_GBM == ".egl.gbm"

1 files changed, 5 insertions, 4 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDisplayUtil.java b/src/jogl/classes/jogamp/opengl/egl/EGLDisplayUtil.java
index 580a881d1..a2903e713 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDisplayUtil.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDisplayUtil.java
@@ -208,8 +208,8 @@ public class EGLDisplayUtil {
             case NativeWindowFactory.TYPE_ANDROID:
                 platform = EGLExt.EGL_PLATFORM_ANDROID_KHR;
                 break;
-            case NativeWindowFactory.TYPE_GBM:
-                platform = EGLExt.EGL_PLATFORM_GBM_MESA;
+            case NativeWindowFactory.TYPE_EGL_GBM:
+                platform = EGLExt.EGL_PLATFORM_GBM_KHR; // same EGLExt.EGL_PLATFORM_GBM_MESA;
                 break;
             case NativeWindowFactory.TYPE_WAYLAND:
                 // TODO
@@ -218,7 +218,7 @@ public class EGLDisplayUtil {
             default:
                 platform = 0;
         }
-        if( 0 != platform && false ) {
+        if( 0 != platform ) {
             eglDisplay = EGL.eglGetPlatformDisplay(platform, nativeDisplay_id, null);
         }
         else{
@@ -226,7 +226,8 @@ public class EGLDisplayUtil {
         }
 
         if(DEBUG) {
-            System.err.println("EGLDisplayUtil.eglGetDisplay.X: eglDisplay("+EGLContext.toHexString(nativeDisplay_id)+"): "+
+            System.err.println("EGLDisplayUtil.eglGetDisplay.X: eglDisplay("+EGLContext.toHexString(nativeDisplay_id)+") @ "+
+                               platform+"/"+nativeWindowType+": "+
                                EGLContext.toHexString(eglDisplay)+
                                ", "+((EGL.EGL_NO_DISPLAY != eglDisplay)?"OK":"Failed")+", singletonEGLDisplay "+singletonEGLDisplay+" (use "+useSingletonEGLDisplay+")");
         }