aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2010-04-24 21:25:07 +0200
committerSven Gothel <sgothel@jausoft.com>2010-04-24 21:25:07 +0200
commitedaf669e1b8c8412c1fd4acfc799138b629bf031 (patch)
tree53a3aa8a18d4b5c11d13be6fbd1f6ec14e92b891 /src/jogl
parent0715cdc7d978db00c15b9a79cc21af8fd466174b (diff)
parentc2860b7b9b00f71625f5503122598c3e53d336b5 (diff)
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'src/jogl')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java3
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java4
2 files changed, 3 insertions, 4 deletions
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();