aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/games/jogl/impl/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/java/games/jogl/impl/windows')
-rw-r--r--src/net/java/games/jogl/impl/windows/WindowsGLContext.java12
-rw-r--r--src/net/java/games/jogl/impl/windows/WindowsPbufferGLContext.java18
2 files changed, 15 insertions, 15 deletions
diff --git a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java b/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
index e838c68aa..e938c8023 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
+++ b/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
@@ -394,11 +394,11 @@ public abstract class WindowsGLContext extends GLContext {
int[] pformats = new int[MAX_PFORMATS];
int[] numFormatsTmp = new int[1];
if (dummyGL.wglChoosePixelFormatARB(hdc,
- iattributes,
- fattributes,
+ iattributes, 0,
+ fattributes, 0,
MAX_PFORMATS,
- pformats,
- numFormatsTmp)) {
+ pformats, 0,
+ numFormatsTmp, 0)) {
numFormats = numFormatsTmp[0];
if (numFormats > 0) {
// Remove one-basing of pixel format (added on later)
@@ -434,7 +434,7 @@ public abstract class WindowsGLContext extends GLContext {
// window, to a pbuffer, or to a pixmap)
niattribs = 0;
iattributes[0] = GL.WGL_NUMBER_PIXEL_FORMATS_ARB;
- if (dummyGL.wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, iattributes, iresults)) {
+ if (dummyGL.wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, iattributes, 0, iresults, 0)) {
numFormats = iresults[0];
// Should we be filtering out the pixel formats which aren't
// applicable, as we are doing here?
@@ -463,7 +463,7 @@ public abstract class WindowsGLContext extends GLContext {
availableCaps = new GLCapabilities[numFormats];
for (int i = 0; i < numFormats; i++) {
- if (!dummyGL.wglGetPixelFormatAttribivARB(hdc, i+1, 0, niattribs, iattributes, iresults)) {
+ if (!dummyGL.wglGetPixelFormatAttribivARB(hdc, i+1, 0, niattribs, iattributes, 0, iresults, 0)) {
throw new GLException("Error getting pixel format attributes for pixel format " + (i + 1) + " of device context");
}
availableCaps[i] = iattributes2GLCapabilities(iattributes, iresults, niattribs, true);
diff --git a/src/net/java/games/jogl/impl/windows/WindowsPbufferGLContext.java b/src/net/java/games/jogl/impl/windows/WindowsPbufferGLContext.java
index 1d5d78296..26108a5cd 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsPbufferGLContext.java
+++ b/src/net/java/games/jogl/impl/windows/WindowsPbufferGLContext.java
@@ -261,11 +261,11 @@ public class WindowsPbufferGLContext extends WindowsGLContext {
int nformats;
int[] nformatsTmp = new int[1];
if (!gl.wglChoosePixelFormatARB(parentHdc,
- iattributes,
- fattributes,
+ iattributes, 0,
+ fattributes, 0,
MAX_PFORMATS,
- pformats,
- nformatsTmp)) {
+ pformats, 0,
+ nformatsTmp, 0)) {
throw new GLException("pbuffer creation error: wglChoosePixelFormatARB() failed");
}
nformats = nformatsTmp[0];
@@ -287,7 +287,7 @@ public class WindowsPbufferGLContext extends WindowsGLContext {
iattributes[8] = GL.WGL_DRAW_TO_PBUFFER_ARB;
int[] ivalues = new int[9];
for (int i = 0; i < nformats; i++) {
- if (!gl.wglGetPixelFormatAttribivARB(parentHdc, pformats[i], 0, 9, iattributes, ivalues)) {
+ if (!gl.wglGetPixelFormatAttribivARB(parentHdc, pformats[i], 0, 9, iattributes, 0, ivalues, 0)) {
throw new GLException("Error while querying pixel format " + pformats[i] +
"'s (index " + i + "'s) capabilities for debugging");
}
@@ -349,7 +349,7 @@ public class WindowsPbufferGLContext extends WindowsGLContext {
iattributes[niattribs++] = 0;
- tmpBuffer = gl.wglCreatePbufferARB(parentHdc, format, initWidth, initHeight, iattributes);
+ tmpBuffer = gl.wglCreatePbufferARB(parentHdc, format, initWidth, initHeight, iattributes, 0);
++whichFormat;
} while ((tmpBuffer == 0) && (whichFormat < nformats));
@@ -372,9 +372,9 @@ public class WindowsPbufferGLContext extends WindowsGLContext {
// Determine the actual width and height we were able to create.
int[] tmp = new int[1];
- gl.wglQueryPbufferARB( buffer, GL.WGL_PBUFFER_WIDTH_ARB, tmp );
+ gl.wglQueryPbufferARB( buffer, GL.WGL_PBUFFER_WIDTH_ARB, tmp, 0 );
width = tmp[0];
- gl.wglQueryPbufferARB( buffer, GL.WGL_PBUFFER_HEIGHT_ARB, tmp );
+ gl.wglQueryPbufferARB( buffer, GL.WGL_PBUFFER_HEIGHT_ARB, tmp, 0 );
height = tmp[0];
if (DEBUG) {
@@ -431,7 +431,7 @@ public class WindowsPbufferGLContext extends WindowsGLContext {
textureTarget = GL.GL_TEXTURE_2D;
}
int[] tmp = new int[1];
- gl.glGenTextures(1, tmp);
+ gl.glGenTextures(1, tmp, 0);
texture = tmp[0];
gl.glBindTexture(textureTarget, texture);
gl.glTexParameteri(textureTarget, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);