diff options
Diffstat (limited to 'src/classes/com/sun')
7 files changed, 25 insertions, 25 deletions
diff --git a/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLContext.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLContext.java index 048a256ea..a1251bd70 100644 --- a/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLContext.java +++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLContext.java @@ -58,7 +58,7 @@ public class MacOSXPbufferGLContext extends MacOSXGLContext { int res = super.makeCurrentImpl(); if (res == CONTEXT_CURRENT_NEW) { // Initialize render-to-texture support if requested - boolean rect = drawable.getCapabilities().getOffscreenRenderToTextureRectangle(); + boolean rect = drawable.getCapabilities().getPbufferRenderToTextureRectangle(); GL gl = getGL(); if (rect) { if (!gl.isExtensionAvailable("GL_EXT_texture_rectangle")) { @@ -87,11 +87,11 @@ public class MacOSXPbufferGLContext extends MacOSXGLContext { protected boolean create() { GLCapabilities capabilities = drawable.getCapabilities(); - if (capabilities.getOffscreenFloatingPointBuffers() && + if (capabilities.getPbufferFloatingPointBuffers() && !isTigerOrLater) { throw new GLException("Floating-point pbuffers supported only on OS X 10.4 or later"); } - if (!super.create(true, capabilities.getOffscreenFloatingPointBuffers())) { + if (!super.create(true, capabilities.getPbufferFloatingPointBuffers())) { return false; } // Must now associate the pbuffer with our newly-created context diff --git a/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLDrawable.java b/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLDrawable.java index 038b1d759..a28d945f7 100644 --- a/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLDrawable.java +++ b/src/classes/com/sun/opengl/impl/macosx/MacOSXPbufferGLDrawable.java @@ -107,7 +107,7 @@ public class MacOSXPbufferGLDrawable extends MacOSXGLDrawable { protected void createPbuffer() { int renderTarget; - if (capabilities.getOffscreenRenderToTextureRectangle()) { + if (capabilities.getPbufferRenderToTextureRectangle()) { width = initWidth; height = initHeight; renderTarget = GL.GL_TEXTURE_RECTANGLE_EXT; @@ -118,7 +118,7 @@ public class MacOSXPbufferGLDrawable extends MacOSXGLDrawable { } int internalFormat = GL.GL_RGBA; - if (capabilities.getOffscreenFloatingPointBuffers()) { + if (capabilities.getPbufferFloatingPointBuffers()) { // FIXME: want to check availability of GL_APPLE_float_pixels // extension, but need valid OpenGL context in order to do so -- // in worst case would need to create dummy window / GLCanvas 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) { diff --git a/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java b/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java index aa26f133e..257fdab6e 100644 --- a/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java +++ b/src/classes/com/sun/opengl/impl/x11/X11GLDrawableFactory.java @@ -392,7 +392,7 @@ public class X11GLDrawableFactory extends GLDrawableFactoryImpl { res[idx++] = caps.getNumSamples(); } if (pbuffer) { - if (caps.getOffscreenFloatingPointBuffers()) { + if (caps.getPbufferFloatingPointBuffers()) { String glXExtensions = GLX.glXQueryExtensionsString(display, screen); if (glXExtensions == null || glXExtensions.indexOf("GLX_NV_float_buffer") < 0) { diff --git a/src/classes/com/sun/opengl/impl/x11/X11PbufferGLDrawable.java b/src/classes/com/sun/opengl/impl/x11/X11PbufferGLDrawable.java index 7ea10055c..76e87ba3b 100644 --- a/src/classes/com/sun/opengl/impl/x11/X11PbufferGLDrawable.java +++ b/src/classes/com/sun/opengl/impl/x11/X11PbufferGLDrawable.java @@ -65,9 +65,9 @@ public class X11PbufferGLDrawable extends X11GLDrawable { 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(X11GLDrawableFactory.getDisplayConnection()); @@ -106,11 +106,11 @@ public class X11PbufferGLDrawable extends X11GLDrawable { throw new GLException("Null display"); } - if (capabilities.getOffscreenRenderToTexture()) { + if (capabilities.getPbufferRenderToTexture()) { throw new GLException("Render-to-texture pbuffers not supported yet on X11"); } - if (capabilities.getOffscreenRenderToTextureRectangle()) { + if (capabilities.getPbufferRenderToTextureRectangle()) { throw new GLException("Render-to-texture-rectangle pbuffers not supported yet on X11"); } |