Merge branch 'master' of github.com:mbien/jogl

6 files changed, 11 insertions, 12 deletions

diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg
index 74047072b..94984a305 100755
--- a/make/config/jogl/egl.cfg
+++ b/make/config/jogl/egl.cfg
@@ -25,9 +25,9 @@ CustomCCode #include <EGL/egl.h>
 
 Include ../intptr.cfg
 
-CustomJavaCode EGL  private static EGLProcAddressTable _table = new EGLProcAddressTable();
+CustomJavaCode EGL  private static EGLProcAddressTable _table = new EGLProcAddressTable(new GLProcAddressResolver());
 CustomJavaCode EGL  public static void resetProcAddressTable(DynamicLookupHelper lookup) {
-CustomJavaCode EGL      GLProcAddressHelper.resetProcAddressTable(_table, lookup);
+CustomJavaCode EGL      _table.reset(lookup);
 CustomJavaCode EGL  }
 
 # There are some #defines in egl.h that GlueGen and PCPP don't currently handle
@@ -47,4 +47,4 @@ CustomJavaCode EGL    return dispatch_eglGetProcAddress1(procname, eglGetProcAdd
 CustomJavaCode EGL  }
 
 
-Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
+Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java
index 5b2a3ed89..690e0acfa 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2.java
@@ -547,8 +547,8 @@ private static final GLUgl2ProcAddressTable getGLUProcAddressTable() {
     if (curContext == null) {
         throw new GLException("No OpenGL context current on this thread");
     }
-    GLUgl2ProcAddressTable tmp = new GLUgl2ProcAddressTable();
-    GLProcAddressHelper.resetProcAddressTable(tmp, ((GLDrawableImpl)curContext.getGLDrawable()).getDynamicLookupHelper());
+    GLUgl2ProcAddressTable tmp = new GLUgl2ProcAddressTable(new GLProcAddressResolver());
+    tmp.reset(((GLDrawableImpl)curContext.getGLDrawable()).getDynamicLookupHelper());
     gluProcAddressTable = tmp;
   }
   return gluProcAddressTable;
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index f3b4322d9..eb4bcc718 100755
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -238,8 +238,8 @@ private static GLUProcAddressTable getGLUProcAddressTable() {
     loadGLULibrary();
   }
   if (gluProcAddressTable == null) {
-    GLUProcAddressTable tmp = new GLUProcAddressTable();
-    GLProcAddressHelper.resetProcAddressTable(tmp, GLDrawableFactoryImpl.getFactoryImpl());
+    GLUProcAddressTable tmp = new GLUProcAddressTable(new GLProcAddressResolver());
+    tmp.reset(GLDrawableFactoryImpl.getFactoryImpl());
     gluProcAddressTable = tmp;
   }
   return gluProcAddressTable;
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index cc5b16f0f..aec0c446a 100755
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -40,7 +40,7 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java
 # and to the nurbs.* package for the NURBS functionality
 Import com.jogamp.opengl.impl.glu.nurbs.*
 Import java.security.*
-Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
+Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver
 Import com.jogamp.opengl.impl.glu.gl2.nurbs.*
 Import com.jogamp.opengl.impl.glu.mipmap.Mipmap
 Import com.jogamp.opengl.impl.glu.gl2.*
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 7d0c3a0c2..4f208ee85 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -47,7 +47,6 @@ import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.gluegen.runtime.*;
 import com.jogamp.gluegen.runtime.opengl.*;
-import com.jogamp.common.JogampRuntimeException;
 import com.jogamp.common.util.ReflectionUtil;
 
 public abstract class GLContextImpl extends GLContext {
@@ -688,7 +687,7 @@ public abstract class GLContextImpl extends GLContext {
   /** Helper routine which resets a ProcAddressTable generated by the
       GLEmitter by looking up anew all of its function pointers. */
   protected void resetProcAddressTable(Object table) {
-    GLProcAddressHelper.resetProcAddressTable(table, getDrawableImpl().getDynamicLookupHelper() );
+    ((ProcAddressTable)table).reset(getDrawableImpl().getDynamicLookupHelper() );
   }
 
   /** Indicates whether the underlying OpenGL context has been
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index 9a0edcfbb..5e1a5da3a 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -41,7 +41,7 @@ import java.nio.*;
 import javax.media.nativewindow.*;
 import javax.media.nativewindow.x11.*;
 import javax.media.opengl.*;
-import com.jogamp.gluegen.runtime.opengl.*;
+
 import com.jogamp.opengl.impl.*;
 import com.jogamp.common.JogampRuntimeException;
 import com.jogamp.common.util.*;
@@ -54,7 +54,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
     super();
     // Must initialize GLX support eagerly in case a pbuffer is the
     // first thing instantiated
-    GLProcAddressHelper.resetProcAddressTable(GLX.getGLXProcAddressTable(), this);
+    GLX.getGLXProcAddressTable().reset(this);
     // Register our GraphicsConfigurationFactory implementations
     // The act of constructing them causes them to be registered
     new X11GLXGraphicsConfigurationFactory();