JOGL: Unify library loading (impl and binding), incl. lookup ; GLAutoDrawable: dispose() calls only with created context.

- Using the EGL approach of DynamicLookupHelper,
  now generalized in abstract GLDynamicLookupHelper,
  DesktopGLDynamicLookupHelper and EGLGLDynamicLookupHelper.
  The implementation of these are self contained.

  - Sharing common code.
  - Unifying implementation and binding loading,
    as well as the function lookup within the impl libs.

- Removed DRIHack, since its no more required
  due to the new DesktopGLDynamicLookupHelper.

- Removed compile time link to GL and GLU libs

- Removed redundant library OS functions from X11/WGL
  bindings, GlueGen's common code is being used now.

- GLAutoDrawable: dispose() calls only with created context.
  This cleans up stack traces in case of eventual bugs,
  where context creation is not successful.

1 files changed, 38 insertions, 81 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 0dd04ccb8..9203542a7 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1103,13 +1103,12 @@
 
       <!-- linker configuration -->
  
-      <linker id="linker.cfg.linux.jogl.gl2" extends="linker.cfg.linux">
+      <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
         <syslibset libs="X11"/>
         <syslibset libs="Xxf86vm" />
-        <syslibset libs="GL"/>
       </linker>
 
-      <linker id="linker.cfg.linux.jogl.cg" extends="linker.cfg.linux.jogl.gl2">
+      <linker id="linker.cfg.linux.jogl.cg" extends="linker.cfg.linux.jogl.x11">
         <syslibset dir="${x11.cg.lib32}" libs="Cg, CgGL"/>
       </linker>
 
@@ -1118,77 +1117,47 @@
         <syslibset libs="Xxf86vm" />
       </linker>
 
-      <linker id="linker.cfg.linux.amd64.jogl.gl2" extends="linker.cfg.linux.amd64.jogl.x11">
-        <syslibset libs="GL"/>
-      </linker>
-
-      <linker id="linker.cfg.linux.amd64.jogl.cg" extends="linker.cfg.linux.amd64.jogl.gl2">
-        <syslibset dir="${x11.cg.lib64}" libs="Cg, CgGL"/>
-      </linker>
-
       <linker id="linker.cfg.solaris.jogl.x11" extends="linker.cfg.solaris">
         <syslibset libs="X11"/>
       </linker>
 
-      <linker id="linker.cfg.solaris.jogl.gl2" extends="linker.cfg.solaris.jogl.x11">
-        <syslibset libs="GL"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.jogl.cg" extends="linker.cfg.solaris.jogl.gl2">
-        <syslibset dir="${x11.cg.lib32}" libs="Cg, CgGL"/>
-      </linker>
-
-      <linker id="linker.cfg.solaris.sparcv9.jogl.gl2" extends="linker.cfg.solaris.sparcv9">
+      <linker id="linker.cfg.solaris.sparcv9.jogl.x11" extends="linker.cfg.solaris.sparcv9">
         <linkerarg value="-xarch=v9a" />
-        <syslibset dir="/usr/openwin/lib/sparcv9" libs="GL"/>
         <syslibset dir="/usr/lib/sparcv9" libs="X11"/>
       </linker>
 
-      <linker id="linker.cfg.solaris.amd64.jogl.gl2" extends="linker.cfg.solaris.amd64">
+      <linker id="linker.cfg.solaris.amd64.jogl.x11" extends="linker.cfg.solaris.amd64">
         <linkerarg value="-xarch=amd64" />
-        <syslibset dir="/usr/lib/amd64" libs="GL"/>
         <syslibset dir="/usr/lib/amd64" libs="X11"/>
       </linker>
 
       <linker id="linker.cfg.win32.mingw.jogl" extends="linker.cfg.win32.mingw">
         <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="opengl32, glu32, gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win32.mingw.jogl.cg" extends="linker.cfg.win32.mingw.jogl">
-        <syslibset dir="${windows.cg.lib32}" libs="cg, cgGL"/>
+        <syslibset libs="gdi32, kernel32"/>
       </linker>
 
       <linker id="linker.cfg.win64.mingw.jogl" extends="linker.cfg.win64.mingw">
         <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names -->
-        <syslibset libs="opengl32, glu32, gdi32, kernel32"/>
-      </linker>
-
-      <linker id="linker.cfg.win64.mingw.jogl.cg" extends="linker.cfg.win64.mingw.jogl">
-        <syslibset dir="${windows.cg.lib64}" libs="cg, cgGL"/>
+        <syslibset libs="gdi32, kernel32"/>
       </linker>
 
       <linker id="linker.cfg.win32.msvc.jogl" extends="linker.cfg.win32.msvc">
-        <syslibset libs="opengl32, gdi32, user32, kernel32" />
+        <syslibset libs="user32, kernel32" />
     <!-- This is temporary -->
         <syslibset libs="winmm" />
       </linker>
 
-      <linker id="linker.cfg.win32.msvc.jogl.cg" extends="linker.cfg.win32.msvc.jogl">
-        <syslibset dir="${windows.cg.lib32}" libs="cg, cgGL"/>
-      </linker>
-
       <linker id="linker.cfg.macosx.jogl" extends="linker.cfg.macosx">
         <linkerarg value="-framework" />
         <linkerarg value="Cocoa" />
