diff --git a/src/java/org/lwjgl/opengl/LinuxDisplay.java b/src/java/org/lwjgl/opengl/LinuxDisplay.java index ff52f8fd..1a07e359 100644 --- a/src/java/org/lwjgl/opengl/LinuxDisplay.java +++ b/src/java/org/lwjgl/opengl/LinuxDisplay.java @@ -48,7 +48,6 @@ import org.lwjgl.LWJGLException; import org.lwjgl.input.Keyboard; final class LinuxDisplay implements DisplayImplementation { -// private static final int PBUFFER_HANDLE_SIZE = 24; private static final int NUM_BUTTONS = 3; private static PeerInfo peer_info; @@ -370,40 +369,6 @@ final class LinuxDisplay implements DisplayImplementation { return false; } -/* public void makePbufferCurrent(ByteBuffer handle) throws LWJGLException { - lockAWT(); - try { - nMakePbufferCurrent(handle); - } finally { - unlockAWT(); - } - } - - private static native void nMakePbufferCurrent(ByteBuffer handle) throws LWJGLException; -*/ -/* public ByteBuffer createPbuffer(int width, int height, PixelFormat pixel_format, - IntBuffer pixelFormatCaps, - IntBuffer pBufferAttribs, ByteBuffer shared_pbuffer_handle) throws LWJGLException { - lockAWT(); - try { - ByteBuffer handle = BufferUtils.createByteBuffer(PBUFFER_HANDLE_SIZE); - incDisplay(); - try { - nCreatePbuffer(handle, width, height, pixel_format, pixelFormatCaps, pBufferAttribs, shared_pbuffer_handle); - return handle; - } catch (LWJGLException e) { - decDisplay(); - throw e; - } - } finally { - unlockAWT(); - } - } - - private static native void nCreatePbuffer(ByteBuffer handle, int width, int height, PixelFormat pixel_format, - IntBuffer pixelFormatCaps, - IntBuffer pBufferAttribs, ByteBuffer shared_pbuffer_handle) throws LWJGLException; -*/ public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException { diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java index 339129d2..e3b5e445 100644 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java @@ -201,19 +201,9 @@ final class MacOSXDisplay implements DisplayImplementation { return frame.getCanvas().syncIsDirty(); } -// public native void setView(MacOSXGLCanvas canvas); - -// public native void swapBuffers(); - -// public native void makeCurrent() throws LWJGLException; - public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException { return new MacOSXDisplayPeerInfo(pixel_format); } -// public native void createContext(PixelFormat pixel_format) throws LWJGLException; - -// public native void destroyPeerInfo(); -// public native void destroyContext(); public void update() { if (frame.getCanvas().syncShouldUpdateContext()) { @@ -246,8 +236,6 @@ final class MacOSXDisplay implements DisplayImplementation { private native void updateContext(); -// public native void setVSyncEnabled(boolean sync); - public void reshape(int x, int y, int width, int height) { frame.resize(x, y, width, height); } @@ -423,28 +411,12 @@ final class MacOSXDisplay implements DisplayImplementation { return false; } -// public native void makePbufferCurrent(ByteBuffer handle) throws LWJGLException; - public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException { return new MacOSXPbufferPeerInfo(width, height, pixel_format); } -/* public ByteBuffer createPbuffer(int width, int height, PixelFormat pixel_format, - IntBuffer pixelFormatCaps, - IntBuffer pBufferAttribs, ByteBuffer shared_pbuffer_handle) throws LWJGLException { - ByteBuffer handle = BufferUtils.createByteBuffer(PBUFFER_HANDLE_SIZE); - nCreatePbuffer(handle, width, height, pixel_format, pixelFormatCaps, pBufferAttribs, shared_pbuffer_handle); - return handle; - } - - private native void nCreatePbuffer(ByteBuffer handle, int width, int height, PixelFormat pixel_format, - IntBuffer pixelFormatCaps, - IntBuffer pBufferAttribs, ByteBuffer shared_pbuffer_handle) throws LWJGLException; -*/ -// public native void destroyPbuffer(ByteBuffer handle); - public void setPbufferAttrib(PeerInfo handle, int attrib, int value) { throw new UnsupportedOperationException(); } diff --git a/src/java/org/lwjgl/opengl/Win32Display.java b/src/java/org/lwjgl/opengl/Win32Display.java index 9904d23a..042fc9b2 100644 --- a/src/java/org/lwjgl/opengl/Win32Display.java +++ b/src/java/org/lwjgl/opengl/Win32Display.java @@ -48,8 +48,6 @@ import org.lwjgl.LWJGLException; import org.lwjgl.input.Cursor; final class Win32Display implements DisplayImplementation { -// private static final int PBUFFER_HANDLE_SIZE = 24; - private static Win32DisplayPeerInfo peer_info; public void createWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException { @@ -70,14 +68,10 @@ final class Win32Display implements DisplayImplementation { public native boolean isVisible(); public native boolean isActive(); public native boolean isDirty(); -// public native void swapBuffers(); -// public native void makeCurrent() throws LWJGLException; public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException { peer_info = new Win32DisplayPeerInfo(pixel_format); return peer_info; } -// public native void createContext(PixelFormat pixel_format) throws LWJGLException; -// public native void destroyContext(); public void update() { nUpdate(); if (didMaximize()) { @@ -97,7 +91,6 @@ final class Win32Display implements DisplayImplementation { private native void nUpdate(); private native boolean didMaximize(); -// public native void setVSyncEnabled(boolean sync); public native void reshape(int x, int y, int width, int height); public native DisplayMode[] getAvailableDisplayModes() throws LWJGLException; @@ -136,29 +129,12 @@ final class Win32Display implements DisplayImplementation { return ((Win32PbufferPeerInfo)handle).isBufferLost(); } -// public native boolean isBufferLost(ByteBuffer handle); -// public native void makePbufferCurrent(ByteBuffer handle) throws LWJGLException; - public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format, IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException { return new Win32PbufferPeerInfo(width, height, pixel_format, pixelFormatCaps, pBufferAttribs); } -/* public ByteBuffer createPbuffer(int width, int height, PixelFormat pixel_format, - IntBuffer pixelFormatCaps, - IntBuffer pBufferAttribs, ByteBuffer shared_pbuffer_handle) throws LWJGLException { - ByteBuffer handle = BufferUtils.createByteBuffer(PBUFFER_HANDLE_SIZE); - nCreatePbuffer(handle, width, height, pixel_format, pixelFormatCaps, pBufferAttribs, shared_pbuffer_handle); - return handle; - } - - private native void nCreatePbuffer(ByteBuffer handle, int width, int height, PixelFormat pixel_format, - IntBuffer pixelFormatCaps, - IntBuffer pBufferAttribs, ByteBuffer shared_pbuffer_handle) throws LWJGLException; -*/ -// public native void destroyPbuffer(ByteBuffer handle); - public void setPbufferAttrib(PeerInfo handle, int attrib, int value) { ((Win32PbufferPeerInfo)handle).setPbufferAttrib(attrib, value); } @@ -170,7 +146,4 @@ final class Win32Display implements DisplayImplementation { public void releaseTexImageFromPbuffer(PeerInfo handle, int buffer) { ((Win32PbufferPeerInfo)handle).releaseTexImageFromPbuffer(buffer); } -/* public native void setPbufferAttrib(ByteBuffer handle, int attrib, int value); - public native void bindTexImageToPbuffer(ByteBuffer handle, int buffer); - public native void releaseTexImageFromPbuffer(ByteBuffer handle, int buffer);*/ }