diff options
author | Kenneth Russel <[email protected]> | 2006-02-16 03:29:11 +0000 |
---|---|---|
committer | Kenneth Russel <[email protected]> | 2006-02-16 03:29:11 +0000 |
commit | dd18228ea67b24821570fd1c2f7053d7915b9cd0 (patch) | |
tree | 2f5e14866c899156cddaa29c08557819da2c7b13 /src/classes/com/sun/opengl/impl/windows | |
parent | 6014c01879f4cc043a772c5dcba79707e24bb59a (diff) |
Renamed "offscreen" capability bits in GLCapabilities to "pbuffer"
capability bits to be more explicit about how they are to be used; no
objections from JSR-231 expert group
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@616 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes/com/sun/opengl/impl/windows')
3 files changed, 14 insertions, 14 deletions
diff --git a/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java index b33c349ae..8b8df0926 100644 --- a/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java +++ b/src/classes/com/sun/opengl/impl/windows/WindowsGLDrawable.java @@ -426,9 +426,9 @@ public abstract class WindowsGLDrawable extends GLDrawableImpl { } } - boolean rtt = capabilities.getOffscreenRenderToTexture(); - boolean rect = capabilities.getOffscreenRenderToTextureRectangle(); - boolean useFloat = capabilities.getOffscreenFloatingPointBuffers(); + boolean rtt = capabilities.getPbufferRenderToTexture(); + boolean rect = capabilities.getPbufferRenderToTextureRectangle(); + boolean useFloat = capabilities.getPbufferFloatingPointBuffers(); boolean ati = false; if (pbuffer) { // Check some invariants and set up some state diff --git a/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLContext.java b/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLContext.java index edfc70e5f..390c14054 100644 --- a/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLContext.java +++ b/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLContext.java @@ -107,8 +107,8 @@ public class WindowsPbufferGLContext extends WindowsGLContext { GLCapabilities capabilities = drawable.getCapabilities(); // Initialize render-to-texture support if requested - rtt = capabilities.getOffscreenRenderToTexture(); - rect = capabilities.getOffscreenRenderToTextureRectangle(); + rtt = capabilities.getPbufferRenderToTexture(); + rect = capabilities.getPbufferRenderToTextureRectangle(); GL gl = getGL(); if (rtt) { diff --git a/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLDrawable.java index 1543f420d..0dddddddd 100644 --- a/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLDrawable.java +++ b/src/classes/com/sun/opengl/impl/windows/WindowsPbufferGLDrawable.java @@ -69,9 +69,9 @@ public class WindowsPbufferGLDrawable extends WindowsGLDrawable { if (DEBUG) { System.out.println("Pbuffer caps on init: " + capabilities + - (capabilities.getOffscreenRenderToTexture() ? " [rtt]" : "") + - (capabilities.getOffscreenRenderToTextureRectangle() ? " [rect]" : "") + - (capabilities.getOffscreenFloatingPointBuffers() ? " [float]" : "")); + (capabilities.getPbufferRenderToTexture() ? " [rtt]" : "") + + (capabilities.getPbufferRenderToTextureRectangle() ? " [rect]" : "") + + (capabilities.getPbufferFloatingPointBuffers() ? " [float]" : "")); } createPbuffer(dummyDrawable.getHDC(), wglExt); @@ -150,9 +150,9 @@ public class WindowsPbufferGLDrawable extends WindowsGLDrawable { if (DEBUG) { System.out.println("Pbuffer parentHdc = " + toHexString(parentHdc)); System.out.println("Pbuffer caps: " + capabilities + - (capabilities.getOffscreenRenderToTexture() ? " [rtt]" : "") + - (capabilities.getOffscreenRenderToTextureRectangle() ? " [rect]" : "") + - (capabilities.getOffscreenFloatingPointBuffers() ? " [float]" : "")); + (capabilities.getPbufferRenderToTexture() ? " [rtt]" : "") + + (capabilities.getPbufferRenderToTextureRectangle() ? " [rect]" : "") + + (capabilities.getPbufferFloatingPointBuffers() ? " [float]" : "")); } if (!glCapabilities2iattributes(capabilities, @@ -164,9 +164,9 @@ public class WindowsPbufferGLDrawable extends WindowsGLDrawable { } floatMode = floatModeTmp[0]; - boolean rtt = capabilities.getOffscreenRenderToTexture(); - boolean rect = capabilities.getOffscreenRenderToTextureRectangle(); - boolean useFloat = capabilities.getOffscreenFloatingPointBuffers(); + boolean rtt = capabilities.getPbufferRenderToTexture(); + boolean rect = capabilities.getPbufferRenderToTextureRectangle(); + boolean useFloat = capabilities.getPbufferFloatingPointBuffers(); boolean ati = false; if (useFloat) { |