-        <linkerarg value="-framework" />
-        <linkerarg value="OpenGL" />
+        <!--linkerarg value="-framework" />
+        <linkerarg value="OpenGL" /-->
       </linker>
 
-      <linker id="linker.cfg.macosx.jogl.cg" extends="linker.cfg.macosx.jogl">
+      <!--linker id="linker.cfg.macosx.jogl.cg" extends="linker.cfg.macosx.jogl">
         <linkerarg value="-framework"/>
         <linkerarg value="Cg"/>
-      </linker>
+      </linker-->
 
       <linker id="linker.cfg.hpux.jogl" extends="linker.cfg.hpux">
         <syslibset dir="/opt/graphics/OpenGL/lib" libs="GL, GLU"/>
@@ -1198,83 +1167,72 @@
 
     <target name="c.configure.win32.vc" if="isVCFamily">
       <echo message="Win32.VC" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.msvc" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.win32.msvc.jogl" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.win32.msvc.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.win32.msvc" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.win32.msvc.jogl" />
     </target>
     
     <target name="c.configure.win32.mingw" if="isMingW32">
       <echo message="Win32.MingW" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win32.mingw" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.win32.mingw.jogl" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.win32.mingw.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.win32.mingw" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.win32.mingw.jogl" />
     </target>
 
     <target name="c.configure.win64.mingw" if="isMingW64">
       <echo message="Win64.MingW" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.win64.mingw" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.win64.mingw.jogl" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.win64.mingw.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.win64.mingw" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.win64.mingw.jogl" />
     </target>
 
     <target name="c.configure.linux.x86" if="isLinuxX86">
       <echo message="Linux.x86" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.linux.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.linux.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
     </target>
     
     <target name="c.configure.linux.amd64" if="isLinuxAMD64">
       <echo message="Linux.AMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.linux.amd64.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.linux.amd64.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.amd64" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.amd64.jogl.x11" />
     </target>
     
     <target name="c.configure.linux.ia64" if="isLinuxIA64">
       <echo message="Linux.IA64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.linux.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.linux.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
     </target>
 
     <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
 
     <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
       <echo message="Solaris" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.solaris.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.solaris.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.jogl.x11" />
     </target>
   
  
     <target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
       <echo message="SolarisSparcv9" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.sparcv9" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.solaris.sparcv9.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.solaris.sparcv9.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris.sparcv9" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.sparcv9.jogl.x11" />
     </target>
    
 
     <target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
       <echo message="SolarisAMD64" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.solaris.amd64" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.solaris.amd64.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.solaris.amd64.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.solaris.amd64" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.solaris.amd64.jogl.x11" />
     </target>
    
     <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
       <echo message="FreeBSD" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd.jogl" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.linux.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.linux.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.freebsd.jogl" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
     </target>
 
     <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
       <echo message="HP-UX" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.hpux" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.hpux.jogl.gl2" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.hpux.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.hpux" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.hpux.jogl.x11" />
     </target>
 
     <target name="c.configure.win32" depends="c.configure.win32.vc,c.configure.win32.mingw,c.configure.win64.mingw" if="isWindows" />
@@ -1282,9 +1240,8 @@
     <target name="c.configure.x11" if="isX11" />
 
     <target name="c.configure.macosx" if="isOSX">
-      <property name="compiler.cfg.id"                      value="compiler.cfg.macosx" />
-      <property name="linker.cfg.id.gl2"                    value="linker.cfg.macosx.jogl" />
-      <property name="linker.cfg.id.cg"                     value="linker.cfg.macosx.jogl.cg" />
+      <property name="compiler.cfg.id"                     value="compiler.cfg.macosx" />
+      <property name="linker.cfg.id.os"                    value="linker.cfg.macosx.jogl" />
     </target>
     
     <target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.solaris32,c.configure.solaris.sparcv9,c.configure.solaris.amd64,c.configure.macosx,c.configure.freebsd,c.configure.hpux" />
@@ -1453,14 +1410,14 @@
       <c.build c.compiler.src.files="c.src.files.jogl.desktop"
                output.lib.name="jogl_desktop"
                compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.gl2}"/>
+               linker.cfg.id="${linker.cfg.id.os}"/>
     </target>
 
     <target name="c.build.jogl.gl2es12" unless="setup.nodesktop">
       <c.build c.compiler.src.files="c.src.files.jogl.gl2es12"
                output.lib.name="jogl_gl2es12"
                compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.gl2}"/>
+               linker.cfg.id="${linker.cfg.id.os}"/>
     </target>
 
     <target name="c.build.jogl.es2">
@@ -1481,7 +1438,7 @@
       <c.build c.compiler.src.files="c.src.files.cg"
                output.lib.name="jogl_cg"
                compiler.cfg.id="${compiler.cfg.id}"
-               linker.cfg.id="${linker.cfg.id.cg}"/>
+               linker.cfg.id="${linker.cfg.id.os}"/>
     </target>
     
     <target name="c.manifest.cg" if="jogl.cg">