From 4f116decee048c8ee6e4c980f8b0d85705f927fb Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 24 Apr 2010 18:16:55 +0200
Subject: changes due to refactorings in ProcAddressTable.
---
make/config/jogl/egl.cfg | 6 +++---
make/config/jogl/glu-CustomJavaCode-gl2.java | 4 ++--
make/config/jogl/glu-CustomJavaCode-gl2es1.java | 4 ++--
make/config/jogl/glu-gl2.cfg | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'make/config')
diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg
index 74047072b..5f13b5d0d 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.resetProcAddressTable(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..3d884f860 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.resetProcAddressTable(((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..e93e48edd 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.resetProcAddressTable(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.*
--
cgit v1.2.3
From c2860b7b9b00f71625f5503122598c3e53d336b5 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 24 Apr 2010 20:11:37 +0200
Subject: modifications due to method renaming in gluegen/procaddresstable.
---
make/config/jogl/egl.cfg | 2 +-
make/config/jogl/glu-CustomJavaCode-gl2.java | 2 +-
make/config/jogl/glu-CustomJavaCode-gl2es1.java | 2 +-
src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java | 3 +--
.../classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java | 4 ++--
5 files changed, 6 insertions(+), 7 deletions(-)
(limited to 'make/config')
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();
--
cgit v1.2.3