Bug 1156: EGL-GBM: Cleanup Code & Replace Newt GBM implementation

GBM driver is now under egl/gbm subpackage and has been replaced by bcm_vc_iv boilerplate.
Native code is reentrant capable and cleaned up.
TODO: EGLDisplayUtil work with SharedResourceRunner

3 files changed, 29 insertions, 28 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 0967b6b0f..1d8928cf2 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -414,7 +414,7 @@
         <property name="newt-driver-intelgdl.jar" value="${build.newt}/newt-driver-intelgdl.jar" />    <!-- excluded from all -->
         <property name="newt-driver-bcm-old.jar"  value="${build.newt}/newt-driver-bcm-old.jar" />     <!-- excluded from all -->
         <property name="newt-driver-bcm-vc.jar"   value="${build.newt}/newt-driver-bcm-vc.jar" />
-        <property name="newt-driver-gbm.jar"      value="${build.newt}/newt-driver-gbm.jar" />
+        <property name="newt-driver-egl-gbm.jar"  value="${build.newt}/newt-driver-egl-gbm.jar" />
 
         <path id="newt_all_atoms.classpath">
             <pathelement location="${newt.jar}" />
@@ -428,7 +428,7 @@
             <pathelement location="${newt-driver-osx.jar}" />
             <pathelement location="${newt-driver-ios.jar}" />
             <pathelement location="${newt-driver-bcm-vc.jar}" />
-            <pathelement location="${newt-driver-gbm.jar}" />
+            <pathelement location="${newt-driver-egl-gbm.jar}" />
         </path>
         <path id="newt_all-noawt_atoms.classpath">
             <pathelement location="${newt.jar}" />
@@ -439,7 +439,7 @@
             <pathelement location="${newt-driver-osx.jar}" />
             <pathelement location="${newt-driver-ios.jar}" />
             <pathelement location="${newt-driver-bcm-vc.jar}" />
-            <pathelement location="${newt-driver-gbm.jar}" />
+            <pathelement location="${newt-driver-egl-gbm.jar}" />
         </path>
         <path id="newt_all-mobile_atoms.classpath">
             <pathelement location="${newt.jar}" />
@@ -449,7 +449,7 @@
             <pathelement location="${newt-driver-win.jar}" />
             <pathelement location="${newt-driver-ios.jar}" />
             <pathelement location="${newt-driver-bcm-vc.jar}" />
-            <pathelement location="${newt-driver-gbm.jar}" />
+            <pathelement location="${newt-driver-egl-gbm.jar}" />
         </path>
         <path id="newt_all-android_atoms.classpath">
             <pathelement location="${newt.jar}" />
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 447a41189..c3fc22afd 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -49,7 +49,7 @@
        setup.addNativeKD
        setup.addNativeIntelGDL
        setup.addNativeBroadcom  ( always true if 'isLinux' )
-       setup.addNativeGBM  ( always true if 'isLinux' )
+       setup.addNativeEGLGBM  ( always true if 'isLinux' )
 
    - Internal settings, may not be necessary to set them manually,
      since all JAR archives are orthogonal.
@@ -76,7 +76,7 @@
            <isset property="isLinux"/>
         </condition>
 
-        <condition property="setup.addNativeGBM">
+        <condition property="setup.addNativeEGLGBM">
             <isset property="isLinux"/>
         </condition>
 
@@ -90,7 +90,7 @@
                 <isfalse value="${setup.addNativeKD}" />
                 <isfalse value="${setup.addNativeIntelGDL}" />
                 <isfalse value="${setup.addNativeBroadcom}" />
-                <isfalse value="${setup.addNativeGBM}" />
+                <isfalse value="${setup.addNativeEGLGBM}" />
             </and>
         </condition>
 
@@ -103,7 +103,7 @@
         <echo message="setup.addNativeKD: ${setup.addNativeKD}" />
         <echo message="setup.addNativeIntelGDL: ${setup.addNativeIntelGDL}" />
         <echo message="setup.addNativeBroadcom: ${setup.addNativeBroadcom}" />
-        <echo message="setup.addNativeGBM: ${setup.addNativeGBM}" />
+        <echo message="setup.addNativeEGLGBM: ${setup.addNativeEGLGBM}" />
         <echo message="setup.nonatives: ${setup.nonatives}" />
 
         <!-- partitioning -->
@@ -156,8 +156,8 @@
         <property name="java.part.driver.bcm.vc"
                   value="jogamp/newt/driver/bcm/vc/**"/>
 
-        <property name="java.part.driver.gbm"
-                  value="jogamp/newt/driver/gbm/**"/>
+        <property name="java.part.driver.egl.gbm"
+                  value="jogamp/newt/driver/egl/gbm/**"/>
 
         <property name="java.part.driver.android"
                   value="jogamp/newt/driver/android/**"/>
@@ -245,7 +245,7 @@
         <mkdir dir="${src.generated.c}/IntelGDL" />
         <mkdir dir="${src.generated.c}/bcm/egl" />
         <mkdir dir="${src.generated.c}/bcm/vc/iv" />
-        <mkdir dir="${src.generated.c}/gbm" />
+        <mkdir dir="${src.generated.c}/egl/gbm" />
         <mkdir dir="${classes}" />
         <mkdir dir="${obj.newt}" />
     </target>
