From 4512900ddcb9ce9a498411d257b1b6d6010ec006 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 4 Jun 2010 05:21:32 +0200
Subject: 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.
---
 make/config/jogl/glu-CustomJavaCode-gl2.java     | 15 +++----------
 make/config/jogl/glu-CustomJavaCode-gl2es1.java  | 27 ------------------------
 make/config/jogl/wgl-win32.cfg                   |  2 --
 make/config/nativewindow/x11-CustomJavaCode.java |  3 ---
 4 files changed, 3 insertions(+), 44 deletions(-)

(limited to 'make/config')

diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java
index 690e0acfa..3367b2f69 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2.java
@@ -536,27 +536,18 @@ public final void gluEndCurve(GLUnurbs r) {
 //
 
 private static GLUgl2ProcAddressTable gluProcAddressTable;
-private static volatile boolean gluLibraryLoaded;
 
 private static final GLUgl2ProcAddressTable getGLUProcAddressTable() {
-  if (!gluLibraryLoaded) {
-    loadGLULibrary();
-  }
   if (gluProcAddressTable == null) {
     GLContext curContext = GLContext.getCurrent();
     if (curContext == null) {
         throw new GLException("No OpenGL context current on this thread");
     }
+    GLDynamicLookupHelper glLookupHelper = ((GLDrawableImpl) curContext.getGLDrawable()).getGLDynamicLookupHelper();
+    glLookupHelper.loadGLULibrary();
     GLUgl2ProcAddressTable tmp = new GLUgl2ProcAddressTable(new GLProcAddressResolver());
-    tmp.reset(((GLDrawableImpl)curContext.getGLDrawable()).getDynamicLookupHelper());
+    tmp.reset(glLookupHelper);
     gluProcAddressTable = tmp;
   }
   return gluProcAddressTable;
 }
-
-private static final synchronized void loadGLULibrary() {
-  if (!gluLibraryLoaded) {
-    GLDrawableFactoryImpl.getFactoryImpl(null).loadGLULibrary();
-    gluLibraryLoaded = true;
-  }
-}
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index eb4bcc718..d3c8ab3d1 100755
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -225,30 +225,3 @@ public final int gluBuild3DMipmaps( int target, int internalFormat, int width,
           depth, format, type, buffer ) );
 }
 
-//----------------------------------------------------------------------
-// GLUProcAddressTable handling
-//
-
-/*
-private static GLUProcAddressTable gluProcAddressTable;
-private static volatile boolean gluLibraryLoaded;
-
-private static GLUProcAddressTable getGLUProcAddressTable() {
-  if (!gluLibraryLoaded) {
-    loadGLULibrary();
-  }
-  if (gluProcAddressTable == null) {
-    GLUProcAddressTable tmp = new GLUProcAddressTable(new GLProcAddressResolver());
-    tmp.reset(GLDrawableFactoryImpl.getFactoryImpl());
-    gluProcAddressTable = tmp;
-  }
-  return gluProcAddressTable;
-}
-
-private static synchronized void loadGLULibrary() {
-  if (!gluLibraryLoaded) {
-    GLDrawableFactoryImpl.getFactoryImpl().loadGLULibrary();
-    gluLibraryLoaded = true;
-  }
-}
-*/
diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg
index 2a69290a4..69f8c75fa 100644
--- a/make/config/jogl/wgl-win32.cfg
+++ b/make/config/jogl/wgl-win32.cfg
@@ -18,8 +18,6 @@ GLHeader GL/wglext.h
 # Implement the first argument to wglGetProcAddress as String instead
 # of byte[]
 ArgumentIsString wglGetProcAddress 0
-ArgumentIsString LoadLibraryA 0
-ArgumentIsString GetProcAddress 1
 
 CustomCCode #define WIN32_LEAN_AND_MEAN
 CustomCCode #include <windows.h>
diff --git a/make/config/nativewindow/x11-CustomJavaCode.java b/make/config/nativewindow/x11-CustomJavaCode.java
index 6b5831215..5919ddc40 100644
--- a/make/config/nativewindow/x11-CustomJavaCode.java
+++ b/make/config/nativewindow/x11-CustomJavaCode.java
@@ -32,9 +32,6 @@
   public static native long CreateDummyWindow(long display, int screen_index, long visualID);
   public static native void DestroyDummyWindow(long display, long window);
 
-  public static native long dlopen(String name);
-  public static native long dlsym(String name);
-
   public static native int XCloseDisplay(long display);
   public static native void XUnlockDisplay(long display);
   public static native void XLockDisplay(long display);
-- 
cgit v1.2.3