diff options
| author | Travis Bryson <travis_bryson@dev.java.net> | 2005-06-24 20:28:37 +0000 |
|---|---|---|
| committer | Travis Bryson <travis_bryson@dev.java.net> | 2005-06-24 20:28:37 +0000 |
| commit | 0969a98f2007d76e38f8819eedfead5b840f6364 (patch) | |
| tree | 82aff6a7fb922f45fc7853e5c5442af0d978768f /src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java | |
| parent | ed85f53f73d69a44c6b98b3824354be3fbb7bf58 (diff) | |
This putback adds array offsets to the public JOGL API. The offsets are
respected and used properly in all of the public and private functions. The
changes are in gluegen, so that the code is generated properly. And also
throughout the parts of the jogl code that are not gluegen-generated.
For the internally generated implementation methods, a "1" is added to
the method names. So as to not overload the public API. This is similar
to what is already done with Buffer APIs, which have a "0" added
internally. I used a "1" instead of a "0" to avoid any collisions of the
signatures, which could happen if a null object was sent down for the
Array (e.g., the wrong method would get called).
This should be a suitable foundation for the implementation to add the
ability to wrap arrays in Buffers, which we plan to add to the implementation
soon.
These changes will cause all existing JOGL programs to break, although
adapting them is pretty easy. We will later be putting back changed examples
and utilities that incorporate these new APIs.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@313 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java')
| -rw-r--r-- | src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java b/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java index 5b6df1843..5e59329ca 100644 --- a/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java +++ b/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java @@ -174,7 +174,7 @@ public class X11PbufferGLContext extends X11GLContext { int screen = 0; // FIXME: provide way to specify this? int[] nelementsTmp = new int[1]; - GLXFBConfig[] fbConfigs = GLX.glXChooseFBConfig(display, screen, iattributes, nelementsTmp); + GLXFBConfig[] fbConfigs = GLX.glXChooseFBConfig(display, screen, iattributes, 0, nelementsTmp, 0); if (fbConfigs == null || fbConfigs.length == 0 || fbConfigs[0] == null) { throw new GLException("pbuffer creation error: glXChooseFBConfig() failed"); } @@ -209,7 +209,7 @@ public class X11PbufferGLContext extends X11GLContext { iattributes[niattribs++] = 0; - long tmpBuffer = GLX.glXCreatePbuffer(display, fbConfig, iattributes); + long tmpBuffer = GLX.glXCreatePbuffer(display, fbConfig, iattributes, 0); if (tmpBuffer == 0) { // FIXME: query X error code for detail error message throw new GLException("pbuffer creation error: glXCreatePbuffer() failed"); @@ -224,9 +224,9 @@ public class X11PbufferGLContext extends X11GLContext { // Determine the actual width and height we were able to create. int[] tmp = new int[1]; - GLX.glXQueryDrawable(display, (int) buffer, GL.GLX_WIDTH, tmp); + GLX.glXQueryDrawable(display, (int) buffer, GL.GLX_WIDTH, tmp, 0); width = tmp[0]; - GLX.glXQueryDrawable(display, (int) buffer, GL.GLX_HEIGHT, tmp); + GLX.glXQueryDrawable(display, (int) buffer, GL.GLX_HEIGHT, tmp, 0); height = tmp[0]; if (DEBUG) { @@ -334,7 +334,7 @@ public class X11PbufferGLContext extends X11GLContext { private int queryFBConfig(long display, GLXFBConfig fbConfig, int attrib) { int[] tmp = new int[1]; - if (GLX.glXGetFBConfigAttrib(display, fbConfig, attrib, tmp) != 0) { + if (GLX.glXGetFBConfigAttrib(display, fbConfig, attrib, tmp, 0) != 0) { throw new GLException("glXGetFBConfigAttrib failed"); } return tmp[0]; |