@@ -332,7 +332,7 @@
         <javac srcdir="${src.java}"
                destdir="${classes}"
                excludes="${java.excludes.all} ${java.part.driver.android}"
-               nativeheaderdir="${src.generated.c}/gbm"
+               nativeheaderdir="${src.generated.c}/egl/gbm"
                fork="yes"
                includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
@@ -342,9 +342,9 @@
                bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
-            <include name="jogamp/newt/driver/gbm/DisplayDriver.java" />
-            <include name="jogamp/newt/driver/gbm/ScreenDriver.java" />
-            <include name="jogamp/newt/driver/gbm/WindowDriver.java" />
+            <include name="jogamp/newt/driver/egl/gbm/DisplayDriver.java" />
+            <include name="jogamp/newt/driver/egl/gbm/ScreenDriver.java" />
+            <include name="jogamp/newt/driver/egl/gbm/WindowDriver.java" />
         </javac>
 
         <!-- create Windows native headers -->
@@ -525,11 +525,11 @@
         <!-- syslibset libs="EGL"/ -->
       </linker>
 
-        <linker id="linker.cfg.linux.newt.bcm_vc" extends="linker.cfg.linux">
-            <syslibset libs="EGL"/>
-            <syslibset libs="gbm"/>
-            <syslibset libs="drm"/>
-        </linker>
+      <linker id="linker.cfg.linux.newt.egl_gbm" extends="linker.cfg.linux">
+        <syslibset libs="EGL"/>
+        <syslibset libs="gbm"/>
+        <syslibset libs="drm"/>
+      </linker>
 
       <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux">
         <syslibset libs="EGL"/>
@@ -899,7 +899,7 @@
           <include name="${rootrel.src.c}/IntelGDL.c"         if="setup.addNativeIntelGDL"/>
           <include name="${rootrel.src.c}/bcm_egl.c"          if="setup.addNativeBroadcom"/>
           <include name="${rootrel.src.c}/bcm_vc_iv.c"        if="setup.addNativeBroadcom"/>
-          <include name="${rootrel.src.c}/gbm.c"              if="setup.addNativeGBM"/>
+          <include name="${rootrel.src.c}/egl_gbm.c"          if="setup.addNativeEGLGBM"/>
         </patternset>
 
         <echo message="Compiling @{output.lib.name}" />
@@ -948,7 +948,8 @@
                 <includepath path="stub_includes/embedded/IntelGDL" if="setup.addNativeIntelGDL" />
                 <includepath path="${src.generated.c}/bcm/egl"      if="setup.addNativeBroadcom" />
                 <includepath path="${src.generated.c}/bcm/vc/iv"    if="setup.addNativeBroadcom" />
-                <includepath path="${src.generated.c}/gbm"          if="setup.addNativeGBM" />
+                <includepath path="${src.generated.c}/egl/gbm"      if="setup.addNativeEGLGBM" />
+                <includepath path="/usr/include/libdrm"             if="setup.addNativeEGLGBM" />
                 <!-- This must come last to not override real include paths -->
                 <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
               </compiler>
@@ -1094,9 +1095,9 @@
             <fileset dir="${classes}"
                      includes="${java.part.driver.bcm.vc}"/>
         </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-gbm.jar}" filesonly="true">
+        <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-egl-gbm.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.driver.gbm}"/>
+                     includes="${java.part.driver.egl.gbm}"/>
         </jar>
         <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-intelgdl.jar}" filesonly="true">
             <fileset dir="${classes}"
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index e0f0c0673..0355ceae8 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -114,7 +114,7 @@ function jrun() {
     #D_ARGS="-Dnativewindow.debug=all"
     #D_ARGS="-Djogl.debug=all"
     #D_ARGS="-Djogl.debug=all -Dnewt.debug=all -Djogl.debug.DebugGL"
-    #D_ARGS="-Dnewt.debug=all"
+    D_ARGS="-Dnewt.debug=all"
     #D_ARGS="-Djogl.debug=all -Dnewt.debug=all"
     #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all"
     #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
@@ -123,7 +123,7 @@ function jrun() {
     #D_ARGS="-Dnativewindow.debug.OSXUtil -Dnativewindow.debug.JAWT -Djogl.debug.GLContext"
     #D_ARGS="-Dnewt.debug.Window"
     #D_ARGS="-Dnewt.debug.Window -Djogamp.common.utils.locks.Lock.timeout=600000 -Dnewt.debug.EDT"
-    D_ARGS="-Dnewt.debug.Window -Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Dnativewindow.debug.OSXUtil.MainThreadChecker"
+    #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Dnativewindow.debug.OSXUtil.MainThreadChecker"
     #X_ARGS="--illegal-access=warn"
 
     #D_ARGS="-Djogamp.debug.NativeLibrary=true -Djogamp.debug.JNILibLoader=true"
@@ -448,7 +448,7 @@ function testawtswt() {
 
 #testnoawt com.jogamp.newt.opengl.GLWindow $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLVersionParsing00NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
@@ -952,7 +952,7 @@ function testawtswt() {
 # 2.4.0 Regressions
 #
 # OSX
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.ect.TestExclusiveContext01VSyncAnimNEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.ect.TestExclusiveContext01VSyncAnimNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT $*
 #testawt com.jogamp.opengl.test.junit.newt.event.TestParentingFocus02SwingAWTRobot $*
 #testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting01NEWT $*