Made loading of GLU library lazier, partially in the hope that this

may address problems on certain Linux distributions where for some
reason we're falling back to software rendering with Mesa


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@595 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 11 insertions, 0 deletions

diff --git a/make/glu-CustomJavaCode.java b/make/glu-CustomJavaCode.java
index ffa3a0242..1ea4f20b9 100644
--- a/make/glu-CustomJavaCode.java
+++ b/make/glu-CustomJavaCode.java
@@ -1432,8 +1432,12 @@ public int gluScaleImage(int format, int wIn, int hIn, int typeIn, java.nio.Buff
 //
 
 private static GLUProcAddressTable gluProcAddressTable;
+private static volatile boolean gluLibraryLoaded;
 
 private static GLUProcAddressTable getGLUProcAddressTable() {
+  if (!gluLibraryLoaded) {
+    loadGLULibrary();
+  }
   if (gluProcAddressTable == null) {
     GLUProcAddressTable tmp = new GLUProcAddressTable();
     ProcAddressHelper.resetProcAddressTable(tmp, GLDrawableFactoryImpl.getFactoryImpl());
@@ -1441,3 +1445,10 @@ private static GLUProcAddressTable getGLUProcAddressTable() {
   }
   return gluProcAddressTable;
 }
+
+private static synchronized void loadGLULibrary() {
+  if (!gluLibraryLoaded) {
+    GLDrawableFactoryImpl.getFactoryImpl().loadGLULibrary();
+    gluLibraryLoaded = true;
+  }
+}