aboutsummaryrefslogtreecommitdiffstats
path: root/src/classes
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2008-11-13 20:42:19 +0000
committerSven Gothel <[email protected]>2008-11-13 20:42:19 +0000
commit0ecb8836363584542c5bfdd27bae5e1ecde7bd0f (patch)
tree353fb3d71d4f574350c04be1d5c075722bcd940e /src/classes
parent09de544d4e578432978a96d9308dcfd2cb03c4c2 (diff)
Rollback: EGLConfig back to wrapped buffer, since long nio buffers are not available on CVM
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1786 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes')
-rwxr-xr-xsrc/classes/com/sun/opengl/impl/egl/EGLContext.java4
-rwxr-xr-xsrc/classes/com/sun/opengl/impl/egl/EGLDrawable.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/classes/com/sun/opengl/impl/egl/EGLContext.java b/src/classes/com/sun/opengl/impl/egl/EGLContext.java
index bb36082f5..b211a8fe2 100755
--- a/src/classes/com/sun/opengl/impl/egl/EGLContext.java
+++ b/src/classes/com/sun/opengl/impl/egl/EGLContext.java
@@ -181,13 +181,13 @@ public class EGLContext extends GLContextImpl {
protected void create() throws GLException {
long display = drawable.getDisplay();
- long config = drawable.getConfig();
+ _EGLConfig config = drawable.getConfig();
long shareWith = 0;
if (display == 0) {
throw new GLException("Error: attempted to create an OpenGL context without a display connection");
}
- if (config == 0) {
+ if (config == null) {
throw new GLException("Error: attempted to create an OpenGL context without a graphics configuration");
}
EGLContext other = (EGLContext) GLContextShareSet.getShareContext(this);
diff --git a/src/classes/com/sun/opengl/impl/egl/EGLDrawable.java b/src/classes/com/sun/opengl/impl/egl/EGLDrawable.java
index edf793c29..60aed64be 100755
--- a/src/classes/com/sun/opengl/impl/egl/EGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/egl/EGLDrawable.java
@@ -42,7 +42,7 @@ import javax.media.opengl.*;
public class EGLDrawable extends GLDrawableImpl {
private GLCapabilitiesChooser chooser;
private long display;
- private long config;
+ private _EGLConfig config;
private long surface;
private int[] tmp = new int[1];
@@ -63,11 +63,11 @@ public class EGLDrawable extends GLDrawableImpl {
throw new GLException("eglInitialize failed");
}
int[] attrs = factory.glCapabilities2AttribList(capabilities);
- long[] configs = new long[1];
+ _EGLConfig[] configs = new _EGLConfig[1];
int[] numConfigs = new int[1];
if (!EGL.eglChooseConfig(display,
attrs, 0,
- configs, 0, 1,
+ configs, 1,
numConfigs, 0)) {
throw new GLException("Graphics configuration selection (eglChooseConfig) failed");
}
@@ -90,7 +90,7 @@ public class EGLDrawable extends GLDrawableImpl {
super.destroy();
}
- public long getConfig() {
+ public _EGLConfig getConfig() {
return config;
}