diff options
5 files changed, 6 insertions, 7 deletions
diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg index 5f13b5d0d..94984a305 100755 --- a/make/config/jogl/egl.cfg +++ b/make/config/jogl/egl.cfg @@ -27,7 +27,7 @@ Include ../intptr.cfg CustomJavaCode EGL private static EGLProcAddressTable _table = new EGLProcAddressTable(new GLProcAddressResolver()); CustomJavaCode EGL public static void resetProcAddressTable(DynamicLookupHelper lookup) { -CustomJavaCode EGL _table.resetProcAddressTable(lookup); +CustomJavaCode EGL _table.reset(lookup); CustomJavaCode EGL } # There are some #defines in egl.h that GlueGen and PCPP don't currently handle diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java index 3d884f860..690e0acfa 100644 --- a/make/config/jogl/glu-CustomJavaCode-gl2.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2.java @@ -548,7 +548,7 @@ private static final GLUgl2ProcAddressTable getGLUProcAddressTable() { throw new GLException("No OpenGL context current on this thread"); } GLUgl2ProcAddressTable tmp = new GLUgl2ProcAddressTable(new GLProcAddressResolver()); - tmp.resetProcAddressTable(((GLDrawableImpl)curContext.getGLDrawable()).getDynamicLookupHelper()); + 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 e93e48edd..eb4bcc718 100755 --- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java @@ -239,7 +239,7 @@ private static GLUProcAddressTable getGLUProcAddressTable() { } if (gluProcAddressTable == null) { GLUProcAddressTable tmp = new GLUProcAddressTable(new GLProcAddressResolver()); - tmp.resetProcAddressTable(GLDrawableFactoryImpl.getFactoryImpl()); + tmp.reset(GLDrawableFactoryImpl.getFactoryImpl()); gluProcAddressTable = tmp; } return gluProcAddressTable; diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java index 6899f5785..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) { - ((ProcAddressTable)table).resetProcAddressTable(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 d8013206d..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 - GLX.getGLXProcAddressTable().resetProcAddressTable(this); + GLX.getGLXProcAddressTable().reset(this); // Register our GraphicsConfigurationFactory implementations // The act of constructing them causes them to be registered new X11GLXGraphicsConfigurationFactory(); |