From 992b456d64e6128af021067e10e485d25977bf24 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Sat, 27 Mar 2010 02:57:46 +0100 Subject: refactoring due to gluegen changes. - renamed com.sun.gluegen.runtime -> com.jogamp.gluegen.runtime. --- src/jogl/classes/com/sun/opengl/impl/DRIHack.java | 2 +- src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java | 4 ++-- src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java | 2 +- src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java | 2 +- src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java | 2 +- src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java | 2 +- src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java | 2 +- src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java | 4 ++-- .../classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java | 2 +- .../classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java | 2 +- .../classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java | 2 +- src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java | 2 +- src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java | 2 +- src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java | 2 +- .../classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java | 2 +- .../com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java | 2 +- .../sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java | 3 --- .../com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java | 4 +--- .../classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java | 2 +- .../classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java | 2 +- .../com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java | 2 +- .../sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java | 2 +- .../classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java | 2 +- src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java | 2 +- src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java | 2 +- .../classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java | 4 ++-- .../com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java | 4 ++-- .../sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java | 2 +- .../com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java | 2 +- src/jogl/classes/javax/media/opengl/GLContext.java | 3 ++- 30 files changed, 34 insertions(+), 38 deletions(-) (limited to 'src/jogl/classes') diff --git a/src/jogl/classes/com/sun/opengl/impl/DRIHack.java b/src/jogl/classes/com/sun/opengl/impl/DRIHack.java index 63a2f7ecd..c55e9ec3e 100755 --- a/src/jogl/classes/com/sun/opengl/impl/DRIHack.java +++ b/src/jogl/classes/com/sun/opengl/impl/DRIHack.java @@ -41,7 +41,7 @@ package com.sun.opengl.impl; import java.io.*; import java.security.*; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; /** * Helper class for working around problems with open-source DRI diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java index 1d500bb17..70de5b8ba 100644 --- a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java +++ b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java @@ -44,8 +44,8 @@ import java.lang.reflect.*; import javax.media.opengl.*; import com.sun.nativewindow.impl.NWReflection; -import com.sun.gluegen.runtime.*; -import com.sun.gluegen.runtime.opengl.*; +import com.jogamp.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.opengl.*; public abstract class GLContextImpl extends GLContext { protected GLContextLock lock = new GLContextLock(); diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java index ceef07727..9f39c67cb 100644 --- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java +++ b/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java @@ -42,7 +42,7 @@ package com.sun.opengl.impl; import java.nio.*; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.sun.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.*; import com.sun.nativewindow.impl.NWReflection; import java.lang.reflect.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java index befee170f..d29018116 100644 --- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java +++ b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java @@ -41,7 +41,7 @@ package com.sun.opengl.impl; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; public abstract class GLDrawableImpl implements GLDrawable { protected static final boolean DEBUG = Debug.debug("GLDrawable"); diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java index 756f6afd4..3e67469b4 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java @@ -38,7 +38,7 @@ package com.sun.opengl.impl.egl; import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.ProcAddressTable; +import com.jogamp.gluegen.runtime.ProcAddressTable; import java.nio.*; import java.util.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java index dd801e4e2..b0a5a93d6 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java @@ -37,7 +37,7 @@ package com.sun.opengl.impl.egl; import com.sun.opengl.impl.GLDrawableImpl; import com.sun.nativewindow.impl.NWReflection; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; import javax.media.nativewindow.*; import javax.media.nativewindow.egl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java index e9a622cc5..6b508c716 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java @@ -40,7 +40,7 @@ import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.nativewindow.impl.*; -import com.sun.gluegen.runtime.NativeLibrary; +import com.jogamp.gluegen.runtime.NativeLibrary; public class EGLDrawableFactory extends GLDrawableFactoryImpl { diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java index 00973de89..93c4b665f 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java @@ -40,8 +40,8 @@ import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.nativewindow.impl.*; -import com.sun.gluegen.runtime.NativeLibrary; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.NativeLibrary; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; import java.security.*; /** diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java index 7e60e25c0..4968d0f88 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java @@ -40,7 +40,7 @@ import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.nativewindow.impl.*; -import com.sun.gluegen.runtime.NativeLibrary; +import com.jogamp.gluegen.runtime.NativeLibrary; /** * Implementation of the EGLDynamicLookupHelper for ES1. diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java index cfd0558c9..ce0edef6a 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java @@ -40,7 +40,7 @@ import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.nativewindow.impl.*; -import com.sun.gluegen.runtime.NativeLibrary; +import com.jogamp.gluegen.runtime.NativeLibrary; /** * Implementation of the EGLDynamicLookupHelper for ES2. diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java index 5ab3c3ed5..84e4ab19d 100644 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java @@ -40,7 +40,7 @@ import javax.media.nativewindow.*; import javax.media.nativewindow.egl.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.NativeLibrary; +import com.jogamp.gluegen.runtime.NativeLibrary; public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable { protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration"); diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java index c1a5bd583..957b7b7fe 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java @@ -38,7 +38,7 @@ package com.sun.opengl.impl.egl; import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.ProcAddressTable; +import com.jogamp.gluegen.runtime.ProcAddressTable; import java.nio.*; import java.util.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java index 2a7a7705c..085f9c4b9 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java @@ -38,7 +38,7 @@ package com.sun.opengl.impl.egl; import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.ProcAddressTable; +import com.jogamp.gluegen.runtime.ProcAddressTable; import java.nio.*; import java.util.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java index ef3e9f930..bd2162efc 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java @@ -44,7 +44,7 @@ import java.util.*; import javax.media.opengl.*; import javax.media.nativewindow.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.ProcAddressTable; +import com.jogamp.gluegen.runtime.ProcAddressTable; public abstract class MacOSXCGLContext extends GLContextImpl { diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java index b417668da..14df40ef1 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java @@ -42,7 +42,7 @@ package com.sun.opengl.impl.macosx.cgl; import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; public abstract class MacOSXCGLDrawable extends GLDrawableImpl { // The Java2D/OpenGL pipeline on OS X uses low-level CGLContextObjs diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java index be18ee2da..928bc8151 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java @@ -46,7 +46,7 @@ import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.nativewindow.impl.*; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper { public MacOSXCGLDrawableFactory() { diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java index c94efc92b..6bfa41167 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java @@ -35,11 +35,8 @@ package com.sun.opengl.impl.macosx.cgl; -import java.util.*; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.NativeLibrary; public class MacOSXCGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable { long pixelformat; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java index b433b6b38..abb7ba11e 100755 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java @@ -39,8 +39,6 @@ package com.sun.opengl.impl.windows.wgl; -import java.nio.*; -import java.util.*; import javax.media.opengl.*; import javax.media.nativewindow.*; import com.sun.opengl.impl.*; @@ -53,7 +51,7 @@ public class WindowsExternalWGLContext extends WindowsWGLContext { private WindowsExternalWGLContext(Drawable drawable, long hglrc, WindowsWGLGraphicsConfiguration cfg) { super(drawable, null); - this.hglrc = hglrc; + this.context = hglrc; if (DEBUG) { System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(hglrc) + " for " + this); } diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java index 497e9f03b..eb860a3e3 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java @@ -44,7 +44,7 @@ import java.util.*; import javax.media.opengl.*; import javax.media.nativewindow.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.ProcAddressTable; +import com.jogamp.gluegen.runtime.ProcAddressTable; public class WindowsWGLContext extends GLContextImpl { protected long hglrc; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java index 91604d18e..4bd5e47b2 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java @@ -42,7 +42,7 @@ package com.sun.opengl.impl.windows.wgl; import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; public abstract class WindowsWGLDrawable extends GLDrawableImpl { private static final int MAX_SET_PIXEL_FORMAT_FAIL_COUNT = 5; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java index e37179191..2a222c693 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java @@ -45,7 +45,7 @@ import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.nativewindow.impl.NWReflection; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; import com.sun.nativewindow.impl.NullWindow; public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper { diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java index d6ea21b15..158be9df6 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java @@ -36,7 +36,7 @@ import java.util.*; import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.NativeLibrary; +import com.jogamp.gluegen.runtime.NativeLibrary; public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable { // Keep this under the same debug flag as the drawable factory for convenience diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java index 75a6b221a..101d9fa42 100755 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java @@ -46,7 +46,7 @@ import com.sun.opengl.impl.*; import com.sun.nativewindow.impl.NullWindow; import com.sun.nativewindow.impl.x11.*; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; public class X11ExternalGLXDrawable extends X11GLXDrawable { private int fbConfigID; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java index 330d0a473..e37d27d1a 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java @@ -47,7 +47,7 @@ import javax.media.nativewindow.x11.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.glx.*; import com.sun.nativewindow.impl.x11.*; -import com.sun.gluegen.runtime.ProcAddressTable; +import com.jogamp.gluegen.runtime.ProcAddressTable; public abstract class X11GLXContext extends GLContextImpl { protected long context; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java index c2a1987cc..5440685aa 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java @@ -43,7 +43,7 @@ import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.nativewindow.impl.x11.*; -import com.sun.gluegen.runtime.DynamicLookupHelper; +import com.jogamp.gluegen.runtime.DynamicLookupHelper; public abstract class X11GLXDrawable extends GLDrawableImpl { protected X11GLXDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) { diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java index 09bea723f..eafd68070 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java @@ -42,8 +42,8 @@ import java.util.*; import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; import javax.media.opengl.*; -import com.sun.gluegen.runtime.*; -import com.sun.gluegen.runtime.opengl.*; +import com.jogamp.gluegen.runtime.*; +import com.jogamp.gluegen.runtime.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.glx.*; import com.sun.nativewindow.impl.NullWindow; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java index e1dca3af0..2d2f7ad33 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java @@ -37,8 +37,8 @@ import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.gluegen.runtime.NativeLibrary; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.NativeLibrary; +import com.jogamp.gluegen.runtime.PointerBuffer; import com.sun.nativewindow.impl.x11.*; public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable { diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java index 808f2ab7d..8a151a074 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java @@ -41,7 +41,7 @@ import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.glx.*; -import com.sun.gluegen.runtime.PointerBuffer; +import com.jogamp.gluegen.runtime.PointerBuffer; /** Subclass of GraphicsConfigurationFactory used when non-AWT tookits are used on X11 platforms. Toolkits will likely need to delegate diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java index 6f44f10b7..a702332cd 100755 --- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java +++ b/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java @@ -7,7 +7,7 @@ package com.sun.opengl.util.glsl.fixedfunc.impl; import javax.media.opengl.*; import javax.media.opengl.fixedfunc.*; import javax.media.opengl.glu.*; -import com.sun.gluegen.runtime.BufferFactory; +import com.jogamp.gluegen.runtime.BufferFactory; import com.sun.opengl.util.*; import com.sun.opengl.util.glsl.*; import java.nio.*; diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index 840de4764..3ca1cd317 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -39,7 +39,6 @@ package javax.media.opengl; -import com.sun.opengl.impl.Debug; import java.util.HashMap; /** Abstraction for an OpenGL rendering context. In order to perform @@ -67,6 +66,8 @@ public abstract class GLContext { private HashMap/**/ attachedObjects = new HashMap(); + protected long context; + /** * Returns the GLDrawable to which this context may be used to * draw. -- cgit v1.2.3