diff --git a/src/java/org/lwjgl/BufferChecks.java b/src/java/org/lwjgl/BufferChecks.java index 18daf52c..0f966a73 100644 --- a/src/java/org/lwjgl/BufferChecks.java +++ b/src/java/org/lwjgl/BufferChecks.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -43,7 +43,7 @@ import java.nio.DoubleBuffer; * check buffer boundaries in general. If there is unsufficient space * in the buffer when the call is made then a buffer overflow would otherwise * occur and cause unexpected behaviour, a crash, or worse, a security risk. - * + * * @author cix_foo * @author elias_naur * @version $Revision$ @@ -66,7 +66,7 @@ public class BufferChecks { checkDirect(buf); } } - + public static void checkDirectOrNull(FloatBuffer buf) { if (buf != null) { checkDirect(buf); @@ -78,19 +78,19 @@ public class BufferChecks { checkDirect(buf); } } - + public static void checkDirectOrNull(IntBuffer buf) { if (buf != null) { checkDirect(buf); } } - + public static void checkDirectOrNull(DoubleBuffer buf) { if (buf != null) { checkDirect(buf); } } - + /** * Helper methods to ensure a buffer is direct (and, implicitly, non-null). */ @@ -108,13 +108,13 @@ public class BufferChecks { else throw new IllegalStateException("Unsupported buffer type"); } - + public static void checkDirect(ByteBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("ByteBuffer is not direct"); } } - + public static void checkDirect(FloatBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("FloatBuffer is not direct"); @@ -126,28 +126,28 @@ public class BufferChecks { throw new IllegalArgumentException("ShortBuffer is not direct"); } } - + public static void checkDirect(IntBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("IntBuffer is not direct"); } } - + public static void checkDirect(DoubleBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("IntBuffer is not direct"); } } - + /** * Helper method to ensure a buffer is big enough to receive data from a * glGet* operation. - * + * * @param buf * The buffer to check * @param size * The minimum buffer size - * @throws BufferOverflowException + * @throws IllegalArgumentException */ private static void checkBufferSize(Buffer buf, int size) { if (buf.remaining() < size) { @@ -185,10 +185,10 @@ public class BufferChecks { * glGet* operation. To avoid unnecessarily complex buffer size checking * we've just set the bar artificially high and insist that any receiving * buffer has at least 4 remaining(). - * + * * @param buf * The buffer to check - * @throws BufferOverflowException + * @throws IllegalArgumentException */ public static void checkBuffer(ByteBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); @@ -197,15 +197,15 @@ public class BufferChecks { public static void checkBuffer(ShortBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } - + public static void checkBuffer(FloatBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } - + public static void checkBuffer(IntBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } - + public static void checkBuffer(DoubleBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } diff --git a/src/java/org/lwjgl/PlatformAdapter.java b/src/java/org/lwjgl/PlatformAdapter.java index c086854d..d14ff275 100644 --- a/src/java/org/lwjgl/PlatformAdapter.java +++ b/src/java/org/lwjgl/PlatformAdapter.java @@ -48,13 +48,13 @@ public interface PlatformAdapter { * @param title * @param message */ - public void alert(String title, String message); - + void alert(String title, String message); + /** * Get the contents of the system clipboard. The system might not have a clipboard * (particularly if it doesn't even have a keyboard) in which case we return null. * Otherwise we return a String, which may be the empty string "". * @return a String, or null if there is no system clipboard. - */ - public String getClipboard(); + */ + String getClipboard(); } diff --git a/src/java/org/lwjgl/Sys.java b/src/java/org/lwjgl/Sys.java index 72000dc4..98c7557d 100644 --- a/src/java/org/lwjgl/Sys.java +++ b/src/java/org/lwjgl/Sys.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -43,11 +43,12 @@ import org.lwjgl.opengl.Display; * $Id$ * * System class (named Sys so as not to conflict with java.lang.System) - * + * * @author cix_foo * @version $Revision$ */ public final class Sys { + public static final String VERSION = "0.93"; /** Low process priority. @see #setProcessPriority() */ @@ -58,7 +59,7 @@ public final class Sys { * JVM has when it is started up normally. Note that if the JVM is started * inside a process which is already a different priority then this will not * be the initial priority. - * + * * @see #setProcessPriority(int) */ public static final int NORMAL_PRIORITY = 0; @@ -72,9 +73,9 @@ public final class Sys { * that this puts it at a higher priority than many OS critical tasks, such * as disk writes or mouse input and the like. Hence it is quite possible to * completely freeze your machine if you have an errant thread. - * + * * This priority is not recommended for gaming applications. - * + * * @see #setProcessPriority(int) */ public static final int REALTIME_PRIORITY = 2; @@ -84,13 +85,13 @@ public final class Sys { /** The platform adapter class name */ private static String PLATFORM; - + /** * Debug flag. */ public static final boolean DEBUG = Boolean.getBoolean("org.lwjgl.Sys.debug"); - private static boolean initialized = false; + private static boolean initialized; static { initialize(); @@ -129,7 +130,7 @@ public final class Sys { System.loadLibrary(LIBRARY_NAME); String native_version = getNativeLibraryVersion(); if (!native_version.equals(VERSION)) - throw new LinkageError("Version mismatch: jar version is '" + VERSION + + throw new LinkageError("Version mismatch: jar version is '" + VERSION + "', native libary version is '" + native_version + "'"); setDebug(DEBUG); @@ -153,11 +154,11 @@ public final class Sys { * @return timer resolution in ticks per second or 0 if no timer is present. */ public static native long getTimerResolution(); - + /** * Gets the current value of the hires timer, in ticks. When the Sys class is first loaded * the hires timer is reset to 0. If no hires timer is present then this method will always - * return 0.

NOTEZ BIEN that the hires timer WILL wrap around. + * return 0.

NOTEZ BIEN that the hires timer WILL wrap around. * * @return the current hires time, in ticks (always >= 0) */ @@ -165,28 +166,28 @@ public final class Sys { return ngetTime() & 0x7FFFFFFFFFFFFFFFL; } private static native long ngetTime(); - + /** * Set the process priority in a system independent way. Because of the various * differences in operating systems this might or might not have any effect or * the correct effect. - * + * * The default process priority is NORMAL_PRIORITY. - * + * * REALTIME_PRIORITY processes should theoretically be the maximum priority of * any process on the system and may have side effects on I/O and other fundamental * operating system functions - use with caution. - * + * * It is unlikely that any games will want to change the priority of the Java * process; but there are some other applications for this library which require * process priority adjustments, such as in soft-realtime graphics rendering * for broadcast television. - * + * * @param priority a priority class, which will be one of REALTIME_PRIORITY, * HIGH_PRIORITY, NORMAL_PRIORITY, or LOW_PRIORITY. */ public static native void setProcessPriority(int priority); - + /** * Attempt to display a modal alert to the user. This method should be used * when a game fails to initialize properly or crashes out losing its display @@ -227,7 +228,7 @@ public final class Sys { } private static native void nAlert(String title, String message); - + /** * Open the system web browser and point it at the specified URL. It is recommended * that this not be called whilst your game is running, but on application exit in @@ -267,7 +268,7 @@ public final class Sys { * clipboard (particularly if it doesn't even have a keyboard) in which case * we return null. Otherwise we return a String, which may be the empty * string "". - * + * * @return a String, or null if there is no system clipboard. */ public static String getClipboard() { @@ -280,6 +281,6 @@ public final class Sys { return nGetClipboard(); } } - + private static native String nGetClipboard(); -} +} diff --git a/src/java/org/lwjgl/input/Keyboard.java b/src/java/org/lwjgl/input/Keyboard.java index 356db5f9..c071652b 100644 --- a/src/java/org/lwjgl/input/Keyboard.java +++ b/src/java/org/lwjgl/input/Keyboard.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -50,21 +50,21 @@ import org.lwjgl.LWJGLException; * keys, or read all the keyboard presses / releases since the last read. * Buffering must be explicitly enabled; the size of the buffer is determined * by the native implementation at its discretion. - * + * * @author cix_foo * @author elias_naur * @author Brian Matzon * @version $Revision$ */ public class Keyboard { - /** + /** * The special character meaning that no * character was translated for the event. */ public static final char CHAR_NONE = '\0'; - /** - * The special keycode meaning that only the + /** + * The special keycode meaning that only the * translated character is valid. */ public static final int KEY_NONE = 0x00; @@ -197,17 +197,18 @@ public class Keyboard { public static final int STATE_OFF = 1; public static final int STATE_UNKNOWN = 2; - public final static int KEYBOARD_SIZE = 256; + public static final int KEYBOARD_SIZE = 256; /** Buffer size in events */ - private final static int BUFFER_SIZE = 50; + private static final int BUFFER_SIZE = 50; /** Event size in elements */ - private final static int EVENT_SIZE = 3; + private static final int EVENT_SIZE = 3; /** Key names */ private static final String[] keyName = new String[255]; private static final Map keyMap = new HashMap(253); - private static int counter = 0; + private static int counter; + static { // Use reflection to find out key names Field[] field = Keyboard.class.getFields(); @@ -218,7 +219,7 @@ public class Keyboard { && Modifier.isFinal(field[i].getModifiers()) && field[i].getType().equals(int.class) && field[i].getName().startsWith("KEY_")) { - + int key = field[i].getInt(null); String name = field[i].getName().substring(4); keyName[key] = name; @@ -229,18 +230,18 @@ public class Keyboard { } } catch (Exception e) { } - + } - + /** The number of keys supported */ private static final int keyCount = counter; /** Has the keyboard been created? */ private static boolean created; - + /** The keys status from the last poll */ private static final ByteBuffer keyDownBuffer = BufferUtils.createByteBuffer(KEYBOARD_SIZE); - + /** * The key events from the last read: a sequence of pairs of key number, * followed by state. If translation is enabled, the state is followed by @@ -253,22 +254,22 @@ public class Keyboard { /** The current keyboard character being examined */ private static char eventCharacter; - + /** The current keyboard event key being examined */ private static int eventKey; - + /** The current state of the key being examined in the event queue */ private static boolean eventState; - + /** One time initialization */ private static boolean initialized; - + /** * Keyboard cannot be constructed. */ private Keyboard() { } - + /** * Static initialization */ @@ -278,11 +279,11 @@ public class Keyboard { Sys.initialize(); initialized = true; } - + /** * "Create" the keyboard. The display must first have been created. The * reason for this is so the keyboard has a window to "focus" in. - * + * * @throws LWJGLException if the keyboard could not be created for any reason */ public static void create() throws LWJGLException { @@ -295,7 +296,7 @@ public class Keyboard { Display.getImplementation().createKeyboard(); created = true; } - + /** * @return true if the keyboard has been created */ @@ -312,23 +313,23 @@ public class Keyboard { created = false; Display.getImplementation().destroyKeyboard(); } - + /** * Polls the keyboard for its current state. Access the polled values using the * isKeyDown method. * By using this method, it is possible to "miss" keyboard keys if you don't - * poll fast enough. To receive all events, enable buffering by calling + * poll fast enough. To receive all events, enable buffering by calling * enableBuffer. - * + * * This method also reads all keyboard events since last read if keyboard buffering is enabled. * To use these values, you have to call next for each event you - * want to read. You can query which key caused the event by using + * want to read. You can query which key caused the event by using * getEventKey. To get the state of that key, for that event, use * getEventKeyState - finally use getEventCharacter to get the * character for that event. * - * @see org.lwjgl.input.Keyboard#isKeyDown(int key) - * @see org.lwjgl.input.Keyboard#isStateKeySet(int key) + * @see org.lwjgl.input.Keyboard#isKeyDown(int key) + * @see org.lwjgl.input.Keyboard#isStateKeySet(int key) * @see org.lwjgl.input.Keyboard#next() * @see org.lwjgl.input.Keyboard#enableBuffer() * @see org.lwjgl.input.Keyboard#getEventKey() @@ -342,14 +343,14 @@ public class Keyboard { if (readBuffer != null) read(); } - + private static void read() { readBuffer.compact(); int numEvents = Display.getImplementation().readKeyboard(readBuffer, readBuffer.position()); readBuffer.position(readBuffer.position() + numEvents*EVENT_SIZE); readBuffer.flip(); } - + /** * Enable keyboard translation. Must be called after the keyboard is created, * and keyboard buffering must be enabled. @@ -362,7 +363,7 @@ public class Keyboard { Display.getImplementation().enableTranslation(); translationEnabled = true; } - + /** * Enable keyboard buffering. Must be called after the keyboard is created. */ @@ -373,7 +374,7 @@ public class Keyboard { readBuffer.limit(0); Display.getImplementation().enableKeyboardBuffer(); } - + /** * Checks to see if a key is down. * @param key Keycode to check @@ -384,14 +385,14 @@ public class Keyboard { throw new IllegalStateException("Keyboard must be created before you can query key state"); return keyDownBuffer.get(key) != 0; } - + /** * @return true if buffering is enabled */ public static boolean isBuffered() { return readBuffer != null; } - + /** * @return true if translation is enabled */ @@ -401,7 +402,7 @@ public class Keyboard { /** * Checks whether one of the state keys are "active" - * + * * @param key State key to test (KEY_CAPITAL | KEY_NUMLOCK | KEY_SYSRQ) * @return STATE_ON if on, STATE_OFF if off and STATE_UNKNOWN if the state is unknown */ @@ -419,7 +420,7 @@ public class Keyboard { public static String getKeyName(int key) { return keyName[key]; } - + /** * Get's a key's index. If the key is unrecognised then KEY_NONE is returned. * @param keyName The key name @@ -431,7 +432,7 @@ public class Keyboard { else return ret.intValue(); } - + /** * Gets the number of keyboard events waiting after doing a buffer enabled poll(). * @return the number of keyboard events @@ -441,13 +442,13 @@ public class Keyboard { throw new IllegalStateException("Keyboard must be created before you can read events"); return readBuffer.remaining()/EVENT_SIZE; } - + /** - * Gets the next keyboard event. You can query which key caused the event by using + * Gets the next keyboard event. You can query which key caused the event by using * getEventKey. To get the state of that key, for that event, use * getEventKeyState - finally use getEventCharacter to get the * character for that event. - * + * * @see org.lwjgl.input.Keyboard#getEventKey() * @see org.lwjgl.input.Keyboard#getEventKeyState() * @see org.lwjgl.input.Keyboard#getEventCharacter() @@ -458,7 +459,7 @@ public class Keyboard { throw new IllegalStateException("Keyboard must be created before you can read events"); if (readBuffer == null) throw new IllegalStateException("Event buffering must be enabled before you can read events"); - + if (readBuffer.hasRemaining()) { eventKey = readBuffer.get() & 0xFF; eventState = readBuffer.get() != 0; @@ -494,7 +495,7 @@ public class Keyboard { /** * Gets the state of the tkey that generated the * current event - * + * * @return True if key was down, or false if released */ public static boolean getEventKeyState() { diff --git a/src/java/org/lwjgl/input/Mouse.java b/src/java/org/lwjgl/input/Mouse.java index b292350e..53499f18 100644 --- a/src/java/org/lwjgl/input/Mouse.java +++ b/src/java/org/lwjgl/input/Mouse.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -46,12 +46,12 @@ import org.lwjgl.opengl.Display; *
* A raw Mouse interface. This can be used to poll the current state of the * mouse buttons, and determine the mouse movement delta since the last poll. - * + * * n buttons supported, n being a native limit. A scrolly wheel is also * supported, if one such is available. Movement is reported as delta from * last position or as an absolute position. If the window has been created * the absolute position will be clamped to 0 - Display (width | height) - * + * * @author cix_foo * @author elias_naur * @author Brian Matzon @@ -60,17 +60,17 @@ import org.lwjgl.opengl.Display; public class Mouse { /** 1 bit transparency for native cursor */ - public final static int CURSOR_ONE_BIT_TRANSPARENCY = 1; + public static final int CURSOR_ONE_BIT_TRANSPARENCY = 1; /** 8 bit alhpa native cursor */ - public final static int CURSOR_8_BIT_ALPHA = 2; + public static final int CURSOR_8_BIT_ALPHA = 2; /** animation native cursor */ - public final static int CURSOR_ANIMATION = 4; + public static final int CURSOR_ANIMATION = 4; /** Mouse constraint */ private static int width, height; - + /** Has the mouse been created? */ private static boolean created; @@ -99,7 +99,7 @@ public class Mouse { private static int buttonCount = -1; /** Does this mouse support a scroll wheel */ - private static boolean hasWheel = false; + private static boolean hasWheel; /** The current native cursor, if any */ private static Cursor currentCursor; @@ -114,14 +114,14 @@ public class Mouse { private static boolean initialized; /** The mouse button events from the last read */ - private static IntBuffer readBuffer = null; + private static IntBuffer readBuffer; /** The current mouse event button being examined */ private static int eventButton; /** The current state of the button being examined in the event queue */ private static boolean eventState; - + /** The current delta of the mouse in the event queue */ private static int event_dx; private static int event_dy; @@ -131,9 +131,9 @@ public class Mouse { private static int event_y; /** Buffer size in events */ - private final static int BUFFER_SIZE = 50; + private static final int BUFFER_SIZE = 50; /** Event size in elements */ - private final static int EVENT_SIZE = 5; + private static final int EVENT_SIZE = 5; private static boolean isGrabbed; @@ -157,7 +157,7 @@ public class Mouse { * The CURSOR_ONE_BIT_TRANSPARANCY indicates support for cursors with one bit transparancy, * the CURSOR_8_BIT_ALPHA indicates support for 8 bit alpha and CURSOR_ANIMATION indicates * support for cursor animations. - * + * * @return A bit mask with native cursor capabilities. */ public static int getNativeCursorCaps() { @@ -242,12 +242,12 @@ public class Mouse { if (readBuffer != null) readBuffer.clear(); } - + /** * "Create" the mouse. The display must first have been created. * Initially, the mouse is not grabbed and the delta values are reported * with respect to the center of the display. - * + * * @throws LWJGLException if the mouse could not be created for any reason */ public static void create() throws LWJGLException { @@ -299,24 +299,24 @@ public class Mouse { * Polls the mouse for its current state. Access the polled values using the * get methods. * By using this method, it is possible to "miss" mouse click events if you don't - * poll fast enough. To receive all button events, enable buffering by calling + * poll fast enough. To receive all button events, enable buffering by calling * enableBuffer. - * + * * If buffering is enabled, this method also reads all button events since last read. * To use these values, you have to call next for each event you - * want to read. You can query which button caused the event by using + * want to read. You can query which button caused the event by using * getEventButton. To get the state of that button, for that event, use * getEventButtonState. - * + * * @see org.lwjgl.input.Mouse#next() * @see org.lwjgl.input.Mouse#getEventButton() * @see org.lwjgl.input.Mouse#getEventButtonState() - * @see org.lwjgl.input.Mouse#isButtonDown(int button) - * @see org.lwjgl.input.Mouse#getX() - * @see org.lwjgl.input.Mouse#getY() - * @see org.lwjgl.input.Mouse#getDX() - * @see org.lwjgl.input.Mouse#getDY() - * @see org.lwjgl.input.Mouse#getDWheel() + * @see org.lwjgl.input.Mouse#isButtonDown(int button) + * @see org.lwjgl.input.Mouse#getX() + * @see org.lwjgl.input.Mouse#getY() + * @see org.lwjgl.input.Mouse#getDX() + * @see org.lwjgl.input.Mouse#getDY() + * @see org.lwjgl.input.Mouse#getDWheel() * @see org.lwjgl.input.Mouse#enableBuffer() */ public static void poll() { @@ -354,7 +354,7 @@ public class Mouse { /** * See if a particular mouse button is down. - * + * * @param button The index of the button you wish to test (0..getButtonCount-1) * @return true if the specified button is down */ @@ -401,7 +401,7 @@ public class Mouse { } /** - * Gets the next mouse event. You can query which button caused the event by using + * Gets the next mouse event. You can query which button caused the event by using * getEventButton() (if any). To get the state of that key, for that event, use * getEventButtonState. To get the current mouse delta values use getEventDX(), * getEventDY() and getEventDZ(). @@ -494,7 +494,7 @@ public class Mouse { /** * Retrieves the absolute position. If the Display has been created * x will be clamped to 0...width-1. - * + * * @return Absolute x axis position of mouse */ public static int getX() { @@ -548,7 +548,7 @@ public class Mouse { public static int getButtonCount() { return buttonCount; } - + /** * @return Whether or not this mouse has wheel support */ @@ -564,7 +564,7 @@ public class Mouse { } /** - * Sets whether or not the mouse has grabbed the cursor + * Sets whether or not the mouse has grabbed the cursor * (and thus hidden). If grab is false, the getX() and getY() * will return delta movement in pixels clamped to the display * dimensions, from the center of the display. @@ -581,7 +581,7 @@ public class Mouse { /** * Updates the cursor, so that animation can be changed if needed. - * This method is called automatically by the window on its update, and + * This method is called automatically by the window on its update, and * shouldn't be called otherwise */ public static void updateCursor() { diff --git a/src/java/org/lwjgl/opengl/ARBBufferObject.java b/src/java/org/lwjgl/opengl/ARBBufferObject.java index f649b500..f7501de3 100644 --- a/src/java/org/lwjgl/opengl/ARBBufferObject.java +++ b/src/java/org/lwjgl/opengl/ARBBufferObject.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,142 +41,163 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public abstract class ARBBufferObject { + /* * Accepted by the parameter of BufferDataARB: */ - public static final int GL_STREAM_DRAW_ARB = 0x88E0; - public static final int GL_STREAM_READ_ARB = 0x88E1; - public static final int GL_STREAM_COPY_ARB = 0x88E2; - public static final int GL_STATIC_DRAW_ARB = 0x88E4; - public static final int GL_STATIC_READ_ARB = 0x88E5; - public static final int GL_STATIC_COPY_ARB = 0x88E6; - public static final int GL_DYNAMIC_DRAW_ARB = 0x88E8; - public static final int GL_DYNAMIC_READ_ARB = 0x88E9; - public static final int GL_DYNAMIC_COPY_ARB = 0x88EA; + public static final int GL_STREAM_DRAW_ARB = 0x88E0; + public static final int GL_STREAM_READ_ARB = 0x88E1; + public static final int GL_STREAM_COPY_ARB = 0x88E2; + public static final int GL_STATIC_DRAW_ARB = 0x88E4; + public static final int GL_STATIC_READ_ARB = 0x88E5; + public static final int GL_STATIC_COPY_ARB = 0x88E6; + public static final int GL_DYNAMIC_DRAW_ARB = 0x88E8; + public static final int GL_DYNAMIC_READ_ARB = 0x88E9; + public static final int GL_DYNAMIC_COPY_ARB = 0x88EA; /* * Accepted by the parameter of MapBufferARB: */ - public static final int GL_READ_ONLY_ARB = 0x88B8; - public static final int GL_WRITE_ONLY_ARB = 0x88B9; - public static final int GL_READ_WRITE_ARB = 0x88BA; + public static final int GL_READ_ONLY_ARB = 0x88B8; + public static final int GL_WRITE_ONLY_ARB = 0x88B9; + public static final int GL_READ_WRITE_ARB = 0x88BA; /* * Accepted by the parameter of GetBufferParameterivARB: */ - public static final int GL_BUFFER_SIZE_ARB = 0x8764; - public static final int GL_BUFFER_USAGE_ARB = 0x8765; - public static final int GL_BUFFER_ACCESS_ARB = 0x88BB; - public static final int GL_BUFFER_MAPPED_ARB = 0x88BC; - public static final int GL_BUFFER_MAP_POINTER_ARB = 0x88BD; + public static final int GL_BUFFER_SIZE_ARB = 0x8764; + public static final int GL_BUFFER_USAGE_ARB = 0x8765; + public static final int GL_BUFFER_ACCESS_ARB = 0x88BB; + public static final int GL_BUFFER_MAPPED_ARB = 0x88BC; + public static final int GL_BUFFER_MAP_POINTER_ARB = 0x88BD; static native void initNativeStubs() throws LWJGLException; public static void glBindBufferARB(int target, int buffer) { - switch (target) { + switch ( target ) { case ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_ARB: VBOTracker.getVBOElementStack().setState(buffer); break; case ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB: VBOTracker.getVBOArrayStack().setState(buffer); break; - default: throw new IllegalArgumentException("Unsupported VBO target " + target); + default: + throw new IllegalArgumentException("Unsupported VBO target " + target); } nglBindBufferARB(target, buffer); } + private static native void nglBindBufferARB(int target, int buffer); + public static void glDeleteBuffersARB(IntBuffer buffers) { - for (int i = buffers.position(); i < buffers.limit(); i++) { + for ( int i = buffers.position(); i < buffers.limit(); i++ ) { int buffer_handle = buffers.get(i); - if (VBOTracker.getVBOElementStack().getState() == buffer_handle) + if ( VBOTracker.getVBOElementStack().getState() == buffer_handle ) VBOTracker.getVBOElementStack().setState(0); - if (VBOTracker.getVBOArrayStack().getState() == buffer_handle) + if ( VBOTracker.getVBOArrayStack().getState() == buffer_handle ) VBOTracker.getVBOArrayStack().setState(0); } BufferChecks.checkDirect(buffers); nglDeleteBuffersARB(buffers.remaining(), buffers, buffers.position()); } + private static native void nglDeleteBuffersARB(int n, IntBuffer buffers, int buffers_offset); + public static void glGenBuffersARB(IntBuffer buffers) { BufferChecks.checkDirect(buffers); nglGenBuffersARB(buffers.remaining(), buffers, buffers.position()); } + private static native void nglGenBuffersARB(int n, IntBuffer buffers, int buffers_offset); + public static native boolean glIsBufferARB(int buffer); + public static void glBufferDataARB(int target, int size, ByteBuffer data, int usage) { BufferChecks.checkDirectOrNull(data); nglBufferDataARB(target, data != null ? data.remaining() : size, data, data != null ? data.position() : 0, usage); } + public static void glBufferDataARB(int target, int size, ShortBuffer data, int usage) { BufferChecks.checkDirectOrNull(data); - nglBufferDataARB(target, data != null ? data.remaining()<<1 : size, data, data != null ? data.position()<<1 : 0, usage); + nglBufferDataARB(target, data != null ? data.remaining() << 1 : size, data, data != null ? data.position() << 1 : 0, usage); } + public static void glBufferDataARB(int target, int size, FloatBuffer data, int usage) { BufferChecks.checkDirectOrNull(data); - nglBufferDataARB(target, data != null ? data.remaining()<<2 : size, data, data != null ? data.position()<<2 : 0, usage); + nglBufferDataARB(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage); } + public static void glBufferDataARB(int target, int size, IntBuffer data, int usage) { BufferChecks.checkDirectOrNull(data); - nglBufferDataARB(target, data != null ? data.remaining()<<2 : size, data, data != null ? data.position()<<2 : 0, usage); + nglBufferDataARB(target, data != null ? data.remaining() << 2 : size, data, data != null ? data.position() << 2 : 0, usage); } + private static native void nglBufferDataARB(int target, int size, Buffer data, int data_offset, int usage); + public static void glBufferSubDataARB(int target, int offset, ByteBuffer data) { BufferChecks.checkDirect(data); nglBufferSubDataARB(target, offset, data.remaining(), data, data.position()); } + public static void glBufferSubDataARB(int target, int offset, ShortBuffer data) { BufferChecks.checkDirect(data); - nglBufferSubDataARB(target, offset, data.remaining()<<1, data, data.position()<<1); + nglBufferSubDataARB(target, offset, data.remaining() << 1, data, data.position() << 1); } + public static void glBufferSubDataARB(int target, int offset, FloatBuffer data) { BufferChecks.checkDirect(data); - nglBufferSubDataARB(target, offset, data.remaining()<<2, data, data.position()<<2); + nglBufferSubDataARB(target, offset, data.remaining() << 2, data, data.position() << 2); } + public static void glBufferSubDataARB(int target, int offset, IntBuffer data) { BufferChecks.checkDirect(data); - nglBufferSubDataARB(target, offset, data.remaining()<<2, data, data.position()<<2); + nglBufferSubDataARB(target, offset, data.remaining() << 2, data, data.position() << 2); } + private static native void nglBufferSubDataARB(int target, int offset, int size, Buffer data, int data_offset); + public static void glGetBufferSubDataARB(int target, int offset, ByteBuffer data) { BufferChecks.checkDirect(data); nglGetBufferSubDataARB(target, offset, data.remaining(), data, data.position()); } + public static void glGetBufferSubDataARB(int target, int offset, ShortBuffer data) { BufferChecks.checkDirect(data); - nglGetBufferSubDataARB(target, offset, data.remaining()<<1, data, data.position()<<1); + nglGetBufferSubDataARB(target, offset, data.remaining() << 1, data, data.position() << 1); } + public static void glGetBufferSubDataARB(int target, int offset, IntBuffer data) { BufferChecks.checkDirect(data); - nglGetBufferSubDataARB(target, offset, data.remaining()<<2, data, data.position()<<2); + nglGetBufferSubDataARB(target, offset, data.remaining() << 2, data, data.position() << 2); } + public static void glGetBufferSubDataARB(int target, int offset, FloatBuffer data) { BufferChecks.checkDirect(data); - nglGetBufferSubDataARB(target, offset, data.remaining()<<2, data, data.position()<<2); + nglGetBufferSubDataARB(target, offset, data.remaining() << 2, data, data.position() << 2); } + private static native void nglGetBufferSubDataARB(int target, int offset, int size, Buffer data, int data_offset); + /** - * glMapBufferARB maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, in - * which case a new ByteBuffer will be created, pointing to the returned memory. If oldBuffer is non-null, - * it will be returned if it points to the same mapped memory, otherwise a new ByteBuffer is created. - * That way, an application will normally use glMapBufferARB like this: + * glMapBufferARB maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, in which case a new ByteBuffer will be created, pointing to the returned memory. If oldBuffer is non-null, it will be returned if it points to the same mapped memory, otherwise a new ByteBuffer is created. That way, an application will normally use glMapBufferARB like this: + *

+ * ByteBuffer mapped_buffer; mapped_buffer = glMapBufferARB(..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer); * - * ByteBuffer mapped_buffer; - * mapped_buffer = glMapBufferARB(..., ..., ..., null); - * ... - * // Another map on the same buffer - * mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer); + * @param size The size of the buffer area. + * @param oldBuffer A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no new buffer will be created. In that case, size is ignored. * - * @param size The size of the buffer area. - * @param oldBuffer A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and - * no new buffer will be created. In that case, size is ignored. * @return A ByteBuffer representing the mapped buffer memory. */ public static native ByteBuffer glMapBufferARB(int target, int access, int size, ByteBuffer oldBuffer); + public static native boolean glUnmapBufferARB(int target); + public static void glGetBufferParameterARB(int target, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglGetBufferParameterivARB(target, pname, params, params.position()); } + private static native void nglGetBufferParameterivARB(int target, int pname, IntBuffer params, int params_offset); + public static native ByteBuffer glGetBufferPointerARB(int target, int pname, int size); } diff --git a/src/java/org/lwjgl/opengl/ARBDepthTexture.java b/src/java/org/lwjgl/opengl/ARBDepthTexture.java index 083d029c..f16dded7 100644 --- a/src/java/org/lwjgl/opengl/ARBDepthTexture.java +++ b/src/java/org/lwjgl/opengl/ARBDepthTexture.java @@ -32,6 +32,7 @@ package org.lwjgl.opengl; public final class ARBDepthTexture { + /* * Accepted by the parameter of TexImage1D, TexImage2D, * CopyTexImage1D and CopyTexImage2D: diff --git a/src/java/org/lwjgl/opengl/ARBFragmentProgram.java b/src/java/org/lwjgl/opengl/ARBFragmentProgram.java index b49e446a..434f3dc9 100644 --- a/src/java/org/lwjgl/opengl/ARBFragmentProgram.java +++ b/src/java/org/lwjgl/opengl/ARBFragmentProgram.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBFragmentProgram extends ARBProgram { + /* * Accepted by the parameter of Disable, Enable, and IsEnabled, by the * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, diff --git a/src/java/org/lwjgl/opengl/ARBImaging.java b/src/java/org/lwjgl/opengl/ARBImaging.java index c69085b6..a42207f6 100644 --- a/src/java/org/lwjgl/opengl/ARBImaging.java +++ b/src/java/org/lwjgl/opengl/ARBImaging.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -43,89 +43,90 @@ import org.lwjgl.LWJGLException; /** * $Id$ - * + *

* The GL12 imaging subset extension. - * + * * @author cix_foo * @version $Revision$ */ public final class ARBImaging { - public static final int GL_CONSTANT_COLOR = 0x8001; - public static final int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002; - public static final int GL_CONSTANT_ALPHA = 0x8003; - public static final int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004; - public static final int GL_BLEND_COLOR = 0x8005; - public static final int GL_FUNC_ADD = 0x8006; - public static final int GL_MIN = 0x8007; - public static final int GL_MAX = 0x8008; - public static final int GL_BLEND_EQUATION = 0x8009; - public static final int GL_FUNC_SUBTRACT = 0x800A; - public static final int GL_FUNC_REVERSE_SUBTRACT = 0x800B; - public static final int GL_COLOR_MATRIX = 0x80B1; - public static final int GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2; - public static final int GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3; - public static final int GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4; - public static final int GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5; - public static final int GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6; - public static final int GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7; - public static final int GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8; - public static final int GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9; - public static final int GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA; - public static final int GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB; - public static final int GL_COLOR_TABLE = 0x80D0; - public static final int GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1; - public static final int GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2; - public static final int GL_PROXY_COLOR_TABLE = 0x80D3; + + public static final int GL_CONSTANT_COLOR = 0x8001; + public static final int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002; + public static final int GL_CONSTANT_ALPHA = 0x8003; + public static final int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004; + public static final int GL_BLEND_COLOR = 0x8005; + public static final int GL_FUNC_ADD = 0x8006; + public static final int GL_MIN = 0x8007; + public static final int GL_MAX = 0x8008; + public static final int GL_BLEND_EQUATION = 0x8009; + public static final int GL_FUNC_SUBTRACT = 0x800A; + public static final int GL_FUNC_REVERSE_SUBTRACT = 0x800B; + public static final int GL_COLOR_MATRIX = 0x80B1; + public static final int GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2; + public static final int GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3; + public static final int GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4; + public static final int GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5; + public static final int GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6; + public static final int GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7; + public static final int GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8; + public static final int GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9; + public static final int GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA; + public static final int GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB; + public static final int GL_COLOR_TABLE = 0x80D0; + public static final int GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1; + public static final int GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2; + public static final int GL_PROXY_COLOR_TABLE = 0x80D3; public static final int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4; public static final int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5; - public static final int GL_COLOR_TABLE_SCALE = 0x80D6; - public static final int GL_COLOR_TABLE_BIAS = 0x80D7; - public static final int GL_COLOR_TABLE_FORMAT = 0x80D8; - public static final int GL_COLOR_TABLE_WIDTH = 0x80D9; - public static final int GL_COLOR_TABLE_RED_SIZE = 0x80DA; - public static final int GL_COLOR_TABLE_GREEN_SIZE = 0x80DB; - public static final int GL_COLOR_TABLE_BLUE_SIZE = 0x80DC; - public static final int GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD; - public static final int GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE; - public static final int GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF; - public static final int GL_CONVOLUTION_1D = 0x8010; - public static final int GL_CONVOLUTION_2D = 0x8011; - public static final int GL_SEPARABLE_2D = 0x8012; - public static final int GL_CONVOLUTION_BORDER_MODE = 0x8013; - public static final int GL_CONVOLUTION_FILTER_SCALE = 0x8014; - public static final int GL_CONVOLUTION_FILTER_BIAS = 0x8015; - public static final int GL_REDUCE = 0x8016; - public static final int GL_CONVOLUTION_FORMAT = 0x8017; - public static final int GL_CONVOLUTION_WIDTH = 0x8018; - public static final int GL_CONVOLUTION_HEIGHT = 0x8019; - public static final int GL_MAX_CONVOLUTION_WIDTH = 0x801A; - public static final int GL_MAX_CONVOLUTION_HEIGHT = 0x801B; - public static final int GL_POST_CONVOLUTION_RED_SCALE = 0x801C; - public static final int GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D; - public static final int GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E; - public static final int GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F; - public static final int GL_POST_CONVOLUTION_RED_BIAS = 0x8020; - public static final int GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021; - public static final int GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022; - public static final int GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023; - public static final int GL_IGNORE_BORDER = 0x8150; - public static final int GL_CONSTANT_BORDER = 0x8151; - public static final int GL_REPLICATE_BORDER = 0x8153; - public static final int GL_CONVOLUTION_BORDER_COLOR = 0x8154; - public static final int GL_HISTOGRAM = 0x8024; - public static final int GL_PROXY_HISTOGRAM = 0x8025; - public static final int GL_HISTOGRAM_WIDTH = 0x8026; - public static final int GL_HISTOGRAM_FORMAT = 0x8027; - public static final int GL_HISTOGRAM_RED_SIZE = 0x8028; - public static final int GL_HISTOGRAM_GREEN_SIZE = 0x8029; - public static final int GL_HISTOGRAM_BLUE_SIZE = 0x802A; - public static final int GL_HISTOGRAM_ALPHA_SIZE = 0x802B; - public static final int GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C; - public static final int GL_HISTOGRAM_SINK = 0x802D; - public static final int GL_MINMAX = 0x802E; - public static final int GL_MINMAX_FORMAT = 0x802F; - public static final int GL_MINMAX_SINK = 0x8030; + public static final int GL_COLOR_TABLE_SCALE = 0x80D6; + public static final int GL_COLOR_TABLE_BIAS = 0x80D7; + public static final int GL_COLOR_TABLE_FORMAT = 0x80D8; + public static final int GL_COLOR_TABLE_WIDTH = 0x80D9; + public static final int GL_COLOR_TABLE_RED_SIZE = 0x80DA; + public static final int GL_COLOR_TABLE_GREEN_SIZE = 0x80DB; + public static final int GL_COLOR_TABLE_BLUE_SIZE = 0x80DC; + public static final int GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD; + public static final int GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE; + public static final int GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF; + public static final int GL_CONVOLUTION_1D = 0x8010; + public static final int GL_CONVOLUTION_2D = 0x8011; + public static final int GL_SEPARABLE_2D = 0x8012; + public static final int GL_CONVOLUTION_BORDER_MODE = 0x8013; + public static final int GL_CONVOLUTION_FILTER_SCALE = 0x8014; + public static final int GL_CONVOLUTION_FILTER_BIAS = 0x8015; + public static final int GL_REDUCE = 0x8016; + public static final int GL_CONVOLUTION_FORMAT = 0x8017; + public static final int GL_CONVOLUTION_WIDTH = 0x8018; + public static final int GL_CONVOLUTION_HEIGHT = 0x8019; + public static final int GL_MAX_CONVOLUTION_WIDTH = 0x801A; + public static final int GL_MAX_CONVOLUTION_HEIGHT = 0x801B; + public static final int GL_POST_CONVOLUTION_RED_SCALE = 0x801C; + public static final int GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D; + public static final int GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E; + public static final int GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F; + public static final int GL_POST_CONVOLUTION_RED_BIAS = 0x8020; + public static final int GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021; + public static final int GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022; + public static final int GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023; + public static final int GL_IGNORE_BORDER = 0x8150; + public static final int GL_CONSTANT_BORDER = 0x8151; + public static final int GL_REPLICATE_BORDER = 0x8153; + public static final int GL_CONVOLUTION_BORDER_COLOR = 0x8154; + public static final int GL_HISTOGRAM = 0x8024; + public static final int GL_PROXY_HISTOGRAM = 0x8025; + public static final int GL_HISTOGRAM_WIDTH = 0x8026; + public static final int GL_HISTOGRAM_FORMAT = 0x8027; + public static final int GL_HISTOGRAM_RED_SIZE = 0x8028; + public static final int GL_HISTOGRAM_GREEN_SIZE = 0x8029; + public static final int GL_HISTOGRAM_BLUE_SIZE = 0x802A; + public static final int GL_HISTOGRAM_ALPHA_SIZE = 0x802B; + public static final int GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C; + public static final int GL_HISTOGRAM_SINK = 0x802D; + public static final int GL_MINMAX = 0x802E; + public static final int GL_MINMAX_FORMAT = 0x802F; + public static final int GL_MINMAX_SINK = 0x8030; private ARBImaging() { } @@ -136,193 +137,264 @@ public final class ARBImaging { BufferChecks.checkBuffer(data, 256); nglColorTable(target, internalFormat, width, format, type, data, data.position()); } + public static void glColorTable(int target, int internalFormat, int width, int format, int type, FloatBuffer data) { BufferChecks.checkBuffer(data, 256); nglColorTable(target, internalFormat, width, format, type, data, data.position() << 2); } + private static native void nglColorTable(int target, int internalFormat, int width, int format, int type, Buffer data, int data_offset); + public static void glColorSubTable(int target, int start, int count, int format, int type, ByteBuffer data) { BufferChecks.checkBuffer(data, 256); nglColorSubTable(target, start, count, format, type, data, data.position()); } + public static void glColorSubTable(int target, int start, int count, int format, int type, FloatBuffer data) { BufferChecks.checkBuffer(data, 256); nglColorSubTable(target, start, count, format, type, data, data.position() << 2); } + private static native void nglColorSubTable(int target, int start, int count, int format, int type, Buffer data, int data_offset); + public static void glColorTableParameter(int target, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglColorTableParameteriv(target, pname, params, params.position()); } + private static native void nglColorTableParameteriv(int target, int pname, IntBuffer params, int data_offset); + public static void glColorTableParameter(int target, int pname, FloatBuffer params) { BufferChecks.checkBuffer(params); - nglColorTableParameterfv(target, pname, params, params.position()); + nglColorTableParameterfv(target, pname, params, params.position()); } + private static native void nglColorTableParameterfv(int target, int pname, FloatBuffer params, int data_offset); + public static native void glCopyColorSubTable(int target, int start, int x, int y, int width); + public static native void glCopyColorTable(int target, int internalformat, int x, int y, int width); + public static void glGetColorTable(int target, int format, int type, ByteBuffer data) { BufferChecks.checkBuffer(data, 256); nglGetColorTable(target, format, type, data, data.position()); } + public static void glGetColorTable(int target, int format, int type, FloatBuffer data) { BufferChecks.checkBuffer(data, 256); nglGetColorTable(target, format, type, data, data.position()); } + private static native void nglGetColorTable(int target, int format, int type, Buffer data, int data_offset); + public static void glGetColorTableParameter(int target, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglGetColorTableParameteriv(target, pname, params, params.position()); } + private static native void nglGetColorTableParameteriv(int target, int pname, IntBuffer params, int params_offset); + public static void glGetColorTableParameter(int target, int pname, FloatBuffer params) { BufferChecks.checkBuffer(params); nglGetColorTableParameterfv(target, pname, params, params.position()); } + private static native void nglGetColorTableParameterfv(int target, int pname, FloatBuffer params, int params_offset); + public static native void glBlendEquation(int mode); + public static native void glBlendColor(float red, float green, float blue, float alpha); + public static native void glHistogram(int target, int width, int internalformat, boolean sink); + public static native void glResetHistogram(int target); + public static void glGetHistogram(int target, boolean reset, int format, int type, ByteBuffer values) { BufferChecks.checkBuffer(values, 256); nglGetHistogram(target, reset, format, type, values, values.position()); } + public static void glGetHistogram(int target, boolean reset, int format, int type, ShortBuffer values) { BufferChecks.checkBuffer(values, 256); nglGetHistogram(target, reset, format, type, values, values.position() << 1); } + public static void glGetHistogram(int target, boolean reset, int format, int type, IntBuffer values) { BufferChecks.checkBuffer(values, 256); nglGetHistogram(target, reset, format, type, values, values.position() << 2); } + public static void glGetHistogram(int target, boolean reset, int format, int type, FloatBuffer values) { BufferChecks.checkBuffer(values, 256); nglGetHistogram(target, reset, format, type, values, values.position() << 2); } + private static native void nglGetHistogram(int target, boolean reset, int format, int type, Buffer values, int values_offset); + public static void glGetHistogramParameter(int target, int pname, FloatBuffer params) { BufferChecks.checkBuffer(params, 256); nglGetHistogramParameterfv(target, pname, params, params.position()); } + private static native void nglGetHistogramParameterfv(int target, int pname, FloatBuffer params, int params_offset); + public static void glGetHistogramParameter(int target, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglGetHistogramParameteriv(target, pname, params, params.position()); } + private static native void nglGetHistogramParameteriv(int target, int pname, IntBuffer params, int params_offset); + public static native void glMinmax(int target, int internalformat, boolean sink); + public static native void glResetMinmax(int target); + public static void glGetMinmax(int target, boolean reset, int format, int types, ByteBuffer values) { BufferChecks.checkBuffer(values); nglGetMinmax(target, reset, format, types, values, values.position()); } + public static void glGetMinmax(int target, boolean reset, int format, int types, ShortBuffer values) { BufferChecks.checkBuffer(values); nglGetMinmax(target, reset, format, types, values, values.position() << 1); } + public static void glGetMinmax(int target, boolean reset, int format, int types, IntBuffer values) { BufferChecks.checkBuffer(values); nglGetMinmax(target, reset, format, types, values, values.position() << 2); } + public static void glGetMinmax(int target, boolean reset, int format, int types, FloatBuffer values) { BufferChecks.checkBuffer(values); nglGetMinmax(target, reset, format, types, values, values.position() << 2); } + private static native void nglGetMinmax(int target, boolean reset, int format, int types, Buffer values, int values_offset); + public static void glGetMinmaxParameter(int target, int pname, FloatBuffer params) { BufferChecks.checkBuffer(params); nglGetMinmaxParameterfv(target, pname, params, params.position()); } + private static native void nglGetMinmaxParameterfv(int target, int pname, FloatBuffer params, int params_offset); + public static void glGetMinmaxParameter(int target, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglGetMinmaxParameteriv(target, pname, params, params.position()); } + private static native void nglGetMinmaxParameteriv(int target, int pname, IntBuffer params, int params_offset); + public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image) { BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, 1, 1)); nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position()); } + public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image) { - BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, 1, 1)>>1); + BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, 1, 1) >> 1); nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position()); } + public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, IntBuffer image) { - BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, 1, 1)>>2); + BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, 1, 1) >> 2); nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position()); } + public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, FloatBuffer image) { - BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, 1, 1)>>2); + BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, 1, 1) >> 2); nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position()); } + private static native void nglConvolutionFilter1D(int target, int internalformat, int width, int format, int type, Buffer image, int image_offset); + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image) { BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, height, 1)); nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position()); } + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer image) { - BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, height, 1)>>1); - nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() <<1); + BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, height, 1) >> 1); + nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 1); } + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer image) { - BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, height, 1)>>2); + BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(format, type, width, height, 1) >> 2); nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 2); } + private static native void nglConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image, int image_offset); + public static native void glConvolutionParameterf(int target, int pname, float params); + public static void glConvolutionParameter(int target, int pname, FloatBuffer params) { BufferChecks.checkBuffer(params); nglConvolutionParameterfv(target, pname, params, params.position()); } + private static native void nglConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_offset); + public static native void glConvolutionParameteri(int target, int pname, int params); + public static void glConvolutionParameteriv(int target, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglConvolutionParameteriv(target, pname, params, params.position()); } + private static native void nglConvolutionParameteriv(int target, int pname, IntBuffer params, int params_offset); + public static native void glCopyConvolutionFilter1D(int target, int internalformat, int x, int y, int width); + public static native void glCopyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height); + public static void glGetConvolutionFilter(int target, int format, int type, ByteBuffer image) { BufferChecks.checkDirect(image); // TODO: check buffer size valid nglGetConvolutionFilter(target, format, type, image, image.position()); } + public static void glGetConvolutionFilter(int target, int format, int type, ShortBuffer image) { BufferChecks.checkDirect(image); // TODO: check buffer size valid nglGetConvolutionFilter(target, format, type, image, image.position() << 1); } + public static void glGetConvolutionFilter(int target, int format, int type, IntBuffer image) { BufferChecks.checkDirect(image); // TODO: check buffer size valid nglGetConvolutionFilter(target, format, type, image, image.position() << 2); } + public static void glGetConvolutionFilter(int target, int format, int type, FloatBuffer image) { BufferChecks.checkDirect(image); // TODO: check buffer size valid nglGetConvolutionFilter(target, format, type, image, image.position() << 2); } + private static native void nglGetConvolutionFilter(int target, int format, int type, Buffer image, int image_offset); + public static void glGetConvolutionParameter(int target, int pname, FloatBuffer params) { BufferChecks.checkBuffer(params); nglGetConvolutionParameterfv(target, pname, params, params.position()); } + private static native void nglGetConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_offset); + public static void glGetConvolutionParameter(int target, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglGetConvolutionParameteriv(target, pname, params, params.position()); } + private static native void nglGetConvolutionParameteriv(int target, int pname, IntBuffer params, int params_offset); + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, Buffer column) { BufferChecks.checkDirectBuffer(row); BufferChecks.checkDirectBuffer(column); // TODO: check buffer size valid nglSeparableFilter2D(target, internalformat, width, height, format, type, row, BufferUtils.getOffset(row), column, BufferUtils.getOffset(column)); } + private static native void nglSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, int row_offset, Buffer column, int column_offset); + public static void glGetSeparableFilter(int target, int format, int type, Buffer row, Buffer column, Buffer span) { BufferChecks.checkDirectBuffer(row); BufferChecks.checkDirectBuffer(column); @@ -330,6 +402,7 @@ public final class ARBImaging { // TODO: check buffer size valid nglGetSeparableFilter(target, format, type, row, BufferUtils.getOffset(row), column, BufferUtils.getOffset(column), span, BufferUtils.getOffset(span)); } + private static native void nglGetSeparableFilter(int target, int format, int type, Buffer row, int row_offset, Buffer column, int column_offset, Buffer span, int span_offset); } diff --git a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java b/src/java/org/lwjgl/opengl/ARBMatrixPalette.java index f1928eb1..4a7c4e1c 100644 --- a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java +++ b/src/java/org/lwjgl/opengl/ARBMatrixPalette.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -40,16 +40,17 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBMatrixPalette { - public static final int GL_MATRIX_PALETTE_ARB = 0x8840; - public static final int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841; - public static final int GL_MAX_PALETTE_MATRICES_ARB = 0x8842; - public static final int GL_CURRENT_PALETTE_MATRIX_ARB = 0x8843; - public static final int GL_MATRIX_INDEX_ARRAY_ARB = 0x8844; - public static final int GL_CURRENT_MATRIX_INDEX_ARB = 0x8845; - public static final int GL_MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846; - public static final int GL_MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847; - public static final int GL_MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848; - public static final int GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849; + + public static final int GL_MATRIX_PALETTE_ARB = 0x8840; + public static final int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841; + public static final int GL_MAX_PALETTE_MATRICES_ARB = 0x8842; + public static final int GL_CURRENT_PALETTE_MATRIX_ARB = 0x8843; + public static final int GL_MATRIX_INDEX_ARRAY_ARB = 0x8844; + public static final int GL_CURRENT_MATRIX_INDEX_ARB = 0x8845; + public static final int GL_MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846; + public static final int GL_MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847; + public static final int GL_MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848; + public static final int GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849; private ARBMatrixPalette() { } @@ -57,43 +58,52 @@ public final class ARBMatrixPalette { static native void initNativeStubs() throws LWJGLException; public static native void glCurrentPaletteMatrixARB(int index); + public static void glMatrixIndexPointerARB(int size, int stride, ByteBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_BYTE, stride, pPointer, pPointer.position()); } + public static void glMatrixIndexPointerARB(int size, int stride, ShortBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_SHORT, stride, pPointer, pPointer.position()<<1); + nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_SHORT, stride, pPointer, pPointer.position() << 1); } + public static void glMatrixIndexPointerARB(int size, int stride, IntBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_INT, stride, pPointer, pPointer.position()<<2); + nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_INT, stride, pPointer, pPointer.position() << 2); } + private static native void nglMatrixIndexPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_offset); + public static void glMatrixIndexPointerARB(int size, int type, int stride, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglMatrixIndexPointerARBVBO(size, type, stride, buffer_offset); } + private static native void nglMatrixIndexPointerARBVBO(int size, int type, int stride, int buffer_offset); public static void glMatrixIndexuARB(ByteBuffer pIndices) { BufferChecks.checkDirect(pIndices); nglMatrixIndexubvARB(pIndices.remaining(), pIndices, pIndices.position()); } + private static native void nglMatrixIndexubvARB(int size, ByteBuffer pIndices, int pIndices_offset); public static void glMatrixIndexuARB(IntBuffer piIndices) { BufferChecks.checkDirect(piIndices); nglMatrixIndexuivARB(piIndices.remaining(), piIndices, piIndices.position()); } + private static native void nglMatrixIndexuivARB(int size, IntBuffer piIndices, int piIndices_offset); public static void glMatrixIndexuARB(ShortBuffer psIndices) { BufferChecks.checkDirect(psIndices); nglMatrixIndexusvARB(psIndices.remaining(), psIndices, psIndices.position()); } + private static native void nglMatrixIndexusvARB(int size, ShortBuffer psIndices, int psIndices_offset); } diff --git a/src/java/org/lwjgl/opengl/ARBMultisample.java b/src/java/org/lwjgl/opengl/ARBMultisample.java index 87c1bc29..bd5e0f41 100644 --- a/src/java/org/lwjgl/opengl/ARBMultisample.java +++ b/src/java/org/lwjgl/opengl/ARBMultisample.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,15 +34,16 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class ARBMultisample { - public static final int GL_MULTISAMPLE_ARB = 0x809D; - public static final int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E; - public static final int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F; - public static final int GL_SAMPLE_COVERAGE_ARB = 0x80A0; - public static final int GL_SAMPLE_BUFFERS_ARB = 0x80A8; - public static final int GL_SAMPLES_ARB = 0x80A9; - public static final int GL_SAMPLE_COVERAGE_VALUE_ARB = 0x80AA; - public static final int GL_SAMPLE_COVERAGE_INVERT_ARB = 0x80AB; - public static final int GL_MULTISAMPLE_BIT_ARB = 0x20000000; + + public static final int GL_MULTISAMPLE_ARB = 0x809D; + public static final int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E; + public static final int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F; + public static final int GL_SAMPLE_COVERAGE_ARB = 0x80A0; + public static final int GL_SAMPLE_BUFFERS_ARB = 0x80A8; + public static final int GL_SAMPLES_ARB = 0x80A9; + public static final int GL_SAMPLE_COVERAGE_VALUE_ARB = 0x80AA; + public static final int GL_SAMPLE_COVERAGE_INVERT_ARB = 0x80AB; + public static final int GL_MULTISAMPLE_BIT_ARB = 0x20000000; private ARBMultisample() { } diff --git a/src/java/org/lwjgl/opengl/ARBMultitexture.java b/src/java/org/lwjgl/opengl/ARBMultitexture.java index 0ab5894c..98d22cee 100644 --- a/src/java/org/lwjgl/opengl/ARBMultitexture.java +++ b/src/java/org/lwjgl/opengl/ARBMultitexture.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,41 +34,42 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class ARBMultitexture { - public static final int GL_TEXTURE0_ARB = 0x84C0; - public static final int GL_TEXTURE1_ARB = 0x84C1; - public static final int GL_TEXTURE2_ARB = 0x84C2; - public static final int GL_TEXTURE3_ARB = 0x84C3; - public static final int GL_TEXTURE4_ARB = 0x84C4; - public static final int GL_TEXTURE5_ARB = 0x84C5; - public static final int GL_TEXTURE6_ARB = 0x84C6; - public static final int GL_TEXTURE7_ARB = 0x84C7; - public static final int GL_TEXTURE8_ARB = 0x84C8; - public static final int GL_TEXTURE9_ARB = 0x84C9; - public static final int GL_TEXTURE10_ARB = 0x84CA; - public static final int GL_TEXTURE11_ARB = 0x84CB; - public static final int GL_TEXTURE12_ARB = 0x84CC; - public static final int GL_TEXTURE13_ARB = 0x84CD; - public static final int GL_TEXTURE14_ARB = 0x84CE; - public static final int GL_TEXTURE15_ARB = 0x84CF; - public static final int GL_TEXTURE16_ARB = 0x84D0; - public static final int GL_TEXTURE17_ARB = 0x84D1; - public static final int GL_TEXTURE18_ARB = 0x84D2; - public static final int GL_TEXTURE19_ARB = 0x84D3; - public static final int GL_TEXTURE20_ARB = 0x84D4; - public static final int GL_TEXTURE21_ARB = 0x84D5; - public static final int GL_TEXTURE22_ARB = 0x84D6; - public static final int GL_TEXTURE23_ARB = 0x84D7; - public static final int GL_TEXTURE24_ARB = 0x84D8; - public static final int GL_TEXTURE25_ARB = 0x84D9; - public static final int GL_TEXTURE26_ARB = 0x84DA; - public static final int GL_TEXTURE27_ARB = 0x84DB; - public static final int GL_TEXTURE28_ARB = 0x84DC; - public static final int GL_TEXTURE29_ARB = 0x84DD; - public static final int GL_TEXTURE30_ARB = 0x84DE; - public static final int GL_TEXTURE31_ARB = 0x84DF; - public static final int GL_ACTIVE_TEXTURE_ARB = 0x84E0; - public static final int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1; - public static final int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2; + + public static final int GL_TEXTURE0_ARB = 0x84C0; + public static final int GL_TEXTURE1_ARB = 0x84C1; + public static final int GL_TEXTURE2_ARB = 0x84C2; + public static final int GL_TEXTURE3_ARB = 0x84C3; + public static final int GL_TEXTURE4_ARB = 0x84C4; + public static final int GL_TEXTURE5_ARB = 0x84C5; + public static final int GL_TEXTURE6_ARB = 0x84C6; + public static final int GL_TEXTURE7_ARB = 0x84C7; + public static final int GL_TEXTURE8_ARB = 0x84C8; + public static final int GL_TEXTURE9_ARB = 0x84C9; + public static final int GL_TEXTURE10_ARB = 0x84CA; + public static final int GL_TEXTURE11_ARB = 0x84CB; + public static final int GL_TEXTURE12_ARB = 0x84CC; + public static final int GL_TEXTURE13_ARB = 0x84CD; + public static final int GL_TEXTURE14_ARB = 0x84CE; + public static final int GL_TEXTURE15_ARB = 0x84CF; + public static final int GL_TEXTURE16_ARB = 0x84D0; + public static final int GL_TEXTURE17_ARB = 0x84D1; + public static final int GL_TEXTURE18_ARB = 0x84D2; + public static final int GL_TEXTURE19_ARB = 0x84D3; + public static final int GL_TEXTURE20_ARB = 0x84D4; + public static final int GL_TEXTURE21_ARB = 0x84D5; + public static final int GL_TEXTURE22_ARB = 0x84D6; + public static final int GL_TEXTURE23_ARB = 0x84D7; + public static final int GL_TEXTURE24_ARB = 0x84D8; + public static final int GL_TEXTURE25_ARB = 0x84D9; + public static final int GL_TEXTURE26_ARB = 0x84DA; + public static final int GL_TEXTURE27_ARB = 0x84DB; + public static final int GL_TEXTURE28_ARB = 0x84DC; + public static final int GL_TEXTURE29_ARB = 0x84DD; + public static final int GL_TEXTURE30_ARB = 0x84DE; + public static final int GL_TEXTURE31_ARB = 0x84DF; + public static final int GL_ACTIVE_TEXTURE_ARB = 0x84E0; + public static final int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1; + public static final int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2; private ARBMultitexture() { } @@ -91,38 +92,15 @@ public final class ARBMultitexture { public static native void glMultiTexCoord2sARB(int target, short s, short t); - public static native void glMultiTexCoord3fARB( - int target, - float s, - float t, - float r); + public static native void glMultiTexCoord3fARB(int target, float s, float t, float r); public static native void glMultiTexCoord3iARB(int target, int s, int t, int r); - public static native void glMultiTexCoord3sARB( - int target, - short s, - short t, - short r); + public static native void glMultiTexCoord3sARB(int target, short s, short t, short r); - public static native void glMultiTexCoord4fARB( - int target, - float s, - float t, - float r, - float q); + public static native void glMultiTexCoord4fARB(int target, float s, float t, float r, float q); - public static native void glMultiTexCoord4iARB( - int target, - int s, - int t, - int r, - int q); + public static native void glMultiTexCoord4iARB(int target, int s, int t, int r, int q); - public static native void glMultiTexCoord4sARB( - int target, - short s, - short t, - short r, - short q); + public static native void glMultiTexCoord4sARB(int target, short s, short t, short r, short q); } diff --git a/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java b/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java index 5546129e..431cccdb 100644 --- a/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java +++ b/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,6 +37,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBOcclusionQuery { + /* * Accepted by the parameter of BeginQueryARB, EndQueryARB, * and GetQueryivARB: diff --git a/src/java/org/lwjgl/opengl/ARBPointParameters.java b/src/java/org/lwjgl/opengl/ARBPointParameters.java index dffea2cf..4a51ed6f 100644 --- a/src/java/org/lwjgl/opengl/ARBPointParameters.java +++ b/src/java/org/lwjgl/opengl/ARBPointParameters.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,10 +37,11 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBPointParameters { - public static final int GL_POINT_SIZE_MIN_ARB = 0x8126; - public static final int GL_POINT_SIZE_MAX_ARB = 0x8127; - public static final int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128; - public static final int GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129; + + public static final int GL_POINT_SIZE_MIN_ARB = 0x8126; + public static final int GL_POINT_SIZE_MAX_ARB = 0x8127; + public static final int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128; + public static final int GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129; private ARBPointParameters() { } @@ -53,5 +54,6 @@ public final class ARBPointParameters { BufferChecks.checkBuffer(pfParams); nglPointParameterfvARB(pname, pfParams, pfParams.position()); } + private static native void nglPointParameterfvARB(int pname, FloatBuffer pfParams, int pfParams_offset); } diff --git a/src/java/org/lwjgl/opengl/ARBProgram.java b/src/java/org/lwjgl/opengl/ARBProgram.java index 87110922..0c29af68 100644 --- a/src/java/org/lwjgl/opengl/ARBProgram.java +++ b/src/java/org/lwjgl/opengl/ARBProgram.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,6 +41,7 @@ import org.lwjgl.BufferChecks; import org.lwjgl.LWJGLException; public abstract class ARBProgram { + /* * Accepted by the parameter of ProgramStringARB: */ @@ -160,19 +161,18 @@ public abstract class ARBProgram { private static native void nglGenProgramsARB(int n, IntBuffer programs, int programsOffset); // --------------------------- - public static native void glProgramEnvParameter4fARB( - int target, - int index, - float x, - float y, - float z, - float w); + public static native void glProgramEnvParameter4fARB(int target, + int index, + float x, + float y, + float z, + float w); private static void checkProgramEnv(int index, Buffer buf) { - if (index < 0) { + if ( index < 0 ) { throw new IllegalArgumentException(" must be greater than or equal to 0."); } - if (buf.remaining() < 4) { + if ( buf.remaining() < 4 ) { throw new BufferUnderflowException(); } } @@ -187,13 +187,12 @@ public abstract class ARBProgram { private static native void nglProgramEnvParameter4fvARB(int target, int index, FloatBuffer params, int paramsOffset); // --------------------------- - public static native void glProgramLocalParameter4fARB( - int target, - int index, - float x, - float y, - float z, - float w); + public static native void glProgramLocalParameter4fARB(int target, + int index, + float x, + float y, + float z, + float w); // --------------------------- public static void glProgramLocalParameterARB(int target, int index, FloatBuffer params) { diff --git a/src/java/org/lwjgl/opengl/ARBShaderObjects.java b/src/java/org/lwjgl/opengl/ARBShaderObjects.java index a41c6eed..57305a41 100644 --- a/src/java/org/lwjgl/opengl/ARBShaderObjects.java +++ b/src/java/org/lwjgl/opengl/ARBShaderObjects.java @@ -40,6 +40,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBShaderObjects { + /* * Accepted by the argument of GetHandleARB: */ @@ -256,8 +257,7 @@ public final class ARBShaderObjects { nglUniformMatrix2fvARB(location, matrices.remaining() >> 2, transpose, matrices, matrices.position()); } - private static native void nglUniformMatrix2fvARB(int location, int count, boolean transpose, - FloatBuffer matrices, int matricesOffset); + private static native void nglUniformMatrix2fvARB(int location, int count, boolean transpose, FloatBuffer matrices, int matricesOffset); // --------------------------- // --------------------------- @@ -266,8 +266,7 @@ public final class ARBShaderObjects { nglUniformMatrix3fvARB(location, matrices.remaining() / (3 * 3), transpose, matrices, matrices.position()); } - private static native void nglUniformMatrix3fvARB(int location, int count, boolean transpose, - FloatBuffer matrices, int matricesOffset); + private static native void nglUniformMatrix3fvARB(int location, int count, boolean transpose, FloatBuffer matrices, int matricesOffset); // --------------------------- // --------------------------- @@ -276,8 +275,7 @@ public final class ARBShaderObjects { nglUniformMatrix4fvARB(location, matrices.remaining() >> 4, transpose, matrices, matrices.position()); } - private static native void nglUniformMatrix4fvARB(int location, int count, boolean transpose, - FloatBuffer matrices, int matricesOffset); + private static native void nglUniformMatrix4fvARB(int location, int count, boolean transpose, FloatBuffer matrices, int matricesOffset); // --------------------------- // --------------------------- @@ -309,9 +307,7 @@ public final class ARBShaderObjects { } } - private static native void nglGetInfoLogARB(int obj, int maxLength, - IntBuffer length, int lengthOffset, - ByteBuffer infoLog, int infoLogOffset); + private static native void nglGetInfoLogARB(int obj, int maxLength, IntBuffer length, int lengthOffset, ByteBuffer infoLog, int infoLogOffset); // --------------------------- // --------------------------- @@ -326,14 +322,12 @@ public final class ARBShaderObjects { } } - private static native void nglGetAttachedObjectsARB(int containerObj, int maxCount, - IntBuffer count, int countOffset, IntBuffer obj, int objOffset); + private static native void nglGetAttachedObjectsARB(int containerObj, int maxCount, IntBuffer count, int countOffset, IntBuffer obj, int objOffset); // --------------------------- // --------------------------- /** - * Returns the location of the uniform with the specified name. The ByteBuffer should contain the uniform name as a - * null-terminated string. + * Returns the location of the uniform with the specified name. The ByteBuffer should contain the uniform name as a null-terminated string. * * @param programObj * @param name @@ -349,8 +343,7 @@ public final class ARBShaderObjects { // --------------------------- // --------------------------- - public static void glGetActiveUniformARB(int programObj, int index, - IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { + public static void glGetActiveUniformARB(int programObj, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { if ( size.remaining() == 0 ) throw new BufferOverflowException(); @@ -358,22 +351,16 @@ public final class ARBShaderObjects { throw new BufferOverflowException(); if ( length == null ) - nglGetActiveUniformARB(programObj, index, name.remaining(), null, -1, - size, size.position(), type, type.position(), name, name.position()); + nglGetActiveUniformARB(programObj, index, name.remaining(), null, -1, size, size.position(), type, type.position(), name, name.position()); else { if ( length.remaining() == 0 ) throw new BufferOverflowException(); - nglGetActiveUniformARB(programObj, index, name.remaining(), length, length.position(), - size, size.position(), type, type.position(), name, name.position()); + nglGetActiveUniformARB(programObj, index, name.remaining(), length, length.position(), size, size.position(), type, type.position(), name, name.position()); } } - private static native void nglGetActiveUniformARB(int programObj, int index, int maxLength, - IntBuffer length, int lengthOffset, - IntBuffer size, int sizeOffset, - IntBuffer type, int typeOffset, - ByteBuffer name, int nameOffset); + private static native void nglGetActiveUniformARB(int programObj, int index, int maxLength, IntBuffer length, int lengthOffset, IntBuffer size, int sizeOffset, IntBuffer type, int typeOffset, ByteBuffer name, int nameOffset); // --------------------------- // --------------------------- @@ -401,8 +388,7 @@ public final class ARBShaderObjects { } } - private static native void nglGetShaderSourceARB(int obj, int maxLength, - IntBuffer length, int lengthOffset, ByteBuffer source, int sourceOffset); + private static native void nglGetShaderSourceARB(int obj, int maxLength, IntBuffer length, int lengthOffset, ByteBuffer source, int sourceOffset); // --------------------------- } diff --git a/src/java/org/lwjgl/opengl/ARBShadingLanguage100.java b/src/java/org/lwjgl/opengl/ARBShadingLanguage100.java index 6a93cd0b..01efff22 100644 --- a/src/java/org/lwjgl/opengl/ARBShadingLanguage100.java +++ b/src/java/org/lwjgl/opengl/ARBShadingLanguage100.java @@ -32,6 +32,7 @@ package org.lwjgl.opengl; public final class ARBShadingLanguage100 { + /* * Accepted by the parameter of GetString: */ diff --git a/src/java/org/lwjgl/opengl/ARBShadow.java b/src/java/org/lwjgl/opengl/ARBShadow.java index 53e5f0f9..9d532ca2 100644 --- a/src/java/org/lwjgl/opengl/ARBShadow.java +++ b/src/java/org/lwjgl/opengl/ARBShadow.java @@ -1,40 +1,41 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBShadow { - public static final int GL_TEXTURE_COMPARE_MODE_ARB = 0x884C; - public static final int GL_TEXTURE_COMPARE_FUNC_ARB = 0x884D; - public static final int GL_COMPARE_R_TO_TEXTURE_ARB = 0x884E; + + public static final int GL_TEXTURE_COMPARE_MODE_ARB = 0x884C; + public static final int GL_TEXTURE_COMPARE_FUNC_ARB = 0x884D; + public static final int GL_COMPARE_R_TO_TEXTURE_ARB = 0x884E; private ARBShadow() { } diff --git a/src/java/org/lwjgl/opengl/ARBShadowAmbient.java b/src/java/org/lwjgl/opengl/ARBShadowAmbient.java index c135a98a..d635721f 100644 --- a/src/java/org/lwjgl/opengl/ARBShadowAmbient.java +++ b/src/java/org/lwjgl/opengl/ARBShadowAmbient.java @@ -1,38 +1,39 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBShadowAmbient { - public static final int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF; + + public static final int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF; private ARBShadowAmbient() { } diff --git a/src/java/org/lwjgl/opengl/ARBTextureBorderClamp.java b/src/java/org/lwjgl/opengl/ARBTextureBorderClamp.java index 7c6b90f5..f7a0f31f 100644 --- a/src/java/org/lwjgl/opengl/ARBTextureBorderClamp.java +++ b/src/java/org/lwjgl/opengl/ARBTextureBorderClamp.java @@ -1,38 +1,39 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBTextureBorderClamp { - public static final int GL_CLAMP_TO_BORDER_ARB = 0x812D; + + public static final int GL_CLAMP_TO_BORDER_ARB = 0x812D; private ARBTextureBorderClamp() { } diff --git a/src/java/org/lwjgl/opengl/ARBTextureCompression.java b/src/java/org/lwjgl/opengl/ARBTextureCompression.java index 895ae8d5..32c52cf6 100644 --- a/src/java/org/lwjgl/opengl/ARBTextureCompression.java +++ b/src/java/org/lwjgl/opengl/ARBTextureCompression.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,17 +41,18 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBTextureCompression { - public static final int GL_COMPRESSED_ALPHA_ARB = 0x84E9; - public static final int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA; - public static final int GL_COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB; - public static final int GL_COMPRESSED_INTENSITY_ARB = 0x84EC; - public static final int GL_COMPRESSED_RGB_ARB = 0x84ED; - public static final int GL_COMPRESSED_RGBA_ARB = 0x84EE; - public static final int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF; - public static final int GL_TEXTURE_IMAGE_SIZE_ARB = 0x86A0; - public static final int GL_TEXTURE_COMPRESSED_ARB = 0x86A1; - public static final int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2; - public static final int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3; + + public static final int GL_COMPRESSED_ALPHA_ARB = 0x84E9; + public static final int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA; + public static final int GL_COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB; + public static final int GL_COMPRESSED_INTENSITY_ARB = 0x84EC; + public static final int GL_COMPRESSED_RGB_ARB = 0x84ED; + public static final int GL_COMPRESSED_RGBA_ARB = 0x84EE; + public static final int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF; + public static final int GL_TEXTURE_IMAGE_SIZE_ARB = 0x86A0; + public static final int GL_TEXTURE_COMPRESSED_ARB = 0x86A1; + public static final int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2; + public static final int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3; private ARBTextureCompression() { } @@ -62,120 +63,148 @@ public final class ARBTextureCompression { BufferChecks.checkDirect(pData); nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position()); } + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position()<<1); + nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 1); } + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position()<<2); + nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2); } + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position()<<2); + nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2); } + private static native void nglCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, Buffer pData, int pData_offset); public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer pData) { BufferChecks.checkDirect(pData); nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position()); } + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position()<<1); + nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 1); } + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position()<<2); + nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2); } + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position()<<2); + nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2); } + private static native void nglCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer pData, int pData_offset); public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) { BufferChecks.checkDirect(pData); nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position()); } + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position()<<1); + nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 1); } + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position()<<2); + nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2); } + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position()<<2); + nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2); } + private static native void nglCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer pData, int pData_offset); public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, ByteBuffer pData) { BufferChecks.checkDirect(pData); nglCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData, pData.position()); } + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, ShortBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData, pData.position()<<1); + nglCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData, pData.position() << 1); } + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, IntBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData, pData.position()<<2); + nglCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData, pData.position() << 2); } + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, FloatBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData, pData.position()<<2); + nglCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData, pData.position() << 2); } + private static native void nglCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, Buffer pData, int pData_offset); public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, ByteBuffer pData) { BufferChecks.checkDirect(pData); nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData, pData.position()); } + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, ShortBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData, pData.position()<<1); + nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData, pData.position() << 1); } + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, IntBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData, pData.position()<<2); + nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData, pData.position() << 2); } + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, FloatBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData, pData.position()<<2); + nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData, pData.position() << 2); } + private static native void nglCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, Buffer pData, int pData_offset); public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) { BufferChecks.checkDirect(pData); nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData, pData.position()); } + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData, pData.position()<<1); + nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData, pData.position() << 1); } + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, IntBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData, pData.position()<<2); + nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData, pData.position() << 2); } + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, FloatBuffer pData) { BufferChecks.checkDirect(pData); - nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData, pData.position()<<2); + nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData, pData.position() << 2); } + private static native void nglCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, Buffer pData, int pData_offset); + public static void glGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg) { BufferChecks.checkDirect(pImg); nglGetCompressedTexImageARB(target, lod, pImg, pImg.position()); } + public static void glGetCompressedTexImageARB(int target, int lod, ShortBuffer pImg) { BufferChecks.checkDirect(pImg); - nglGetCompressedTexImageARB(target, lod, pImg, pImg.position()<<1); + nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 1); } + public static void glGetCompressedTexImageARB(int target, int lod, IntBuffer pImg) { BufferChecks.checkDirect(pImg); - nglGetCompressedTexImageARB(target, lod, pImg, pImg.position()<<2); + nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2); } + private static native void nglGetCompressedTexImageARB(int target, int lod, Buffer pImg, int pImg_offset); } diff --git a/src/java/org/lwjgl/opengl/ARBTextureCubeMap.java b/src/java/org/lwjgl/opengl/ARBTextureCubeMap.java index 694af220..b88cf9df 100644 --- a/src/java/org/lwjgl/opengl/ARBTextureCubeMap.java +++ b/src/java/org/lwjgl/opengl/ARBTextureCubeMap.java @@ -1,49 +1,50 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBTextureCubeMap { - public static final int GL_NORMAL_MAP_ARB = 0x8511; - public static final int GL_REFLECTION_MAP_ARB = 0x8512; - public static final int GL_TEXTURE_CUBE_MAP_ARB = 0x8513; - public static final int GL_TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514; - public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515; - public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516; - public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517; - public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518; - public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519; - public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A; - public static final int GL_PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B; - public static final int GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C; + + public static final int GL_NORMAL_MAP_ARB = 0x8511; + public static final int GL_REFLECTION_MAP_ARB = 0x8512; + public static final int GL_TEXTURE_CUBE_MAP_ARB = 0x8513; + public static final int GL_TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514; + public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515; + public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516; + public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517; + public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518; + public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519; + public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A; + public static final int GL_PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B; + public static final int GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C; private ARBTextureCubeMap() { } diff --git a/src/java/org/lwjgl/opengl/ARBTextureEnvCombine.java b/src/java/org/lwjgl/opengl/ARBTextureEnvCombine.java index ffb8818f..68376904 100644 --- a/src/java/org/lwjgl/opengl/ARBTextureEnvCombine.java +++ b/src/java/org/lwjgl/opengl/ARBTextureEnvCombine.java @@ -1,58 +1,59 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBTextureEnvCombine { - public static final int GL_COMBINE_ARB = 0x8570; - public static final int GL_COMBINE_RGB_ARB = 0x8571; - public static final int GL_COMBINE_ALPHA_ARB = 0x8572; - public static final int GL_RGB_SCALE_ARB = 0x8573; - public static final int GL_ADD_SIGNED_ARB = 0x8574; - public static final int GL_INTERPOLATE_ARB = 0x8575; - public static final int GL_CONSTANT_ARB = 0x8576; - public static final int GL_PRIMARY_COLOR_ARB = 0x8577; - public static final int GL_PREVIOUS_ARB = 0x8578; - public static final int GL_SOURCE0_RGB_ARB = 0x8580; - public static final int GL_SOURCE1_RGB_ARB = 0x8581; - public static final int GL_SOURCE2_RGB_ARB = 0x8582; - public static final int GL_SOURCE0_ALPHA_ARB = 0x8588; - public static final int GL_SOURCE1_ALPHA_ARB = 0x8589; - public static final int GL_SOURCE2_ALPHA_ARB = 0x858A; - public static final int GL_OPERAND0_RGB_ARB = 0x8590; - public static final int GL_OPERAND1_RGB_ARB = 0x8591; - public static final int GL_OPERAND2_RGB_ARB = 0x8592; - public static final int GL_OPERAND0_ALPHA_ARB = 0x8598; - public static final int GL_OPERAND1_ALPHA_ARB = 0x8599; - public static final int GL_OPERAND2_ALPHA_ARB = 0x859A; + + public static final int GL_COMBINE_ARB = 0x8570; + public static final int GL_COMBINE_RGB_ARB = 0x8571; + public static final int GL_COMBINE_ALPHA_ARB = 0x8572; + public static final int GL_RGB_SCALE_ARB = 0x8573; + public static final int GL_ADD_SIGNED_ARB = 0x8574; + public static final int GL_INTERPOLATE_ARB = 0x8575; + public static final int GL_CONSTANT_ARB = 0x8576; + public static final int GL_PRIMARY_COLOR_ARB = 0x8577; + public static final int GL_PREVIOUS_ARB = 0x8578; + public static final int GL_SOURCE0_RGB_ARB = 0x8580; + public static final int GL_SOURCE1_RGB_ARB = 0x8581; + public static final int GL_SOURCE2_RGB_ARB = 0x8582; + public static final int GL_SOURCE0_ALPHA_ARB = 0x8588; + public static final int GL_SOURCE1_ALPHA_ARB = 0x8589; + public static final int GL_SOURCE2_ALPHA_ARB = 0x858A; + public static final int GL_OPERAND0_RGB_ARB = 0x8590; + public static final int GL_OPERAND1_RGB_ARB = 0x8591; + public static final int GL_OPERAND2_RGB_ARB = 0x8592; + public static final int GL_OPERAND0_ALPHA_ARB = 0x8598; + public static final int GL_OPERAND1_ALPHA_ARB = 0x8599; + public static final int GL_OPERAND2_ALPHA_ARB = 0x859A; private ARBTextureEnvCombine() { } diff --git a/src/java/org/lwjgl/opengl/ARBTextureEnvDot3.java b/src/java/org/lwjgl/opengl/ARBTextureEnvDot3.java index 5a1fe9cb..9a9a4e8e 100644 --- a/src/java/org/lwjgl/opengl/ARBTextureEnvDot3.java +++ b/src/java/org/lwjgl/opengl/ARBTextureEnvDot3.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBTextureEnvDot3 { - public static final int GL_DOT3_RGB_ARB = 0x86AE; - public static final int GL_DOT3_RGBA_ARB = 0x86AF; + + public static final int GL_DOT3_RGB_ARB = 0x86AE; + public static final int GL_DOT3_RGBA_ARB = 0x86AF; private ARBTextureEnvDot3() { } diff --git a/src/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java b/src/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java index 95d50499..0b4839b7 100644 --- a/src/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java +++ b/src/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java @@ -1,38 +1,39 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBTextureMirroredRepeat { - public static final int GL_MIRRORED_REPEAT_ARB = 0x8370; + + public static final int GL_MIRRORED_REPEAT_ARB = 0x8370; private ARBTextureMirroredRepeat() { } diff --git a/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java b/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java index 32bfd1e9..cf3b393f 100644 --- a/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java +++ b/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,11 +37,12 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBTransposeMatrix { - public static final int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3; - public static final int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4; - public static final int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5; - public static final int GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6; - + + public static final int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3; + public static final int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4; + public static final int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5; + public static final int GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6; + private ARBTransposeMatrix() { } @@ -51,11 +52,13 @@ public final class ARBTransposeMatrix { BufferChecks.checkBuffer(pfMtx, 16); nglLoadTransposeMatrixfARB(pfMtx, pfMtx.position()); } + private static native void nglLoadTransposeMatrixfARB(FloatBuffer pfMtx, int pfMtx_offset); public static void glMultTransposeMatrixfARB(FloatBuffer pfMtx) { BufferChecks.checkBuffer(pfMtx, 16); nglMultTransposeMatrixfARB(pfMtx, pfMtx.position()); } + private static native void nglMultTransposeMatrixfARB(FloatBuffer pfMtx, int pfMtx_offset); } diff --git a/src/java/org/lwjgl/opengl/ARBVertexBlend.java b/src/java/org/lwjgl/opengl/ARBVertexBlend.java index 576679a1..a8e9a302 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexBlend.java +++ b/src/java/org/lwjgl/opengl/ARBVertexBlend.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,49 +41,50 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBVertexBlend { - public static final int GL_MAX_VERTEX_UNITS_ARB = 0x86A4; - public static final int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5; - public static final int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6; - public static final int GL_VERTEX_BLEND_ARB = 0x86A7; - public static final int GL_CURRENT_WEIGHT_ARB = 0x86A8; - public static final int GL_WEIGHT_ARRAY_TYPE_ARB = 0x86A9; - public static final int GL_WEIGHT_ARRAY_STRIDE_ARB = 0x86AA; - public static final int GL_WEIGHT_ARRAY_SIZE_ARB = 0x86AB; - public static final int GL_WEIGHT_ARRAY_POINTER_ARB = 0x86AC; - public static final int GL_WEIGHT_ARRAY_ARB = 0x86AD; - public static final int GL_MODELVIEW0_ARB = 0x1700; - public static final int GL_MODELVIEW1_ARB = 0x850a; - public static final int GL_MODELVIEW2_ARB = 0x8722; - public static final int GL_MODELVIEW3_ARB = 0x8723; - public static final int GL_MODELVIEW4_ARB = 0x8724; - public static final int GL_MODELVIEW5_ARB = 0x8725; - public static final int GL_MODELVIEW6_ARB = 0x8726; - public static final int GL_MODELVIEW7_ARB = 0x8727; - public static final int GL_MODELVIEW8_ARB = 0x8728; - public static final int GL_MODELVIEW9_ARB = 0x8729; - public static final int GL_MODELVIEW10_ARB = 0x872A; - public static final int GL_MODELVIEW11_ARB = 0x872B; - public static final int GL_MODELVIEW12_ARB = 0x872C; - public static final int GL_MODELVIEW13_ARB = 0x872D; - public static final int GL_MODELVIEW14_ARB = 0x872E; - public static final int GL_MODELVIEW15_ARB = 0x872F; - public static final int GL_MODELVIEW16_ARB = 0x8730; - public static final int GL_MODELVIEW17_ARB = 0x8731; - public static final int GL_MODELVIEW18_ARB = 0x8732; - public static final int GL_MODELVIEW19_ARB = 0x8733; - public static final int GL_MODELVIEW20_ARB = 0x8734; - public static final int GL_MODELVIEW21_ARB = 0x8735; - public static final int GL_MODELVIEW22_ARB = 0x8736; - public static final int GL_MODELVIEW23_ARB = 0x8737; - public static final int GL_MODELVIEW24_ARB = 0x8738; - public static final int GL_MODELVIEW25_ARB = 0x8739; - public static final int GL_MODELVIEW26_ARB = 0x873A; - public static final int GL_MODELVIEW27_ARB = 0x873B; - public static final int GL_MODELVIEW28_ARB = 0x873C; - public static final int GL_MODELVIEW29_ARB = 0x873D; - public static final int GL_MODELVIEW30_ARB = 0x873E; - public static final int GL_MODELVIEW31_ARB = 0x873F; - + + public static final int GL_MAX_VERTEX_UNITS_ARB = 0x86A4; + public static final int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5; + public static final int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6; + public static final int GL_VERTEX_BLEND_ARB = 0x86A7; + public static final int GL_CURRENT_WEIGHT_ARB = 0x86A8; + public static final int GL_WEIGHT_ARRAY_TYPE_ARB = 0x86A9; + public static final int GL_WEIGHT_ARRAY_STRIDE_ARB = 0x86AA; + public static final int GL_WEIGHT_ARRAY_SIZE_ARB = 0x86AB; + public static final int GL_WEIGHT_ARRAY_POINTER_ARB = 0x86AC; + public static final int GL_WEIGHT_ARRAY_ARB = 0x86AD; + public static final int GL_MODELVIEW0_ARB = 0x1700; + public static final int GL_MODELVIEW1_ARB = 0x850a; + public static final int GL_MODELVIEW2_ARB = 0x8722; + public static final int GL_MODELVIEW3_ARB = 0x8723; + public static final int GL_MODELVIEW4_ARB = 0x8724; + public static final int GL_MODELVIEW5_ARB = 0x8725; + public static final int GL_MODELVIEW6_ARB = 0x8726; + public static final int GL_MODELVIEW7_ARB = 0x8727; + public static final int GL_MODELVIEW8_ARB = 0x8728; + public static final int GL_MODELVIEW9_ARB = 0x8729; + public static final int GL_MODELVIEW10_ARB = 0x872A; + public static final int GL_MODELVIEW11_ARB = 0x872B; + public static final int GL_MODELVIEW12_ARB = 0x872C; + public static final int GL_MODELVIEW13_ARB = 0x872D; + public static final int GL_MODELVIEW14_ARB = 0x872E; + public static final int GL_MODELVIEW15_ARB = 0x872F; + public static final int GL_MODELVIEW16_ARB = 0x8730; + public static final int GL_MODELVIEW17_ARB = 0x8731; + public static final int GL_MODELVIEW18_ARB = 0x8732; + public static final int GL_MODELVIEW19_ARB = 0x8733; + public static final int GL_MODELVIEW20_ARB = 0x8734; + public static final int GL_MODELVIEW21_ARB = 0x8735; + public static final int GL_MODELVIEW22_ARB = 0x8736; + public static final int GL_MODELVIEW23_ARB = 0x8737; + public static final int GL_MODELVIEW24_ARB = 0x8738; + public static final int GL_MODELVIEW25_ARB = 0x8739; + public static final int GL_MODELVIEW26_ARB = 0x873A; + public static final int GL_MODELVIEW27_ARB = 0x873B; + public static final int GL_MODELVIEW28_ARB = 0x873C; + public static final int GL_MODELVIEW29_ARB = 0x873D; + public static final int GL_MODELVIEW30_ARB = 0x873E; + public static final int GL_MODELVIEW31_ARB = 0x873F; + private ARBVertexBlend() { } @@ -93,42 +94,49 @@ public final class ARBVertexBlend { BufferChecks.checkDirect(pWeights); nglWeightbvARB(pWeights.remaining(), pWeights, pWeights.position()); } + private static native void nglWeightbvARB(int size, ByteBuffer pWeights, int pWeights_offset); public static void glWeightARB(FloatBuffer pfWeights) { BufferChecks.checkDirect(pfWeights); nglWeightfvARB(pfWeights.remaining(), pfWeights, pfWeights.position()); } + private static native void nglWeightfvARB(int size, FloatBuffer pfWeights, int pfWeights_offset); public static void glWeightARB(IntBuffer piWeights) { BufferChecks.checkDirect(piWeights); nglWeightivARB(piWeights.remaining(), piWeights, piWeights.position()); } + private static native void nglWeightivARB(int size, IntBuffer piWeights, int piWeights_offset); public static void glWeightARB(ShortBuffer psWeights) { BufferChecks.checkDirect(psWeights); nglWeightsvARB(psWeights.remaining(), psWeights, psWeights.position()); } + private static native void nglWeightsvARB(int size, ShortBuffer psWeights, int psWeights_offset); public static void glWeightuARB(ByteBuffer pWeights) { BufferChecks.checkDirect(pWeights); nglWeightubvARB(pWeights.remaining(), pWeights, pWeights.position()); } + private static native void nglWeightubvARB(int size, ByteBuffer pWeights, int pWeights_offset); public static void glWeightuARB(IntBuffer piWeights) { BufferChecks.checkDirect(piWeights); nglWeightuivARB(piWeights.remaining(), piWeights, piWeights.position()); } + private static native void nglWeightuivARB(int size, IntBuffer piWeights, int piWeights_offset); public static void glWeightuARB(ShortBuffer psWeights) { BufferChecks.checkDirect(psWeights); nglWeightusvARB(psWeights.remaining(), psWeights, psWeights.position()); } + private static native void nglWeightusvARB(int size, ShortBuffer psWeights, int psWeights_offset); public static void glWeightPointerARB(int size, boolean unsigned, int stride, ByteBuffer pPointer) { @@ -136,26 +144,33 @@ public final class ARBVertexBlend { GLBufferChecks.ensureArrayVBOdisabled(); nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pPointer, pPointer.position()); } + public static void glWeightPointerARB(int size, boolean unsigned, int stride, ShortBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pPointer, pPointer.position()<<1); + nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pPointer, pPointer.position() << 1); } + public static void glWeightPointerARB(int size, int stride, FloatBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglWeightPointerARB(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position()<<2); + nglWeightPointerARB(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position() << 2); } + public static void glWeightPointerARB(int size, boolean unsigned, int stride, IntBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pPointer, pPointer.position()<<2); + nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pPointer, pPointer.position() << 2); } + private static native void nglWeightPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_offset); + public static void glWeightPointerARB(int size, int type, int stride, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglWeightPointerARBVBO(size, type, stride, buffer_offset); } + private static native void nglWeightPointerARBVBO(int size, int type, int stride, int buffer_offset); + public static native void glVertexBlendARB(int count); } diff --git a/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java b/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java index 49b304e8..43494a8d 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java +++ b/src/java/org/lwjgl/opengl/ARBVertexBufferObject.java @@ -1,66 +1,67 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ARBVertexBufferObject extends ARBBufferObject { + /* * Accepted by the parameters of BindBufferARB, BufferDataARB, * BufferSubDataARB, MapBufferARB, UnmapBufferARB, * GetBufferSubDataARB, GetBufferParameterivARB, and * GetBufferPointervARB: */ - public static final int GL_ARRAY_BUFFER_ARB = 0x8892; - public static final int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893; + public static final int GL_ARRAY_BUFFER_ARB = 0x8892; + public static final int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894; - public static final int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895; - public static final int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896; - public static final int GL_NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897; - public static final int GL_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898; - public static final int GL_INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899; - public static final int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A; - public static final int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B; - public static final int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C; - public static final int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D; - public static final int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E; + public static final int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894; + public static final int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895; + public static final int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896; + public static final int GL_NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897; + public static final int GL_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898; + public static final int GL_INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899; + public static final int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A; + public static final int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B; + public static final int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C; + public static final int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D; + public static final int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E; /* * Accepted by the parameter of GetVertexAttribivARB: */ - public static final int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F; + public static final int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F; private ARBVertexBufferObject() { } diff --git a/src/java/org/lwjgl/opengl/ARBVertexProgram.java b/src/java/org/lwjgl/opengl/ARBVertexProgram.java index 00107e48..712ed97f 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexProgram.java +++ b/src/java/org/lwjgl/opengl/ARBVertexProgram.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,6 +41,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBVertexProgram extends ARBProgram { + /* * Accepted by the parameter of Disable, Enable, and IsEnabled, by the * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, diff --git a/src/java/org/lwjgl/opengl/ARBVertexShader.java b/src/java/org/lwjgl/opengl/ARBVertexShader.java index d297e45f..e70430da 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexShader.java +++ b/src/java/org/lwjgl/opengl/ARBVertexShader.java @@ -38,6 +38,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ARBVertexShader { + /* * Accepted by the argument of CreateShaderObjectARB and * returned by the parameter of GetObjectParameter{if}vARB: @@ -114,27 +115,20 @@ public final class ARBVertexShader { // --------------------------- // --------------------------- - public static void glGetActiveAttribARB(int programObj, int index, - IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { + public static void glGetActiveAttribARB(int programObj, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { BufferChecks.checkDirect(name); BufferChecks.checkDirect(size); BufferChecks.checkDirect(type); if ( length == null ) { - nglGetActiveAttribARB(programObj, index, name.remaining(), null, -1, - size, size.position(), type, type.position(), name, name.position()); + nglGetActiveAttribARB(programObj, index, name.remaining(), null, -1, size, size.position(), type, type.position(), name, name.position()); } else { BufferChecks.checkDirect(length); - nglGetActiveAttribARB(programObj, index, name.remaining(), length, length.position(), - size, size.position(), type, type.position(), name, name.position()); + nglGetActiveAttribARB(programObj, index, name.remaining(), length, length.position(), size, size.position(), type, type.position(), name, name.position()); } } - private static native void nglGetActiveAttribARB(int programObj, int index, int maxLength, - IntBuffer length, int lengthOffset, - IntBuffer size, int sizeOffset, - IntBuffer type, int typeOffset, - ByteBuffer name, int nameOffset); + private static native void nglGetActiveAttribARB(int programObj, int index, int maxLength, IntBuffer length, int lengthOffset, IntBuffer size, int sizeOffset, IntBuffer type, int typeOffset, ByteBuffer name, int nameOffset); // --------------------------- // --------------------------- diff --git a/src/java/org/lwjgl/opengl/ARBWindowPos.java b/src/java/org/lwjgl/opengl/ARBWindowPos.java index b491eff8..476f4940 100644 --- a/src/java/org/lwjgl/opengl/ARBWindowPos.java +++ b/src/java/org/lwjgl/opengl/ARBWindowPos.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,6 +34,7 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class ARBWindowPos { + private ARBWindowPos() { } diff --git a/src/java/org/lwjgl/opengl/ATIElementArray.java b/src/java/org/lwjgl/opengl/ATIElementArray.java index 5bffa88d..04cc4737 100644 --- a/src/java/org/lwjgl/opengl/ATIElementArray.java +++ b/src/java/org/lwjgl/opengl/ATIElementArray.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -40,9 +40,10 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ATIElementArray { - public static final int GL_ELEMENT_ARRAY_ATI = 0x8768; - public static final int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769; - public static final int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A; + + public static final int GL_ELEMENT_ARRAY_ATI = 0x8768; + public static final int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769; + public static final int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A; private ATIElementArray() { } @@ -54,24 +55,29 @@ public final class ATIElementArray { GLBufferChecks.ensureArrayVBOdisabled(); nglElementPointerATI(GL11.GL_UNSIGNED_BYTE, pPointer, pPointer.position()); } + public static void glElementPointerATI(ShortBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglElementPointerATI(GL11.GL_UNSIGNED_SHORT, pPointer, pPointer.position()<<1); + nglElementPointerATI(GL11.GL_UNSIGNED_SHORT, pPointer, pPointer.position() << 1); } + public static void glElementPointerATI(IntBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglElementPointerATI(GL11.GL_UNSIGNED_INT, pPointer, pPointer.position()<<2); + nglElementPointerATI(GL11.GL_UNSIGNED_INT, pPointer, pPointer.position() << 2); } + private static native void nglElementPointerATI(int type, Buffer pPointer, int pPointer_offset); public static void glElementPointerATI(int type, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglElementPointerATIVBO(type, buffer_offset); } + private static native void nglElementPointerATIVBO(int type, int buffer_offset); public static native void glDrawElementArrayATI(int mode, int count); + public static native void glDrawRangeElementArrayATI(int mode, int start, int end, int count); } diff --git a/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java b/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java index ee23edd2..85298165 100644 --- a/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java +++ b/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -38,14 +38,15 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ATIEnvmapBumpmap { - public static final int GL_BUMP_ROT_MATRIX_ATI = 0x8775; - public static final int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776; - public static final int GL_BUMP_NUM_TEX_UNITS_ATI = 0x8777; - public static final int GL_BUMP_TEX_UNITS_ATI = 0x8778; - public static final int GL_DUDV_ATI = 0x8779; - public static final int GL_DU8DV8_ATI = 0x877A; - public static final int GL_BUMP_ENVMAP_ATI = 0x877B; - public static final int GL_BUMP_TARGET_ATI = 0x877C; + + public static final int GL_BUMP_ROT_MATRIX_ATI = 0x8775; + public static final int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776; + public static final int GL_BUMP_NUM_TEX_UNITS_ATI = 0x8777; + public static final int GL_BUMP_TEX_UNITS_ATI = 0x8778; + public static final int GL_DUDV_ATI = 0x8779; + public static final int GL_DU8DV8_ATI = 0x877A; + public static final int GL_BUMP_ENVMAP_ATI = 0x877B; + public static final int GL_BUMP_TARGET_ATI = 0x877C; private ATIEnvmapBumpmap() { } @@ -56,23 +57,27 @@ public final class ATIEnvmapBumpmap { BufferChecks.checkBuffer(pfParam); nglTexBumpParameterfvATI(pname, pfParam, pfParam.position()); } + private static native void nglTexBumpParameterfvATI(int pname, FloatBuffer pfParam, int pfParam_offset); public static void glTexBumpParameterATI(int pname, IntBuffer piParam) { BufferChecks.checkBuffer(piParam); nglTexBumpParameterivATI(pname, piParam, piParam.position()); } + private static native void nglTexBumpParameterivATI(int pname, IntBuffer piParam, int piParam_offset); public static void glGetTexBumpParameterATI(int pname, FloatBuffer pfParam) { BufferChecks.checkBuffer(pfParam); nglGetTexBumpParameterfvATI(pname, pfParam, pfParam.position()); } + private static native void nglGetTexBumpParameterfvATI(int pname, FloatBuffer pfParam, int pfParam_offset); public static void glGetTexBumpParameterATI(int pname, IntBuffer piParam) { BufferChecks.checkBuffer(piParam); nglGetTexBumpParameterivATI(pname, piParam, piParam.position()); } + private static native void nglGetTexBumpParameterivATI(int pname, IntBuffer piParam, int piParam_offset); } diff --git a/src/java/org/lwjgl/opengl/ATIFragmentShader.java b/src/java/org/lwjgl/opengl/ATIFragmentShader.java index 3c27fcf3..6f44a1fd 100644 --- a/src/java/org/lwjgl/opengl/ATIFragmentShader.java +++ b/src/java/org/lwjgl/opengl/ATIFragmentShader.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -42,110 +42,111 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ATIFragmentShader { - public static final int GL_FRAGMENT_SHADER_ATI = 0x8920; - public static final int GL_REG_0_ATI = 0x8921; - public static final int GL_REG_1_ATI = 0x8922; - public static final int GL_REG_2_ATI = 0x8923; - public static final int GL_REG_3_ATI = 0x8924; - public static final int GL_REG_4_ATI = 0x8925; - public static final int GL_REG_5_ATI = 0x8926; - public static final int GL_REG_6_ATI = 0x8927; - public static final int GL_REG_7_ATI = 0x8928; - public static final int GL_REG_8_ATI = 0x8929; - public static final int GL_REG_9_ATI = 0x892A; - public static final int GL_REG_10_ATI = 0x892B; - public static final int GL_REG_11_ATI = 0x892C; - public static final int GL_REG_12_ATI = 0x892D; - public static final int GL_REG_13_ATI = 0x892E; - public static final int GL_REG_14_ATI = 0x892F; - public static final int GL_REG_15_ATI = 0x8930; - public static final int GL_REG_16_ATI = 0x8931; - public static final int GL_REG_17_ATI = 0x8932; - public static final int GL_REG_18_ATI = 0x8933; - public static final int GL_REG_19_ATI = 0x8934; - public static final int GL_REG_20_ATI = 0x8935; - public static final int GL_REG_21_ATI = 0x8936; - public static final int GL_REG_22_ATI = 0x8937; - public static final int GL_REG_23_ATI = 0x8938; - public static final int GL_REG_24_ATI = 0x8939; - public static final int GL_REG_25_ATI = 0x893A; - public static final int GL_REG_26_ATI = 0x893B; - public static final int GL_REG_27_ATI = 0x893C; - public static final int GL_REG_28_ATI = 0x893D; - public static final int GL_REG_29_ATI = 0x893E; - public static final int GL_REG_30_ATI = 0x893F; - public static final int GL_REG_31_ATI = 0x8940; - public static final int GL_CON_0_ATI = 0x8941; - public static final int GL_CON_1_ATI = 0x8942; - public static final int GL_CON_2_ATI = 0x8943; - public static final int GL_CON_3_ATI = 0x8944; - public static final int GL_CON_4_ATI = 0x8945; - public static final int GL_CON_5_ATI = 0x8946; - public static final int GL_CON_6_ATI = 0x8947; - public static final int GL_CON_7_ATI = 0x8948; - public static final int GL_CON_8_ATI = 0x8949; - public static final int GL_CON_9_ATI = 0x894A; - public static final int GL_CON_10_ATI = 0x894B; - public static final int GL_CON_11_ATI = 0x894C; - public static final int GL_CON_12_ATI = 0x894D; - public static final int GL_CON_13_ATI = 0x894E; - public static final int GL_CON_14_ATI = 0x894F; - public static final int GL_CON_15_ATI = 0x8950; - public static final int GL_CON_16_ATI = 0x8951; - public static final int GL_CON_17_ATI = 0x8952; - public static final int GL_CON_18_ATI = 0x8953; - public static final int GL_CON_19_ATI = 0x8954; - public static final int GL_CON_20_ATI = 0x8955; - public static final int GL_CON_21_ATI = 0x8956; - public static final int GL_CON_22_ATI = 0x8957; - public static final int GL_CON_23_ATI = 0x8958; - public static final int GL_CON_24_ATI = 0x8959; - public static final int GL_CON_25_ATI = 0x895A; - public static final int GL_CON_26_ATI = 0x895B; - public static final int GL_CON_27_ATI = 0x895C; - public static final int GL_CON_28_ATI = 0x895D; - public static final int GL_CON_29_ATI = 0x895E; - public static final int GL_CON_30_ATI = 0x895F; - public static final int GL_CON_31_ATI = 0x8960; - public static final int GL_MOV_ATI = 0x8961; - public static final int GL_ADD_ATI = 0x8963; - public static final int GL_MUL_ATI = 0x8964; - public static final int GL_SUB_ATI = 0x8965; - public static final int GL_DOT3_ATI = 0x8966; - public static final int GL_DOT4_ATI = 0x8967; - public static final int GL_MAD_ATI = 0x8968; - public static final int GL_LERP_ATI = 0x8969; - public static final int GL_CND_ATI = 0x896A; - public static final int GL_CND0_ATI = 0x896B; - public static final int GL_DOT2_ADD_ATI = 0x896C; - public static final int GL_SECONDARY_INTERPOLATOR_ATI = 0x896D; - public static final int GL_NUM_FRAGMENT_REGISTERS_ATI = 0x896E; - public static final int GL_NUM_FRAGMENT_CONSTANTS_ATI = 0x896F; - public static final int GL_NUM_PASSES_ATI = 0x8970; - public static final int GL_NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971; - public static final int GL_NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972; - public static final int GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973; - public static final int GL_NUM_LOOPBACK_COMPONENTS_ATI = 0x8974; - public static final int GL_COLOR_ALPHA_PAIRING_ATI = 0x8975; - public static final int GL_SWIZZLE_STR_ATI = 0x8976; - public static final int GL_SWIZZLE_STQ_ATI = 0x8977; - public static final int GL_SWIZZLE_STR_DR_ATI = 0x8978; - public static final int GL_SWIZZLE_STQ_DQ_ATI = 0x8979; - public static final int GL_SWIZZLE_STRQ_ATI = 0x897A; - public static final int GL_SWIZZLE_STRQ_DQ_ATI = 0x897B; - public static final int GL_RED_BIT_ATI = 0x00000001; - public static final int GL_GREEN_BIT_ATI = 0x00000002; - public static final int GL_BLUE_BIT_ATI = 0x00000004; - public static final int GL_X2_BIT_ATI = 0x00000001; - public static final int GL_X4_BIT_ATI = 0x00000002; - public static final int GL_X8_BIT_ATI = 0x00000004; - public static final int GL_HALF_BIT_ATI = 0x00000008; - public static final int GL_QUARTER_BIT_ATI = 0x00000010; - public static final int GL_EIGHTH_BIT_ATI = 0x00000020; - public static final int GL_SATURATE_BIT_ATI = 0x00000040; - public static final int GL_COMP_BIT_ATI = 0x00000002; - public static final int GL_NEGATE_BIT_ATI = 0x00000004; - public static final int GL_BIAS_BIT_ATI = 0x00000008; + + public static final int GL_FRAGMENT_SHADER_ATI = 0x8920; + public static final int GL_REG_0_ATI = 0x8921; + public static final int GL_REG_1_ATI = 0x8922; + public static final int GL_REG_2_ATI = 0x8923; + public static final int GL_REG_3_ATI = 0x8924; + public static final int GL_REG_4_ATI = 0x8925; + public static final int GL_REG_5_ATI = 0x8926; + public static final int GL_REG_6_ATI = 0x8927; + public static final int GL_REG_7_ATI = 0x8928; + public static final int GL_REG_8_ATI = 0x8929; + public static final int GL_REG_9_ATI = 0x892A; + public static final int GL_REG_10_ATI = 0x892B; + public static final int GL_REG_11_ATI = 0x892C; + public static final int GL_REG_12_ATI = 0x892D; + public static final int GL_REG_13_ATI = 0x892E; + public static final int GL_REG_14_ATI = 0x892F; + public static final int GL_REG_15_ATI = 0x8930; + public static final int GL_REG_16_ATI = 0x8931; + public static final int GL_REG_17_ATI = 0x8932; + public static final int GL_REG_18_ATI = 0x8933; + public static final int GL_REG_19_ATI = 0x8934; + public static final int GL_REG_20_ATI = 0x8935; + public static final int GL_REG_21_ATI = 0x8936; + public static final int GL_REG_22_ATI = 0x8937; + public static final int GL_REG_23_ATI = 0x8938; + public static final int GL_REG_24_ATI = 0x8939; + public static final int GL_REG_25_ATI = 0x893A; + public static final int GL_REG_26_ATI = 0x893B; + public static final int GL_REG_27_ATI = 0x893C; + public static final int GL_REG_28_ATI = 0x893D; + public static final int GL_REG_29_ATI = 0x893E; + public static final int GL_REG_30_ATI = 0x893F; + public static final int GL_REG_31_ATI = 0x8940; + public static final int GL_CON_0_ATI = 0x8941; + public static final int GL_CON_1_ATI = 0x8942; + public static final int GL_CON_2_ATI = 0x8943; + public static final int GL_CON_3_ATI = 0x8944; + public static final int GL_CON_4_ATI = 0x8945; + public static final int GL_CON_5_ATI = 0x8946; + public static final int GL_CON_6_ATI = 0x8947; + public static final int GL_CON_7_ATI = 0x8948; + public static final int GL_CON_8_ATI = 0x8949; + public static final int GL_CON_9_ATI = 0x894A; + public static final int GL_CON_10_ATI = 0x894B; + public static final int GL_CON_11_ATI = 0x894C; + public static final int GL_CON_12_ATI = 0x894D; + public static final int GL_CON_13_ATI = 0x894E; + public static final int GL_CON_14_ATI = 0x894F; + public static final int GL_CON_15_ATI = 0x8950; + public static final int GL_CON_16_ATI = 0x8951; + public static final int GL_CON_17_ATI = 0x8952; + public static final int GL_CON_18_ATI = 0x8953; + public static final int GL_CON_19_ATI = 0x8954; + public static final int GL_CON_20_ATI = 0x8955; + public static final int GL_CON_21_ATI = 0x8956; + public static final int GL_CON_22_ATI = 0x8957; + public static final int GL_CON_23_ATI = 0x8958; + public static final int GL_CON_24_ATI = 0x8959; + public static final int GL_CON_25_ATI = 0x895A; + public static final int GL_CON_26_ATI = 0x895B; + public static final int GL_CON_27_ATI = 0x895C; + public static final int GL_CON_28_ATI = 0x895D; + public static final int GL_CON_29_ATI = 0x895E; + public static final int GL_CON_30_ATI = 0x895F; + public static final int GL_CON_31_ATI = 0x8960; + public static final int GL_MOV_ATI = 0x8961; + public static final int GL_ADD_ATI = 0x8963; + public static final int GL_MUL_ATI = 0x8964; + public static final int GL_SUB_ATI = 0x8965; + public static final int GL_DOT3_ATI = 0x8966; + public static final int GL_DOT4_ATI = 0x8967; + public static final int GL_MAD_ATI = 0x8968; + public static final int GL_LERP_ATI = 0x8969; + public static final int GL_CND_ATI = 0x896A; + public static final int GL_CND0_ATI = 0x896B; + public static final int GL_DOT2_ADD_ATI = 0x896C; + public static final int GL_SECONDARY_INTERPOLATOR_ATI = 0x896D; + public static final int GL_NUM_FRAGMENT_REGISTERS_ATI = 0x896E; + public static final int GL_NUM_FRAGMENT_CONSTANTS_ATI = 0x896F; + public static final int GL_NUM_PASSES_ATI = 0x8970; + public static final int GL_NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971; + public static final int GL_NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972; + public static final int GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973; + public static final int GL_NUM_LOOPBACK_COMPONENTS_ATI = 0x8974; + public static final int GL_COLOR_ALPHA_PAIRING_ATI = 0x8975; + public static final int GL_SWIZZLE_STR_ATI = 0x8976; + public static final int GL_SWIZZLE_STQ_ATI = 0x8977; + public static final int GL_SWIZZLE_STR_DR_ATI = 0x8978; + public static final int GL_SWIZZLE_STQ_DQ_ATI = 0x8979; + public static final int GL_SWIZZLE_STRQ_ATI = 0x897A; + public static final int GL_SWIZZLE_STRQ_DQ_ATI = 0x897B; + public static final int GL_RED_BIT_ATI = 0x00000001; + public static final int GL_GREEN_BIT_ATI = 0x00000002; + public static final int GL_BLUE_BIT_ATI = 0x00000004; + public static final int GL_X2_BIT_ATI = 0x00000001; + public static final int GL_X4_BIT_ATI = 0x00000002; + public static final int GL_X8_BIT_ATI = 0x00000004; + public static final int GL_HALF_BIT_ATI = 0x00000008; + public static final int GL_QUARTER_BIT_ATI = 0x00000010; + public static final int GL_EIGHTH_BIT_ATI = 0x00000020; + public static final int GL_SATURATE_BIT_ATI = 0x00000040; + public static final int GL_COMP_BIT_ATI = 0x00000002; + public static final int GL_NEGATE_BIT_ATI = 0x00000004; + public static final int GL_BIAS_BIT_ATI = 0x00000008; private ATIFragmentShader() { } @@ -166,78 +167,22 @@ public final class ATIFragmentShader { public static native void glSampleMapATI(int dst, int interp, int swizzle); - public static native void glColorFragmentOp1ATI( - int op, - int dst, - int dstMask, - int dstMod, - int arg1, - int arg1Rep, - int arg1Mod); + public static native void glColorFragmentOp1ATI(int op, int dst, int dstMask, int dstMod, int arg1, int arg1Rep, int arg1Mod); - public static native void glColorFragmentOp2ATI( - int op, - int dst, - int dstMask, - int dstMod, - int arg1, - int arg1Rep, - int arg1Mod, - int arg2, - int arg2Rep, - int arg2Mod); + public static native void glColorFragmentOp2ATI(int op, int dst, int dstMask, int dstMod, int arg1, int arg1Rep, int arg1Mod, int arg2, int arg2Rep, int arg2Mod); - public static native void glColorFragmentOp3ATI( - int op, - int dst, - int dstMask, - int dstMod, - int arg1, - int arg1Rep, - int arg1Mod, - int arg2, - int arg2Rep, - int arg2Mod, - int arg3, - int arg3Rep, - int arg3Mod); + public static native void glColorFragmentOp3ATI(int op, int dst, int dstMask, int dstMod, int arg1, int arg1Rep, int arg1Mod, int arg2, int arg2Rep, int arg2Mod, int arg3, int arg3Rep, int arg3Mod); - public static native void glAlphaFragmentOp1ATI( - int op, - int dst, - int dstMod, - int arg1, - int arg1Rep, - int arg1Mod); + public static native void glAlphaFragmentOp1ATI(int op, int dst, int dstMod, int arg1, int arg1Rep, int arg1Mod); - public static native void glAlphaFragmentOp2ATI( - int op, - int dst, - int dstMod, - int arg1, - int arg1Rep, - int arg1Mod, - int arg2, - int arg2Rep, - int arg2Mod); + public static native void glAlphaFragmentOp2ATI(int op, int dst, int dstMod, int arg1, int arg1Rep, int arg1Mod, int arg2, int arg2Rep, int arg2Mod); - public static native void glAlphaFragmentOp3ATI( - int op, - int dst, - int dstMod, - int arg1, - int arg1Rep, - int arg1Mod, - int arg2, - int arg2Rep, - int arg2Mod, - int arg3, - int arg3Rep, - int arg3Mod); + public static native void glAlphaFragmentOp3ATI(int op, int dst, int dstMod, int arg1, int arg1Rep, int arg1Mod, int arg2, int arg2Rep, int arg2Mod, int arg3, int arg3Rep, int arg3Mod); public static void glSetFragmentShaderConstantATI(int dst, FloatBuffer pfValue) { BufferChecks.checkBuffer(pfValue); // TODO:is this correct? nglSetFragmentShaderConstantATI(dst, pfValue, pfValue.position()); } + private static native void nglSetFragmentShaderConstantATI(int dst, FloatBuffer pfValue, int pfValue_offset); } diff --git a/src/java/org/lwjgl/opengl/ATIPnTriangles.java b/src/java/org/lwjgl/opengl/ATIPnTriangles.java index fd790c2e..c20fe27a 100644 --- a/src/java/org/lwjgl/opengl/ATIPnTriangles.java +++ b/src/java/org/lwjgl/opengl/ATIPnTriangles.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,16 +34,17 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class ATIPnTriangles { - public static final int GL_PN_TRIANGLES_ATI = 0x87F0; - public static final int GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1; - public static final int GL_PN_TRIANGLES_POINT_MODE_ATI = 0x87F2; - public static final int GL_PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3; - public static final int GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4; - public static final int GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5; - public static final int GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6; - public static final int GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7; - public static final int GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8; - + + public static final int GL_PN_TRIANGLES_ATI = 0x87F0; + public static final int GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1; + public static final int GL_PN_TRIANGLES_POINT_MODE_ATI = 0x87F2; + public static final int GL_PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3; + public static final int GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4; + public static final int GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5; + public static final int GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6; + public static final int GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7; + public static final int GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8; + private ATIPnTriangles() { } diff --git a/src/java/org/lwjgl/opengl/ATISeparateStencil.java b/src/java/org/lwjgl/opengl/ATISeparateStencil.java index acd972d9..7b95ee48 100644 --- a/src/java/org/lwjgl/opengl/ATISeparateStencil.java +++ b/src/java/org/lwjgl/opengl/ATISeparateStencil.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,10 +34,11 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class ATISeparateStencil { - public static final int GL_STENCIL_BACK_FUNC_ATI = 0x8800; - public static final int GL_STENCIL_BACK_FAIL_ATI = 0x8801; - public static final int GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI = 0x8802; - public static final int GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI = 0x8803; + + public static final int GL_STENCIL_BACK_FUNC_ATI = 0x8800; + public static final int GL_STENCIL_BACK_FAIL_ATI = 0x8801; + public static final int GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI = 0x8802; + public static final int GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI = 0x8803; private ATISeparateStencil() { } @@ -45,5 +46,6 @@ public final class ATISeparateStencil { static native void initNativeStubs() throws LWJGLException; public static native void glStencilOpSeparateATI(int face, int sfail, int dpfail, int dppass); + public static native void glStencilFuncSeparateATI(int frontfunc, int backfunc, int ref, int mask); } diff --git a/src/java/org/lwjgl/opengl/ATITextureFloat.java b/src/java/org/lwjgl/opengl/ATITextureFloat.java index eb58e88a..045eb724 100644 --- a/src/java/org/lwjgl/opengl/ATITextureFloat.java +++ b/src/java/org/lwjgl/opengl/ATITextureFloat.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ATITextureFloat { + /* * Accepted by the parameter of TexImage1D, * TexImage2D, and TexImage3D: diff --git a/src/java/org/lwjgl/opengl/ATITextureMirrorOnce.java b/src/java/org/lwjgl/opengl/ATITextureMirrorOnce.java index d292869e..a139a954 100644 --- a/src/java/org/lwjgl/opengl/ATITextureMirrorOnce.java +++ b/src/java/org/lwjgl/opengl/ATITextureMirrorOnce.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class ATITextureMirrorOnce { - public static final int GL_MIRROR_CLAMP_ATI = 0x8742; - public static final int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743; + + public static final int GL_MIRROR_CLAMP_ATI = 0x8742; + public static final int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743; private ATITextureMirrorOnce() { } diff --git a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java b/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java index ff910f42..8b153b90 100644 --- a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java +++ b/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,15 +41,16 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ATIVertexArrayObject { - public static final int GL_STATIC_ATI = 0x8760; - public static final int GL_DYNAMIC_ATI = 0x8761; - public static final int GL_PRESERVE_ATI = 0x8762; - public static final int GL_DISCARD_ATI = 0x8763; - public static final int GL_OBJECT_BUFFER_SIZE_ATI = 0x8764; - public static final int GL_OBJECT_BUFFER_USAGE_ATI = 0x8765; - public static final int GL_ARRAY_OBJECT_BUFFER_ATI = 0x8766; - public static final int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767; - + + public static final int GL_STATIC_ATI = 0x8760; + public static final int GL_DYNAMIC_ATI = 0x8761; + public static final int GL_PRESERVE_ATI = 0x8762; + public static final int GL_DISCARD_ATI = 0x8763; + public static final int GL_OBJECT_BUFFER_SIZE_ATI = 0x8764; + public static final int GL_OBJECT_BUFFER_USAGE_ATI = 0x8765; + public static final int GL_ARRAY_OBJECT_BUFFER_ATI = 0x8766; + public static final int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767; + private ATIVertexArrayObject() { } @@ -59,87 +60,93 @@ public final class ATIVertexArrayObject { BufferChecks.checkDirectOrNull(pPointer); return nglNewObjectBufferATI(pPointer != null ? pPointer.remaining() : size, pPointer, pPointer != null ? pPointer.position() : 0, usage); } + public static int glNewObjectBufferATI(int size, ShortBuffer pPointer, int usage) { BufferChecks.checkDirectOrNull(pPointer); - return nglNewObjectBufferATI(pPointer != null ? pPointer.remaining()<<1 : size, pPointer, pPointer != null ? pPointer.position()<<1 : 0, usage); + return nglNewObjectBufferATI(pPointer != null ? pPointer.remaining() << 1 : size, pPointer, pPointer != null ? pPointer.position() << 1 : 0, usage); } + public static int glNewObjectBufferATI(int size, FloatBuffer pPointer, int usage) { BufferChecks.checkDirectOrNull(pPointer); - return nglNewObjectBufferATI(pPointer != null ? pPointer.remaining()<<2 : size, pPointer, pPointer != null ? pPointer.position()<<2 : 0, usage); + return nglNewObjectBufferATI(pPointer != null ? pPointer.remaining() << 2 : size, pPointer, pPointer != null ? pPointer.position() << 2 : 0, usage); } + public static int glNewObjectBufferATI(int size, IntBuffer pPointer, int usage) { BufferChecks.checkDirectOrNull(pPointer); - return nglNewObjectBufferATI(pPointer != null ? pPointer.remaining()<<2 : size, pPointer, pPointer != null ? pPointer.position()<<2 : 0, usage); + return nglNewObjectBufferATI(pPointer != null ? pPointer.remaining() << 2 : size, pPointer, pPointer != null ? pPointer.position() << 2 : 0, usage); } + private static native int nglNewObjectBufferATI(int size, Buffer pPointer, int pPointer_offset, int usage); + public static native boolean glIsObjectBufferATI(int buffer); public static void glUpdateObjectBufferATI(int buffer, int offset, ByteBuffer pPointer, int preserve) { BufferChecks.checkDirect(pPointer); nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining(), pPointer, pPointer.position(), preserve); } + public static void glUpdateObjectBufferATI(int buffer, int offset, ShortBuffer pPointer, int preserve) { BufferChecks.checkDirect(pPointer); - nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining()<<1, pPointer, pPointer.position()<<1, preserve); + nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining() << 1, pPointer, pPointer.position() << 1, preserve); } + public static void glUpdateObjectBufferATI(int buffer, int offset, FloatBuffer pPointer, int preserve) { BufferChecks.checkDirect(pPointer); - nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining()<<2, pPointer, pPointer.position()<<2, preserve); + nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining() << 2, pPointer, pPointer.position() << 2, preserve); } + public static void glUpdateObjectBufferATI(int buffer, int offset, IntBuffer pPointer, int preserve) { BufferChecks.checkDirect(pPointer); - nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining()<<2, pPointer, pPointer.position()<<2, preserve); + nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining() << 2, pPointer, pPointer.position() << 2, preserve); } + private static native void nglUpdateObjectBufferATI(int buffer, int offset, int size, Buffer pPointer, int pPointer_offset, int preserve); public static void glGetObjectBufferATI(int buffer, int pname, FloatBuffer pfParams) { BufferChecks.checkDirect(pfParams); nglGetObjectBufferfvATI(buffer, pname, pfParams, pfParams.position()); } + private static native void nglGetObjectBufferfvATI(int buffer, int pname, FloatBuffer pfParams, int pfParams_offset); public static void glGetObjectBufferATI(int buffer, int pname, IntBuffer piParams) { BufferChecks.checkDirect(piParams); nglGetObjectBufferivATI(buffer, pname, piParams, piParams.position()); } + private static native void nglGetObjectBufferivATI(int buffer, int pname, IntBuffer piParams, int piParams_offset); + public static native void glFreeObjectBufferATI(int buffer); - public static native void glArrayObjectATI( - int array, - int size, - int type, - int stride, - int buffer, - int offset); + + public static native void glArrayObjectATI(int array, int size, int type, int stride, int buffer, int offset); public static void glGetArrayObjectATI(int array, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglGetArrayObjectfvATI(array, pname, pfParams, pfParams.position()); } + private static native void nglGetArrayObjectfvATI(int array, int pname, FloatBuffer pfParams, int pfParams_offset); public static void glGetArrayObjectATI(int array, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglGetArrayObjectivATI(array, pname, piParams, piParams.position()); } + private static native void nglGetArrayObjectivATI(int array, int pname, IntBuffer piParams, int piParams_offset); - public static native void glVariantArrayObjectATI( - int id, - int type, - int stride, - int buffer, - int offset); + public static native void glVariantArrayObjectATI(int id, int type, int stride, int buffer, int offset); public static void glGetVariantArrayObjectATI(int id, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglGetVariantArrayObjectfvATI(id, pname, pfParams, pfParams.position()); } + private static native void nglGetVariantArrayObjectfvATI(int id, int pname, FloatBuffer pfParams, int pfParams_offset_offset); public static void glGetVariantArrayObjectATI(int id, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglGetVariantArrayObjectivATI(id, pname, piParams, piParams.position()); } + private static native void nglGetVariantArrayObjectivATI(int id, int pname, IntBuffer piParams, int piParams_offset); } diff --git a/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java b/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java index e382fdd8..faa736a5 100644 --- a/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java +++ b/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -38,14 +38,13 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class ATIVertexAttribArrayObject { + private ATIVertexAttribArrayObject() { } static native void initNativeStubs() throws LWJGLException; - public static native void glVertexAttribArrayObjectATI(int index, int size, int type, - boolean normalized, int stride, int buffer, - int offset); + public static native void glVertexAttribArrayObjectATI(int index, int size, int type, boolean normalized, int stride, int buffer, int offset); // --------------------------- public static void glGetVertexAttribArrayObjectATI(int index, int pname, FloatBuffer params) { @@ -53,9 +52,7 @@ public final class ATIVertexAttribArrayObject { nglGetVertexAttribArrayObjectfvATI(index, pname, params, params.position()); } - private static native void nglGetVertexAttribArrayObjectfvATI(int index, int pname, - FloatBuffer params, - int paramsOffset); + private static native void nglGetVertexAttribArrayObjectfvATI(int index, int pname, FloatBuffer params, int paramsOffset); // --------------------------- // --------------------------- @@ -64,8 +61,7 @@ public final class ATIVertexAttribArrayObject { nglGetVertexAttribArrayObjectivATI(index, pname, params, params.position()); } - private static native void nglGetVertexAttribArrayObjectivATI(int index, int pname, - IntBuffer params, int paramsOffset); + private static native void nglGetVertexAttribArrayObjectivATI(int index, int pname, IntBuffer params, int paramsOffset); // --------------------------- } diff --git a/src/java/org/lwjgl/opengl/ATIVertexStreams.java b/src/java/org/lwjgl/opengl/ATIVertexStreams.java index bab55833..b9e614bc 100644 --- a/src/java/org/lwjgl/opengl/ATIVertexStreams.java +++ b/src/java/org/lwjgl/opengl/ATIVertexStreams.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,16 +34,17 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class ATIVertexStreams { - public static final int GL_MAX_VERTEX_STREAMS_ATI = 0x876B; - public static final int GL_VERTEX_SOURCE_ATI = 0x876C; - public static final int GL_VERTEX_STREAM0_ATI = 0x876D; - public static final int GL_VERTEX_STREAM1_ATI = 0x876E; - public static final int GL_VERTEX_STREAM2_ATI = 0x876F; - public static final int GL_VERTEX_STREAM3_ATI = 0x8770; - public static final int GL_VERTEX_STREAM4_ATI = 0x8771; - public static final int GL_VERTEX_STREAM5_ATI = 0x8772; - public static final int GL_VERTEX_STREAM6_ATI = 0x8773; - public static final int GL_VERTEX_STREAM7_ATI = 0x8774; + + public static final int GL_MAX_VERTEX_STREAMS_ATI = 0x876B; + public static final int GL_VERTEX_SOURCE_ATI = 0x876C; + public static final int GL_VERTEX_STREAM0_ATI = 0x876D; + public static final int GL_VERTEX_STREAM1_ATI = 0x876E; + public static final int GL_VERTEX_STREAM2_ATI = 0x876F; + public static final int GL_VERTEX_STREAM3_ATI = 0x8770; + public static final int GL_VERTEX_STREAM4_ATI = 0x8771; + public static final int GL_VERTEX_STREAM5_ATI = 0x8772; + public static final int GL_VERTEX_STREAM6_ATI = 0x8773; + public static final int GL_VERTEX_STREAM7_ATI = 0x8774; private ATIVertexStreams() { } @@ -51,37 +52,40 @@ public final class ATIVertexStreams { static native void initNativeStubs() throws LWJGLException; public static native void glVertexStream1fATI(int stream, float x); + public static native void glVertexStream1iATI(int stream, int x); + public static native void glVertexStream1sATI(int stream, short x); + public static native void glVertexStream2fATI(int stream, float x, float y); + public static native void glVertexStream2iATI(int stream, int x, int y); + public static native void glVertexStream2sATI(int stream, short x, short y); + public static native void glVertexStream3fATI(int stream, float x, float y, float z); + public static native void glVertexStream3iATI(int stream, int x, int y, int z); + public static native void glVertexStream3sATI(int stream, short x, short y, short z); - public static native void glVertexStream4fATI( - int stream, - float x, - float y, - float z, - float w); - public static native void glVertexStream4iATI( - int stream, - int x, - int y, - int z, - int w); - public static native void glVertexStream4sATI( - int stream, - short x, - short y, - short z, - short w); + + public static native void glVertexStream4fATI(int stream, float x, float y, float z, float w); + + public static native void glVertexStream4iATI(int stream, int x, int y, int z, int w); + + public static native void glVertexStream4sATI(int stream, short x, short y, short z, short w); + public static native void glNormalStream3bATI(int stream, byte x, byte y, byte z); + public static native void glNormalStream3fATI(int stream, float x, float y, float z); + public static native void glNormalStream3iATI(int stream, int x, int y, int z); + public static native void glNormalStream3sATI(int stream, short x, short y, short z); + public static native void glClientActiveVertexStreamATI(int stream); + public static native void glVertexBlendEnvfATI(int pname, float param); + public static native void glVertexBlendEnviATI(int pname, int param); } diff --git a/src/java/org/lwjgl/opengl/EXTAbgr.java b/src/java/org/lwjgl/opengl/EXTAbgr.java index 8bf96533..6370d7f5 100644 --- a/src/java/org/lwjgl/opengl/EXTAbgr.java +++ b/src/java/org/lwjgl/opengl/EXTAbgr.java @@ -1,38 +1,39 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class EXTAbgr { - public static final int GL_ABGR_EXT = 0x8000; + + public static final int GL_ABGR_EXT = 0x8000; private EXTAbgr() { } diff --git a/src/java/org/lwjgl/opengl/EXTBgra.java b/src/java/org/lwjgl/opengl/EXTBgra.java index 749e6d5c..5316970f 100644 --- a/src/java/org/lwjgl/opengl/EXTBgra.java +++ b/src/java/org/lwjgl/opengl/EXTBgra.java @@ -1,44 +1,45 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - package org.lwjgl.opengl; +package org.lwjgl.opengl; /** * EXT_bgra_constants - * + * * @author cas */ public final class EXTBgra { - public static final int GL_BGR_EXT = 0x80E0; - public static final int GL_BGRA_EXT = 0x80E1; + + public static final int GL_BGR_EXT = 0x80E0; + public static final int GL_BGRA_EXT = 0x80E1; private EXTBgra() { } diff --git a/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java b/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java index c3f7861f..cdc19b73 100644 --- a/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java +++ b/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,6 +34,7 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class EXTBlendEquationSeparate { + /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: diff --git a/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java b/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java index 2d4b3604..89a46430 100644 --- a/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java +++ b/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -33,15 +33,12 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; -/** - * Insert the type's description here. - * Creation date: (29/06/2000 00:45:10) - */ public final class EXTBlendFuncSeparate { - public static final int GL_BLEND_DST_RGB_EXT = 0x80C8; - public static final int GL_BLEND_SRC_RGB_EXT = 0x80C9; - public static final int GL_BLEND_DST_ALPHA_EXT = 0x80CA; - public static final int GL_BLEND_SRC_ALPHA_EXT = 0x80CB; + + public static final int GL_BLEND_DST_RGB_EXT = 0x80C8; + public static final int GL_BLEND_SRC_RGB_EXT = 0x80C9; + public static final int GL_BLEND_DST_ALPHA_EXT = 0x80CA; + public static final int GL_BLEND_SRC_ALPHA_EXT = 0x80CB; private EXTBlendFuncSeparate() { } diff --git a/src/java/org/lwjgl/opengl/EXTBlendSubtract.java b/src/java/org/lwjgl/opengl/EXTBlendSubtract.java index 911a3a59..fa53ddf2 100644 --- a/src/java/org/lwjgl/opengl/EXTBlendSubtract.java +++ b/src/java/org/lwjgl/opengl/EXTBlendSubtract.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -33,11 +33,13 @@ package org.lwjgl.opengl; /** * EXT_blend_subtract constants + * * @author cas */ public final class EXTBlendSubtract { - public static final int GL_FUNC_SUBTRACT_EXT = 0x800A; - public static final int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B; + + public static final int GL_FUNC_SUBTRACT_EXT = 0x800A; + public static final int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B; private EXTBlendSubtract() { } diff --git a/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java b/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java index 2f07016c..123d0773 100644 --- a/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java +++ b/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,8 +34,9 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class EXTCompiledVertexArray { - public static final int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8; - public static final int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9; + + public static final int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8; + public static final int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9; private EXTCompiledVertexArray() { } @@ -43,5 +44,6 @@ public final class EXTCompiledVertexArray { static native void initNativeStubs() throws LWJGLException; public static native void glLockArraysEXT(int first, int count); + public static native void glUnlockArraysEXT(); } diff --git a/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java b/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java index 0bf42624..b128f1b3 100644 --- a/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java +++ b/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,6 +34,7 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class EXTDepthBoundsTest { + /* Accepted by the parameter of Enable, Disable, and IsEnabled, and by the parameter of GetBooleanv, GetIntegerv, diff --git a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java b/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java index 85bbf922..fc0ef926 100644 --- a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java +++ b/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -40,8 +40,9 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class EXTDrawRangeElements { - public static final int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8; - public static final int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9; + + public static final int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8; + public static final int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9; private EXTDrawRangeElements() { } @@ -53,21 +54,25 @@ public final class EXTDrawRangeElements { GLBufferChecks.ensureElementVBOdisabled(); nglDrawRangeElementsEXT(mode, start, end, pIndices.remaining(), GL11.GL_UNSIGNED_BYTE, pIndices, pIndices.position()); } + public static void glDrawRangeElementsEXT(int mode, int start, int end, ShortBuffer pIndices) { BufferChecks.checkDirect(pIndices); GLBufferChecks.ensureElementVBOdisabled(); - nglDrawRangeElementsEXT(mode, start, end, pIndices.remaining(), GL11.GL_UNSIGNED_SHORT, pIndices, pIndices.position()<<1); + nglDrawRangeElementsEXT(mode, start, end, pIndices.remaining(), GL11.GL_UNSIGNED_SHORT, pIndices, pIndices.position() << 1); } + public static void glDrawRangeElementsEXT(int mode, int start, int end, IntBuffer pIndices) { BufferChecks.checkDirect(pIndices); GLBufferChecks.ensureElementVBOdisabled(); - nglDrawRangeElementsEXT(mode, start, end, pIndices.remaining(), GL11.GL_UNSIGNED_INT, pIndices, pIndices.position()<<2); + nglDrawRangeElementsEXT(mode, start, end, pIndices.remaining(), GL11.GL_UNSIGNED_INT, pIndices, pIndices.position() << 2); } + private static native void nglDrawRangeElementsEXT(int mode, int start, int end, int count, int type, Buffer pIndices, int pIndices_offset); public static void glDrawRangeElementsEXT(int mode, int start, int end, int count, int type, int buffer_offset) { GLBufferChecks.ensureElementVBOenabled(); nglDrawRangeElementsEXTVBO(mode, start, end, count, type, buffer_offset); } + private static native void nglDrawRangeElementsEXTVBO(int mode, int start, int end, int count, int type, int buffer_offset); } diff --git a/src/java/org/lwjgl/opengl/EXTFogCoord.java b/src/java/org/lwjgl/opengl/EXTFogCoord.java index 05813993..e93ebb32 100644 --- a/src/java/org/lwjgl/opengl/EXTFogCoord.java +++ b/src/java/org/lwjgl/opengl/EXTFogCoord.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -38,14 +38,15 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class EXTFogCoord { - public static final int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450; - public static final int GL_FOG_COORDINATE_EXT = 0x8451; - public static final int GL_FRAGMENT_DEPTH_EXT = 0x8452; - public static final int GL_CURRENT_FOG_COORDINATE_EXT = 0x8453; - public static final int GL_FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454; - public static final int GL_FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455; - public static final int GL_FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456; - public static final int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457; + + public static final int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450; + public static final int GL_FOG_COORDINATE_EXT = 0x8451; + public static final int GL_FRAGMENT_DEPTH_EXT = 0x8452; + public static final int GL_CURRENT_FOG_COORDINATE_EXT = 0x8453; + public static final int GL_FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454; + public static final int GL_FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455; + public static final int GL_FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456; + public static final int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457; private EXTFogCoord() { } @@ -53,15 +54,19 @@ public final class EXTFogCoord { static native void initNativeStubs() throws LWJGLException; public static native void glFogCoordfEXT(float coord); + public static void glFogCoordPointerEXT(int stride, FloatBuffer data) { BufferChecks.checkDirect(data); GLBufferChecks.ensureArrayVBOdisabled(); nglFogCoordPointerEXT(GL11.GL_FLOAT, stride, data, data.position() << 2); } + private static native void nglFogCoordPointerEXT(int type, int stride, Buffer data, int data_offset); + public static void glFogCoordPointerEXT(int type, int stride, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglFogCoordPointerEXTVBO(type, stride, buffer_offset); } + private static native void nglFogCoordPointerEXTVBO(int type, int stride, int buffer_offset); } diff --git a/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java b/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java index d49d65e0..fae9925e 100644 --- a/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java +++ b/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,6 +37,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class EXTMultiDrawArrays { + private EXTMultiDrawArrays() { } @@ -45,10 +46,11 @@ public final class EXTMultiDrawArrays { public static void glMultiDrawArraysEXT(int mode, IntBuffer piFirst, IntBuffer piCount) { BufferChecks.checkDirect(piFirst); BufferChecks.checkDirect(piCount); - if (piFirst.remaining() != piCount.remaining()) { + if ( piFirst.remaining() != piCount.remaining() ) { throw new IllegalArgumentException("piFirst.remaining() != piCount.remaining()"); } nglMultiDrawArraysEXT(mode, piFirst, piFirst.position(), piCount, piCount.position(), piFirst.remaining()); } + private static native void nglMultiDrawArraysEXT(int mode, IntBuffer piFirst, int piFirst_offset, IntBuffer piCount, int piCount_offset, int primcount); } diff --git a/src/java/org/lwjgl/opengl/EXTPackedPixels.java b/src/java/org/lwjgl/opengl/EXTPackedPixels.java index 08cd378e..925a4fde 100644 --- a/src/java/org/lwjgl/opengl/EXTPackedPixels.java +++ b/src/java/org/lwjgl/opengl/EXTPackedPixels.java @@ -1,46 +1,43 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; -/** - * Insert the type's description here. - * Creation date: (07/11/99 19:16:17) - */ public final class EXTPackedPixels { - public static final int GL_UNSIGNED_BYTE_3_3_2_EXT = 0x8032; - public static final int GL_UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033; - public static final int GL_UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034; - public static final int GL_UNSIGNED_INT_8_8_8_8_EXT = 0x8035; - public static final int GL_UNSIGNED_INT_10_10_10_2_EXT = 0x8036; + + public static final int GL_UNSIGNED_BYTE_3_3_2_EXT = 0x8032; + public static final int GL_UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033; + public static final int GL_UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034; + public static final int GL_UNSIGNED_INT_8_8_8_8_EXT = 0x8035; + public static final int GL_UNSIGNED_INT_10_10_10_2_EXT = 0x8036; private EXTPackedPixels() { } diff --git a/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java b/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java index 30b04ba8..cc60aefa 100644 --- a/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java +++ b/src/java/org/lwjgl/opengl/EXTPixelBufferObject.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class EXTPixelBufferObject extends ARBBufferObject { + /* - * Accepted by the parameters of BindBuffer, BufferData, + * Accepted by the parameters of BindBuffer, BufferData, * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, * GetBufferParameteriv, and GetBufferPointerv: */ diff --git a/src/java/org/lwjgl/opengl/EXTPointParameters.java b/src/java/org/lwjgl/opengl/EXTPointParameters.java index 7f1555fa..98631fa3 100644 --- a/src/java/org/lwjgl/opengl/EXTPointParameters.java +++ b/src/java/org/lwjgl/opengl/EXTPointParameters.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,10 +37,11 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class EXTPointParameters { - public static final int GL_POINT_SIZE_MIN_EXT = 0x8126; - public static final int GL_POINT_SIZE_MAX_EXT = 0x8127; - public static final int GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128; - public static final int GL_DISTANCE_ATTENUATION_EXT = 0x8129; + + public static final int GL_POINT_SIZE_MIN_EXT = 0x8126; + public static final int GL_POINT_SIZE_MAX_EXT = 0x8127; + public static final int GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128; + public static final int GL_DISTANCE_ATTENUATION_EXT = 0x8129; private EXTPointParameters() { } @@ -54,5 +55,6 @@ public final class EXTPointParameters { BufferChecks.checkBuffer(pfParams); nglPointParameterfvEXT(pname, pfParams, pfParams.position()); } + private static native void nglPointParameterfvEXT(int pname, FloatBuffer pfParams, int pfParams_offset); } diff --git a/src/java/org/lwjgl/opengl/EXTRescaleNormal.java b/src/java/org/lwjgl/opengl/EXTRescaleNormal.java index 5299472f..a9c76115 100644 --- a/src/java/org/lwjgl/opengl/EXTRescaleNormal.java +++ b/src/java/org/lwjgl/opengl/EXTRescaleNormal.java @@ -1,43 +1,39 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; - -/** - * EXT_rescale_normal - * @author cas - */ public final class EXTRescaleNormal { - public static final int GL_RESCALE_NORMAL_EXT = 0x803A; + + public static final int GL_RESCALE_NORMAL_EXT = 0x803A; private EXTRescaleNormal() { } diff --git a/src/java/org/lwjgl/opengl/EXTSecondaryColor.java b/src/java/org/lwjgl/opengl/EXTSecondaryColor.java index 069432d0..6b17c82b 100644 --- a/src/java/org/lwjgl/opengl/EXTSecondaryColor.java +++ b/src/java/org/lwjgl/opengl/EXTSecondaryColor.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -39,14 +39,15 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class EXTSecondaryColor { - public static final int GL_COLOR_SUM_EXT = 0x8458; - public static final int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459; - public static final int GL_SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A; - public static final int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B; - public static final int GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C; - public static final int GL_SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D; - public static final int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E; - + + public static final int GL_COLOR_SUM_EXT = 0x8458; + public static final int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459; + public static final int GL_SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A; + public static final int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B; + public static final int GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C; + public static final int GL_SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D; + public static final int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E; + private EXTSecondaryColor() { } @@ -61,18 +62,21 @@ public final class EXTSecondaryColor { public static void glSecondaryColorPointerEXT(int size, boolean unsigned, int stride, ByteBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglSecondaryColorPointerEXT(size, unsigned ? GL11.GL_UNSIGNED_BYTE: GL11.GL_BYTE, stride, pPointer, pPointer.position()); + nglSecondaryColorPointerEXT(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pPointer, pPointer.position()); } + public static void glSecondaryColorPointerEXT(int size, int stride, FloatBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglSecondaryColorPointerEXT(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position()<<2); + nglSecondaryColorPointerEXT(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position() << 2); } + private static native void nglSecondaryColorPointerEXT(int size, int type, int stride, Buffer pPointer, int pPointer_offset); public static void glSecondaryColorPointerEXT(int size, int type, int stride, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglSecondaryColorPointerEXTVBO(size, type, stride, buffer_offset); } + private static native void nglSecondaryColorPointerEXTVBO(int size, int type, int stride, int buffer_offset); } diff --git a/src/java/org/lwjgl/opengl/EXTSeparateSpecularColor.java b/src/java/org/lwjgl/opengl/EXTSeparateSpecularColor.java index 5f4aa99a..def67b90 100644 --- a/src/java/org/lwjgl/opengl/EXTSeparateSpecularColor.java +++ b/src/java/org/lwjgl/opengl/EXTSeparateSpecularColor.java @@ -1,45 +1,41 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; - -/** - * EXT_separate_specular_color constants. - * @author cas - */ public final class EXTSeparateSpecularColor { - public static final int GL_SINGLE_COLOR_EXT = 0x81F9; - public static final int GL_SEPARATE_SPECULAR_COLOR_EXT = 0x81FA; - public static final int GL_LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8; + + public static final int GL_SINGLE_COLOR_EXT = 0x81F9; + public static final int GL_SEPARATE_SPECULAR_COLOR_EXT = 0x81FA; + public static final int GL_LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8; private EXTSeparateSpecularColor() { } diff --git a/src/java/org/lwjgl/opengl/EXTSharedTexturePalette.java b/src/java/org/lwjgl/opengl/EXTSharedTexturePalette.java index a8f95ab4..5152b462 100644 --- a/src/java/org/lwjgl/opengl/EXTSharedTexturePalette.java +++ b/src/java/org/lwjgl/opengl/EXTSharedTexturePalette.java @@ -1,42 +1,39 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; -/** - * Insert the type's description here. - * Creation date: (07/11/99 19:15:54) - */ public final class EXTSharedTexturePalette { - public static final int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB; + + public static final int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB; private EXTSharedTexturePalette() { } diff --git a/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java b/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java index a7651b11..a1ab5223 100644 --- a/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java +++ b/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,8 +34,9 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class EXTStencilTwoSide { - public static final int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910; - public static final int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911; + + public static final int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910; + public static final int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911; private EXTStencilTwoSide() { } diff --git a/src/java/org/lwjgl/opengl/EXTStencilWrap.java b/src/java/org/lwjgl/opengl/EXTStencilWrap.java index 431b1e90..eeee731b 100644 --- a/src/java/org/lwjgl/opengl/EXTStencilWrap.java +++ b/src/java/org/lwjgl/opengl/EXTStencilWrap.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class EXTStencilWrap { - public static final int GL_INCR_WRAP_EXT = 0x8507; - public static final int GL_DECR_WRAP_EXT = 0x8508; + + public static final int GL_INCR_WRAP_EXT = 0x8507; + public static final int GL_DECR_WRAP_EXT = 0x8508; private EXTStencilWrap() { } diff --git a/src/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java b/src/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java index 8697d787..bbac5194 100644 --- a/src/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java +++ b/src/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java @@ -1,41 +1,42 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class EXTTextureCompressionS3TC { - public static final int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0; - public static final int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1; - public static final int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2; - public static final int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3; + + public static final int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0; + public static final int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1; + public static final int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2; + public static final int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3; private EXTTextureCompressionS3TC() { } diff --git a/src/java/org/lwjgl/opengl/EXTTextureEnvCombine.java b/src/java/org/lwjgl/opengl/EXTTextureEnvCombine.java index c3a570fe..12741fd5 100644 --- a/src/java/org/lwjgl/opengl/EXTTextureEnvCombine.java +++ b/src/java/org/lwjgl/opengl/EXTTextureEnvCombine.java @@ -1,62 +1,60 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; -/** - * Insert the type's description here. - * Creation date: (22/02/00 01:26:05) - */ +/** Insert the type's description here. Creation date: (22/02/00 01:26:05) */ public final class EXTTextureEnvCombine { - public static final int GL_COMBINE_EXT = 0x8570; - public static final int GL_COMBINE_RGB_EXT = 0x8571; - public static final int GL_COMBINE_ALPHA_EXT = 0x8572; - public static final int GL_SOURCE0_RGB_EXT = 0x8580; - public static final int GL_SOURCE1_RGB_EXT = 0x8581; - public static final int GL_SOURCE2_RGB_EXT = 0x8582; - public static final int GL_SOURCE0_ALPHA_EXT = 0x8588; - public static final int GL_SOURCE1_ALPHA_EXT = 0x8589; - public static final int GL_SOURCE2_ALPHA_EXT = 0x858A; - public static final int GL_OPERAND0_RGB_EXT = 0x8590; - public static final int GL_OPERAND1_RGB_EXT = 0x8591; - public static final int GL_OPERAND2_RGB_EXT = 0x8592; - public static final int GL_OPERAND0_ALPHA_EXT = 0x8598; - public static final int GL_OPERAND1_ALPHA_EXT = 0x8599; - public static final int GL_OPERAND2_ALPHA_EXT = 0x859A; - public static final int GL_RGB_SCALE_EXT = 0x8573; - public static final int GL_ADD_SIGNED_EXT = 0x8574; - public static final int GL_INTERPOLATE_EXT = 0x8575; - public static final int GL_CONSTANT_EXT = 0x8576; - public static final int GL_PRIMARY_COLOR_EXT = 0x8577; - public static final int GL_PREVIOUS_EXT = 0x8578; + + public static final int GL_COMBINE_EXT = 0x8570; + public static final int GL_COMBINE_RGB_EXT = 0x8571; + public static final int GL_COMBINE_ALPHA_EXT = 0x8572; + public static final int GL_SOURCE0_RGB_EXT = 0x8580; + public static final int GL_SOURCE1_RGB_EXT = 0x8581; + public static final int GL_SOURCE2_RGB_EXT = 0x8582; + public static final int GL_SOURCE0_ALPHA_EXT = 0x8588; + public static final int GL_SOURCE1_ALPHA_EXT = 0x8589; + public static final int GL_SOURCE2_ALPHA_EXT = 0x858A; + public static final int GL_OPERAND0_RGB_EXT = 0x8590; + public static final int GL_OPERAND1_RGB_EXT = 0x8591; + public static final int GL_OPERAND2_RGB_EXT = 0x8592; + public static final int GL_OPERAND0_ALPHA_EXT = 0x8598; + public static final int GL_OPERAND1_ALPHA_EXT = 0x8599; + public static final int GL_OPERAND2_ALPHA_EXT = 0x859A; + public static final int GL_RGB_SCALE_EXT = 0x8573; + public static final int GL_ADD_SIGNED_EXT = 0x8574; + public static final int GL_INTERPOLATE_EXT = 0x8575; + public static final int GL_CONSTANT_EXT = 0x8576; + public static final int GL_PRIMARY_COLOR_EXT = 0x8577; + public static final int GL_PREVIOUS_EXT = 0x8578; private EXTTextureEnvCombine() { } diff --git a/src/java/org/lwjgl/opengl/EXTTextureEnvDot3.java b/src/java/org/lwjgl/opengl/EXTTextureEnvDot3.java index 3af503bd..38f0e45c 100644 --- a/src/java/org/lwjgl/opengl/EXTTextureEnvDot3.java +++ b/src/java/org/lwjgl/opengl/EXTTextureEnvDot3.java @@ -1,44 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; - -/** - * EXT_texture_env_dot3 constants. - * @author cas - */ public final class EXTTextureEnvDot3 { - public static final int GL_DOT3_RGB_EXT = 0x8740; - public static final int GL_DOT3_RGBA_EXT = 0x8741; + + public static final int GL_DOT3_RGB_EXT = 0x8740; + public static final int GL_DOT3_RGBA_EXT = 0x8741; private EXTTextureEnvDot3() { } diff --git a/src/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java b/src/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java index b4e2b81f..17ae20d0 100644 --- a/src/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java +++ b/src/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class EXTTextureFilterAnisotropic { - public static final int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE; - public static final int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF; + + public static final int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE; + public static final int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF; private EXTTextureFilterAnisotropic() { } diff --git a/src/java/org/lwjgl/opengl/EXTTextureLODBias.java b/src/java/org/lwjgl/opengl/EXTTextureLODBias.java index 6a8fe6b5..92e4a552 100644 --- a/src/java/org/lwjgl/opengl/EXTTextureLODBias.java +++ b/src/java/org/lwjgl/opengl/EXTTextureLODBias.java @@ -1,40 +1,41 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class EXTTextureLODBias { - public static final int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500; - public static final int GL_TEXTURE_LOD_BIAS_EXT = 0x8501; - public static final int GL_MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD; + + public static final int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500; + public static final int GL_TEXTURE_LOD_BIAS_EXT = 0x8501; + public static final int GL_MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD; private EXTTextureLODBias() { } diff --git a/src/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java b/src/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java index 2347ec70..e5921816 100644 --- a/src/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java +++ b/src/java/org/lwjgl/opengl/EXTTextureMirrorClamp.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class EXTTextureMirrorClamp { + /* * Accepted by the parameter of TexParameteri and TexParameterf, * and by the parameter of TexParameteriv and TexParameterfv, diff --git a/src/java/org/lwjgl/opengl/EXTTextureRectangle.java b/src/java/org/lwjgl/opengl/EXTTextureRectangle.java index c48b6188..80b7f740 100644 --- a/src/java/org/lwjgl/opengl/EXTTextureRectangle.java +++ b/src/java/org/lwjgl/opengl/EXTTextureRectangle.java @@ -1,41 +1,42 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class EXTTextureRectangle { - public static final int GL_TEXTURE_RECTANGLE_EXT = 0x84F5; - public static final int GL_TEXTURE_BINDING_RECTANGLE_EXT = 0x84F6; - public static final int GL_PROXY_TEXTURE_RECTANGLE_EXT = 0x84F7; - public static final int GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT = 0x84F8; + + public static final int GL_TEXTURE_RECTANGLE_EXT = 0x84F5; + public static final int GL_TEXTURE_BINDING_RECTANGLE_EXT = 0x84F6; + public static final int GL_PROXY_TEXTURE_RECTANGLE_EXT = 0x84F7; + public static final int GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT = 0x84F8; private EXTTextureRectangle() { } diff --git a/src/java/org/lwjgl/opengl/EXTVertexShader.java b/src/java/org/lwjgl/opengl/EXTVertexShader.java index d8323405..5e1894f2 100644 --- a/src/java/org/lwjgl/opengl/EXTVertexShader.java +++ b/src/java/org/lwjgl/opengl/EXTVertexShader.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,116 +41,117 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class EXTVertexShader { - public static final int GL_VERTEX_SHADER_EXT = 0x8780; - public static final int GL_VERTEX_SHADER_BINDING_EXT = 0x8781; - public static final int GL_OP_INDEX_EXT = 0x8782; - public static final int GL_OP_NEGATE_EXT = 0x8783; - public static final int GL_OP_DOT3_EXT = 0x8784; - public static final int GL_OP_DOT4_EXT = 0x8785; - public static final int GL_OP_MUL_EXT = 0x8786; - public static final int GL_OP_ADD_EXT = 0x8787; - public static final int GL_OP_MADD_EXT = 0x8788; - public static final int GL_OP_FRAC_EXT = 0x8789; - public static final int GL_OP_MAX_EXT = 0x878A; - public static final int GL_OP_MIN_EXT = 0x878B; - public static final int GL_OP_SET_GE_EXT = 0x878C; - public static final int GL_OP_SET_LT_EXT = 0x878D; - public static final int GL_OP_CLAMP_EXT = 0x878E; - public static final int GL_OP_FLOOR_EXT = 0x878F; - public static final int GL_OP_ROUND_EXT = 0x8790; - public static final int GL_OP_EXP_BASE_2_EXT = 0x8791; - public static final int GL_OP_LOG_BASE_2_EXT = 0x8792; - public static final int GL_OP_POWER_EXT = 0x8793; - public static final int GL_OP_RECIP_EXT = 0x8794; - public static final int GL_OP_RECIP_SQRT_EXT = 0x8795; - public static final int GL_OP_SUB_EXT = 0x8796; - public static final int GL_OP_CROSS_PRODUCT_EXT = 0x8797; - public static final int GL_OP_MULTIPLY_MATRIX_EXT = 0x8798; - public static final int GL_OP_MOV_EXT = 0x8799; - public static final int GL_OUTPUT_VERTEX_EXT = 0x879A; - public static final int GL_OUTPUT_COLOR0_EXT = 0x879B; - public static final int GL_OUTPUT_COLOR1_EXT = 0x879C; - public static final int GL_OUTPUT_TEXTURE_COORD0_EXT = 0x879D; - public static final int GL_OUTPUT_TEXTURE_COORD1_EXT = 0x879E; - public static final int GL_OUTPUT_TEXTURE_COORD2_EXT = 0x879F; - public static final int GL_OUTPUT_TEXTURE_COORD3_EXT = 0x87A0; - public static final int GL_OUTPUT_TEXTURE_COORD4_EXT = 0x87A1; - public static final int GL_OUTPUT_TEXTURE_COORD5_EXT = 0x87A2; - public static final int GL_OUTPUT_TEXTURE_COORD6_EXT = 0x87A3; - public static final int GL_OUTPUT_TEXTURE_COORD7_EXT = 0x87A4; - public static final int GL_OUTPUT_TEXTURE_COORD8_EXT = 0x87A5; - public static final int GL_OUTPUT_TEXTURE_COORD9_EXT = 0x87A6; - public static final int GL_OUTPUT_TEXTURE_COORD10_EXT = 0x87A7; - public static final int GL_OUTPUT_TEXTURE_COORD11_EXT = 0x87A8; - public static final int GL_OUTPUT_TEXTURE_COORD12_EXT = 0x87A9; - public static final int GL_OUTPUT_TEXTURE_COORD13_EXT = 0x87AA; - public static final int GL_OUTPUT_TEXTURE_COORD14_EXT = 0x87AB; - public static final int GL_OUTPUT_TEXTURE_COORD15_EXT = 0x87AC; - public static final int GL_OUTPUT_TEXTURE_COORD16_EXT = 0x87AD; - public static final int GL_OUTPUT_TEXTURE_COORD17_EXT = 0x87AE; - public static final int GL_OUTPUT_TEXTURE_COORD18_EXT = 0x87AF; - public static final int GL_OUTPUT_TEXTURE_COORD19_EXT = 0x87B0; - public static final int GL_OUTPUT_TEXTURE_COORD20_EXT = 0x87B1; - public static final int GL_OUTPUT_TEXTURE_COORD21_EXT = 0x87B2; - public static final int GL_OUTPUT_TEXTURE_COORD22_EXT = 0x87B3; - public static final int GL_OUTPUT_TEXTURE_COORD23_EXT = 0x87B4; - public static final int GL_OUTPUT_TEXTURE_COORD24_EXT = 0x87B5; - public static final int GL_OUTPUT_TEXTURE_COORD25_EXT = 0x87B6; - public static final int GL_OUTPUT_TEXTURE_COORD26_EXT = 0x87B7; - public static final int GL_OUTPUT_TEXTURE_COORD27_EXT = 0x87B8; - public static final int GL_OUTPUT_TEXTURE_COORD28_EXT = 0x87B9; - public static final int GL_OUTPUT_TEXTURE_COORD29_EXT = 0x87BA; - public static final int GL_OUTPUT_TEXTURE_COORD30_EXT = 0x87BB; - public static final int GL_OUTPUT_TEXTURE_COORD31_EXT = 0x87BC; - public static final int GL_OUTPUT_FOG_EXT = 0x87BD; - public static final int GL_SCALAR_EXT = 0x87BE; - public static final int GL_VECTOR_EXT = 0x87BF; - public static final int GL_MATRIX_EXT = 0x87C0; - public static final int GL_VARIANT_EXT = 0x87C1; - public static final int GL_INVARIANT_EXT = 0x87C2; - public static final int GL_LOCAL_CONSTANT_EXT = 0x87C3; - public static final int GL_LOCAL_EXT = 0x87C4; - public static final int GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5; - public static final int GL_MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6; - public static final int GL_MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7; - public static final int GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8; - public static final int GL_MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9; - public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA; - public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB; - public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CC; - public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CD; - public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE; - public static final int GL_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF; - public static final int GL_VERTEX_SHADER_VARIANTS_EXT = 0x87D0; - public static final int GL_VERTEX_SHADER_INVARIANTS_EXT = 0x87D1; - public static final int GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2; - public static final int GL_VERTEX_SHADER_LOCALS_EXT = 0x87D3; - public static final int GL_VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4; - public static final int GL_X_EXT = 0x87D5; - public static final int GL_Y_EXT = 0x87D6; - public static final int GL_Z_EXT = 0x87D7; - public static final int GL_W_EXT = 0x87D8; - public static final int GL_NEGATIVE_X_EXT = 0x87D9; - public static final int GL_NEGATIVE_Y_EXT = 0x87DA; - public static final int GL_NEGATIVE_Z_EXT = 0x87DB; - public static final int GL_NEGATIVE_W_EXT = 0x87DC; - public static final int GL_ZERO_EXT = 0x87DD; - public static final int GL_ONE_EXT = 0x87DE; - public static final int GL_NEGATIVE_ONE_EXT = 0x87DF; - public static final int GL_NORMALIZED_RANGE_EXT = 0x87E0; - public static final int GL_FULL_RANGE_EXT = 0x87E1; - public static final int GL_CURRENT_VERTEX_EXT = 0x87E2; - public static final int GL_MVP_MATRIX_EXT = 0x87E3; - public static final int GL_VARIANT_VALUE_EXT = 0x87E4; - public static final int GL_VARIANT_DATATYPE_EXT = 0x87E5; - public static final int GL_VARIANT_ARRAY_STRIDE_EXT = 0x87E6; - public static final int GL_VARIANT_ARRAY_TYPE_EXT = 0x87E7; - public static final int GL_VARIANT_ARRAY_EXT = 0x87E8; - public static final int GL_VARIANT_ARRAY_POINTER_EXT = 0x87E9; - public static final int GL_INVARIANT_VALUE_EXT = 0x87EA; - public static final int GL_INVARIANT_DATATYPE_EXT = 0x87EB; - public static final int GL_LOCAL_CONSTANT_VALUE_EXT = 0x87EC; - public static final int GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED; + + public static final int GL_VERTEX_SHADER_EXT = 0x8780; + public static final int GL_VERTEX_SHADER_BINDING_EXT = 0x8781; + public static final int GL_OP_INDEX_EXT = 0x8782; + public static final int GL_OP_NEGATE_EXT = 0x8783; + public static final int GL_OP_DOT3_EXT = 0x8784; + public static final int GL_OP_DOT4_EXT = 0x8785; + public static final int GL_OP_MUL_EXT = 0x8786; + public static final int GL_OP_ADD_EXT = 0x8787; + public static final int GL_OP_MADD_EXT = 0x8788; + public static final int GL_OP_FRAC_EXT = 0x8789; + public static final int GL_OP_MAX_EXT = 0x878A; + public static final int GL_OP_MIN_EXT = 0x878B; + public static final int GL_OP_SET_GE_EXT = 0x878C; + public static final int GL_OP_SET_LT_EXT = 0x878D; + public static final int GL_OP_CLAMP_EXT = 0x878E; + public static final int GL_OP_FLOOR_EXT = 0x878F; + public static final int GL_OP_ROUND_EXT = 0x8790; + public static final int GL_OP_EXP_BASE_2_EXT = 0x8791; + public static final int GL_OP_LOG_BASE_2_EXT = 0x8792; + public static final int GL_OP_POWER_EXT = 0x8793; + public static final int GL_OP_RECIP_EXT = 0x8794; + public static final int GL_OP_RECIP_SQRT_EXT = 0x8795; + public static final int GL_OP_SUB_EXT = 0x8796; + public static final int GL_OP_CROSS_PRODUCT_EXT = 0x8797; + public static final int GL_OP_MULTIPLY_MATRIX_EXT = 0x8798; + public static final int GL_OP_MOV_EXT = 0x8799; + public static final int GL_OUTPUT_VERTEX_EXT = 0x879A; + public static final int GL_OUTPUT_COLOR0_EXT = 0x879B; + public static final int GL_OUTPUT_COLOR1_EXT = 0x879C; + public static final int GL_OUTPUT_TEXTURE_COORD0_EXT = 0x879D; + public static final int GL_OUTPUT_TEXTURE_COORD1_EXT = 0x879E; + public static final int GL_OUTPUT_TEXTURE_COORD2_EXT = 0x879F; + public static final int GL_OUTPUT_TEXTURE_COORD3_EXT = 0x87A0; + public static final int GL_OUTPUT_TEXTURE_COORD4_EXT = 0x87A1; + public static final int GL_OUTPUT_TEXTURE_COORD5_EXT = 0x87A2; + public static final int GL_OUTPUT_TEXTURE_COORD6_EXT = 0x87A3; + public static final int GL_OUTPUT_TEXTURE_COORD7_EXT = 0x87A4; + public static final int GL_OUTPUT_TEXTURE_COORD8_EXT = 0x87A5; + public static final int GL_OUTPUT_TEXTURE_COORD9_EXT = 0x87A6; + public static final int GL_OUTPUT_TEXTURE_COORD10_EXT = 0x87A7; + public static final int GL_OUTPUT_TEXTURE_COORD11_EXT = 0x87A8; + public static final int GL_OUTPUT_TEXTURE_COORD12_EXT = 0x87A9; + public static final int GL_OUTPUT_TEXTURE_COORD13_EXT = 0x87AA; + public static final int GL_OUTPUT_TEXTURE_COORD14_EXT = 0x87AB; + public static final int GL_OUTPUT_TEXTURE_COORD15_EXT = 0x87AC; + public static final int GL_OUTPUT_TEXTURE_COORD16_EXT = 0x87AD; + public static final int GL_OUTPUT_TEXTURE_COORD17_EXT = 0x87AE; + public static final int GL_OUTPUT_TEXTURE_COORD18_EXT = 0x87AF; + public static final int GL_OUTPUT_TEXTURE_COORD19_EXT = 0x87B0; + public static final int GL_OUTPUT_TEXTURE_COORD20_EXT = 0x87B1; + public static final int GL_OUTPUT_TEXTURE_COORD21_EXT = 0x87B2; + public static final int GL_OUTPUT_TEXTURE_COORD22_EXT = 0x87B3; + public static final int GL_OUTPUT_TEXTURE_COORD23_EXT = 0x87B4; + public static final int GL_OUTPUT_TEXTURE_COORD24_EXT = 0x87B5; + public static final int GL_OUTPUT_TEXTURE_COORD25_EXT = 0x87B6; + public static final int GL_OUTPUT_TEXTURE_COORD26_EXT = 0x87B7; + public static final int GL_OUTPUT_TEXTURE_COORD27_EXT = 0x87B8; + public static final int GL_OUTPUT_TEXTURE_COORD28_EXT = 0x87B9; + public static final int GL_OUTPUT_TEXTURE_COORD29_EXT = 0x87BA; + public static final int GL_OUTPUT_TEXTURE_COORD30_EXT = 0x87BB; + public static final int GL_OUTPUT_TEXTURE_COORD31_EXT = 0x87BC; + public static final int GL_OUTPUT_FOG_EXT = 0x87BD; + public static final int GL_SCALAR_EXT = 0x87BE; + public static final int GL_VECTOR_EXT = 0x87BF; + public static final int GL_MATRIX_EXT = 0x87C0; + public static final int GL_VARIANT_EXT = 0x87C1; + public static final int GL_INVARIANT_EXT = 0x87C2; + public static final int GL_LOCAL_CONSTANT_EXT = 0x87C3; + public static final int GL_LOCAL_EXT = 0x87C4; + public static final int GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5; + public static final int GL_MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6; + public static final int GL_MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7; + public static final int GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8; + public static final int GL_MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CC; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CD; + public static final int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE; + public static final int GL_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF; + public static final int GL_VERTEX_SHADER_VARIANTS_EXT = 0x87D0; + public static final int GL_VERTEX_SHADER_INVARIANTS_EXT = 0x87D1; + public static final int GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2; + public static final int GL_VERTEX_SHADER_LOCALS_EXT = 0x87D3; + public static final int GL_VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4; + public static final int GL_X_EXT = 0x87D5; + public static final int GL_Y_EXT = 0x87D6; + public static final int GL_Z_EXT = 0x87D7; + public static final int GL_W_EXT = 0x87D8; + public static final int GL_NEGATIVE_X_EXT = 0x87D9; + public static final int GL_NEGATIVE_Y_EXT = 0x87DA; + public static final int GL_NEGATIVE_Z_EXT = 0x87DB; + public static final int GL_NEGATIVE_W_EXT = 0x87DC; + public static final int GL_ZERO_EXT = 0x87DD; + public static final int GL_ONE_EXT = 0x87DE; + public static final int GL_NEGATIVE_ONE_EXT = 0x87DF; + public static final int GL_NORMALIZED_RANGE_EXT = 0x87E0; + public static final int GL_FULL_RANGE_EXT = 0x87E1; + public static final int GL_CURRENT_VERTEX_EXT = 0x87E2; + public static final int GL_MVP_MATRIX_EXT = 0x87E3; + public static final int GL_VARIANT_VALUE_EXT = 0x87E4; + public static final int GL_VARIANT_DATATYPE_EXT = 0x87E5; + public static final int GL_VARIANT_ARRAY_STRIDE_EXT = 0x87E6; + public static final int GL_VARIANT_ARRAY_TYPE_EXT = 0x87E7; + public static final int GL_VARIANT_ARRAY_EXT = 0x87E8; + public static final int GL_VARIANT_ARRAY_POINTER_EXT = 0x87E9; + public static final int GL_INVARIANT_VALUE_EXT = 0x87EA; + public static final int GL_INVARIANT_DATATYPE_EXT = 0x87EB; + public static final int GL_LOCAL_CONSTANT_VALUE_EXT = 0x87EC; + public static final int GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED; private EXTVertexShader() { } @@ -158,6 +159,7 @@ public final class EXTVertexShader { static native void initNativeStubs() throws LWJGLException; public static native void glBeginVertexShaderEXT(); + public static native void glEndVertexShaderEXT(); public static native void glBindVertexShaderEXT(int id); @@ -170,140 +172,144 @@ public final class EXTVertexShader { public static native void glShaderOp2EXT(int op, int res, int arg1, int arg2); - public static native void glShaderOp3EXT( - int op, - int res, - int arg1, - int arg2, - int arg3); + public static native void glShaderOp3EXT(int op, int res, int arg1, int arg2, int arg3); - public static native void glSwizzleEXT( - int res, - int in, - int outX, - int outY, - int outZ, - int outW); + public static native void glSwizzleEXT(int res, int in, int outX, int outY, int outZ, int outW); + + public static native void glWriteMaskEXT(int res, int in, int outX, int outY, int outZ, int outW); - public static native void glWriteMaskEXT( - int res, - int in, - int outX, - int outY, - int outZ, - int outW); public static native void glInsertComponentEXT(int res, int src, int num); public static native void glExtractComponentEXT(int res, int src, int num); - public static native int glGenSymbolsEXT( - int dataType, - int storageType, - int range, - int components); + public static native int glGenSymbolsEXT(int dataType, int storageType, int range, int components); + public static void glSetInvariantEXT(int id, boolean unsigned, ByteBuffer pAddr) { BufferChecks.checkBuffer(pAddr); nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, pAddr, pAddr.position()); } + public static void glSetInvariantEXT(int id, boolean unsigned, ShortBuffer pAddr) { BufferChecks.checkBuffer(pAddr); - nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position()<<1); + nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1); } + public static void glSetInvariantEXT(int id, FloatBuffer pAddr) { BufferChecks.checkBuffer(pAddr); - nglSetInvariantEXT(id, GL11.GL_FLOAT, pAddr, pAddr.position()<<2); + nglSetInvariantEXT(id, GL11.GL_FLOAT, pAddr, pAddr.position() << 2); } + public static void glSetInvariantEXT(int id, boolean unsigned, IntBuffer pAddr) { BufferChecks.checkBuffer(pAddr); - nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position()<<2); + nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position() << 2); } + private static native void nglSetInvariantEXT(int id, int type, Buffer pAddr, int pAddr_offset); public static void glSetLocalConstantEXT(int id, boolean unsigned, ByteBuffer pAddr) { BufferChecks.checkBuffer(pAddr); nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, pAddr, pAddr.position()); } + public static void glSetLocalConstantEXT(int id, boolean unsigned, ShortBuffer pAddr) { BufferChecks.checkBuffer(pAddr); - nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position()<<1); + nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1); } + public static void glSetLocalConstantEXT(int id, FloatBuffer pAddr) { BufferChecks.checkBuffer(pAddr); - nglSetLocalConstantEXT(id, GL11.GL_FLOAT, pAddr, pAddr.position()<<2); + nglSetLocalConstantEXT(id, GL11.GL_FLOAT, pAddr, pAddr.position() << 2); } + public static void glSetLocalConstantEXT(int id, boolean unsigned, IntBuffer pAddr) { BufferChecks.checkBuffer(pAddr); - nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position()<<2); + nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position() << 2); } + private static native void nglSetLocalConstantEXT(int id, int type, Buffer pAddr, int pAddr_offset); public static void glVariantEXT(int id, ByteBuffer pAddr) { BufferChecks.checkBuffer(pAddr); nglVariantbvEXT(id, pAddr, pAddr.position()); } + private static native void nglVariantbvEXT(int id, ByteBuffer pAddr, int pAddr_offset); public static void glVariantEXT(int id, ShortBuffer psAddr) { BufferChecks.checkBuffer(psAddr); nglVariantsvEXT(id, psAddr, psAddr.position()); } + private static native void nglVariantsvEXT(int id, ShortBuffer psAddr, int psAddr_offset); public static void glVariantEXT(int id, FloatBuffer pfAddr) { BufferChecks.checkBuffer(pfAddr); nglVariantfvEXT(id, pfAddr, pfAddr.position()); } + private static native void nglVariantfvEXT(int id, FloatBuffer pfAddr, int pfAddr_offset); public static void glVariantEXT(int id, IntBuffer piAddr) { BufferChecks.checkBuffer(piAddr); nglVariantivEXT(id, piAddr, piAddr.position()); } + private static native void nglVariantivEXT(int id, IntBuffer piAddr, int piAddr_offset); public static void glVariantuEXT(int id, ByteBuffer pAddr) { BufferChecks.checkBuffer(pAddr); nglVariantubvEXT(id, pAddr, pAddr.position()); } + private static native void nglVariantubvEXT(int id, ByteBuffer pAddr, int pAddr_offset); public static void glVariantuEXT(int id, ShortBuffer psAddr) { BufferChecks.checkBuffer(psAddr); nglVariantusvEXT(id, psAddr, psAddr.position()); } + private static native void nglVariantusvEXT(int id, ShortBuffer psAddr, int psAddr_offset); public static void glVariantuEXT(int id, IntBuffer piAddr) { BufferChecks.checkBuffer(piAddr); nglVariantuivEXT(id, piAddr, piAddr.position()); } + private static native void nglVariantuivEXT(int id, IntBuffer piAddr, int piAddr_offset); + public static void glVariantPointerEXT(int id, boolean unsigned, int stride, ByteBuffer pAddr) { BufferChecks.checkDirect(pAddr); GLBufferChecks.ensureArrayVBOdisabled(); nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pAddr, pAddr.position()); } + public static void glVariantPointerEXT(int id, boolean unsigned, int stride, ShortBuffer pAddr) { BufferChecks.checkDirect(pAddr); GLBufferChecks.ensureArrayVBOdisabled(); - nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pAddr, pAddr.position()<<1); + nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pAddr, pAddr.position() << 1); } + public static void glVariantPointerEXT(int id, int stride, FloatBuffer pAddr) { BufferChecks.checkDirect(pAddr); GLBufferChecks.ensureArrayVBOdisabled(); - nglVariantPointerEXT(id, GL11.GL_FLOAT, stride, pAddr, pAddr.position()<<2); + nglVariantPointerEXT(id, GL11.GL_FLOAT, stride, pAddr, pAddr.position() << 2); } + public static void glVariantPointerEXT(int id, boolean unsigned, int stride, IntBuffer pAddr) { BufferChecks.checkDirect(pAddr); GLBufferChecks.ensureArrayVBOdisabled(); - nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pAddr, pAddr.position()<<2); + nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pAddr, pAddr.position() << 2); } + private static native void nglVariantPointerEXT(int id, int type, int stride, Buffer pAddr, int pAddr_offset); + public static void glVariantPointerEXT(int id, int type, int stride, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglVariantPointerEXTVBO(id, type, stride, buffer_offset); } + private static native void nglVariantPointerEXTVBO(int id, int type, int stride, int buffer_offset); + public static native void glEnableVariantClientStateEXT(int id); public static native void glDisableVariantClientStateEXT(int id); @@ -317,59 +323,71 @@ public final class EXTVertexShader { public static native int glBindTextureUnitParameterEXT(int unit, int value); public static native int glBindParameterEXT(int value); + public static native boolean glIsVariantEnabledEXT(int id, int cap); public static void glGetVariantBooleanEXT(int id, int value, ByteBuffer pbData) { BufferChecks.checkDirect(pbData); nglGetVariantBooleanvEXT(id, value, pbData, pbData.position()); } + private static native void nglGetVariantBooleanvEXT(int id, int value, ByteBuffer pbData, int pbData_offset); + public static void glGetVariantIntegerEXT(int id, int value, IntBuffer piData) { BufferChecks.checkDirect(piData); nglGetVariantIntegervEXT(id, value, piData, piData.position()); } + private static native void nglGetVariantIntegervEXT(int id, int value, IntBuffer piData, int piData_offset); public static void glGetVariantFloatEXT(int id, int value, FloatBuffer pfData) { BufferChecks.checkDirect(pfData); nglGetVariantFloatvEXT(id, value, pfData, pfData.position()); } + private static native void nglGetVariantFloatvEXT(int id, int value, FloatBuffer pfData, int pfData_offset); public static native ByteBuffer glGetVariantPointerEXT(int id, int value, int size); + public static void glGetInvariantBooleanEXT(int id, int value, ByteBuffer pbData) { BufferChecks.checkDirect(pbData); nglGetInvariantBooleanvEXT(id, value, pbData, pbData.position()); } + private static native void nglGetInvariantBooleanvEXT(int id, int value, ByteBuffer pbData, int pbData_offset); public static void glGetInvariantIntegerEXT(int id, int value, IntBuffer piData) { BufferChecks.checkDirect(piData); nglGetInvariantIntegervEXT(id, value, piData, piData.position()); } + private static native void nglGetInvariantIntegervEXT(int id, int value, IntBuffer piData, int piData_offset); public static void glGetInvariantFloatEXT(int id, int value, FloatBuffer pfData) { BufferChecks.checkDirect(pfData); nglGetInvariantFloatvEXT(id, value, pfData, pfData.position()); } + private static native void nglGetInvariantFloatvEXT(int id, int value, FloatBuffer pfData, int pfData_offset); public static void glGetLocalConstantBooleanEXT(int id, int value, ByteBuffer pbData) { BufferChecks.checkDirect(pbData); nglGetLocalConstantBooleanvEXT(id, value, pbData, pbData.position()); } + private static native void nglGetLocalConstantBooleanvEXT(int id, int value, ByteBuffer pbData, int pbData_offset); public static void glGetLocalConstantIntegerEXT(int id, int value, IntBuffer piData) { BufferChecks.checkDirect(piData); nglGetLocalConstantIntegervEXT(id, value, piData, piData.position()); } + private static native void nglGetLocalConstantIntegervEXT(int id, int value, IntBuffer piData, int piData_offset); public static void glGetLocalConstantFloatEXT(int id, int value, FloatBuffer pfData) { BufferChecks.checkDirect(pfData); nglGetLocalConstantFloatvEXT(id, value, pfData, pfData.position()); } + private static native void nglGetLocalConstantFloatvEXT(int id, int value, FloatBuffer pfData, int pfData_offset); } diff --git a/src/java/org/lwjgl/opengl/EXTVertexWeighting.java b/src/java/org/lwjgl/opengl/EXTVertexWeighting.java index 5cd6cfd6..af2c12a8 100644 --- a/src/java/org/lwjgl/opengl/EXTVertexWeighting.java +++ b/src/java/org/lwjgl/opengl/EXTVertexWeighting.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -38,19 +38,20 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class EXTVertexWeighting { - public static final int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3; /* alias to MODELVIEW_STACK_DEPTH */ - public static final int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502; - public static final int GL_MODELVIEW0_MATRIX_EXT = 0x0BA6; /* alias to MODELVIEW_MATRIX */ - public static final int GL_MODELVIEW1_MATRIX_EXT = 0x8506; - public static final int GL_VERTEX_WEIGHTING_EXT = 0x8509; - public static final int GL_MODELVIEW0_EXT = 0x1700; /* alias to MODELVIEW */ - public static final int GL_MODELVIEW1_EXT = 0x850A; - public static final int GL_CURRENT_VERTEX_WEIGHT_EXT = 0x850B; - public static final int GL_VERTEX_WEIGHT_ARRAY_EXT = 0x850C; - public static final int GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D; - public static final int GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E; - public static final int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F; - public static final int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510; + + public static final int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3; + public static final int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502; + public static final int GL_MODELVIEW0_MATRIX_EXT = 0x0BA6; + public static final int GL_MODELVIEW1_MATRIX_EXT = 0x8506; + public static final int GL_VERTEX_WEIGHTING_EXT = 0x8509; + public static final int GL_MODELVIEW0_EXT = 0x1700; + public static final int GL_MODELVIEW1_EXT = 0x850A; + public static final int GL_CURRENT_VERTEX_WEIGHT_EXT = 0x850B; + public static final int GL_VERTEX_WEIGHT_ARRAY_EXT = 0x850C; + public static final int GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D; + public static final int GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E; + public static final int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F; + public static final int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510; private EXTVertexWeighting() { } @@ -62,12 +63,15 @@ public final class EXTVertexWeighting { public static void glVertexWeightPointerEXT(int size, int stride, FloatBuffer pPointer) { BufferChecks.checkDirect(pPointer); GLBufferChecks.ensureArrayVBOdisabled(); - nglVertexWeightPointerEXT(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position()<<2); + nglVertexWeightPointerEXT(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position() << 2); } + private static native void nglVertexWeightPointerEXT(int size, int type, int stride, Buffer pPointer, int pPointer_offset); + public static void glVertexWeightPointerEXT(int size, int type, int stride, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglVertexWeightPointerEXTVBO(size, type, stride, buffer_offset); } + private static native void nglVertexWeightPointerEXTVBO(int size, int type, int stride, int buffer_offset); } diff --git a/src/java/org/lwjgl/opengl/GL13.java b/src/java/org/lwjgl/opengl/GL13.java index 75cfb3b7..392e2447 100644 --- a/src/java/org/lwjgl/opengl/GL13.java +++ b/src/java/org/lwjgl/opengl/GL13.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -42,114 +42,115 @@ import org.lwjgl.BufferChecks; /** * $Id$ - * + *

* The core OpenGL1.3 API. - * + * * @author cix_foo * @version $Revision$ */ public final class GL13 { - public static final int GL_TEXTURE0 = 0x84C0; - public static final int GL_TEXTURE1 = 0x84C1; - public static final int GL_TEXTURE2 = 0x84C2; - public static final int GL_TEXTURE3 = 0x84C3; - public static final int GL_TEXTURE4 = 0x84C4; - public static final int GL_TEXTURE5 = 0x84C5; - public static final int GL_TEXTURE6 = 0x84C6; - public static final int GL_TEXTURE7 = 0x84C7; - public static final int GL_TEXTURE8 = 0x84C8; - public static final int GL_TEXTURE9 = 0x84C9; - public static final int GL_TEXTURE10 = 0x84CA; - public static final int GL_TEXTURE11 = 0x84CB; - public static final int GL_TEXTURE12 = 0x84CC; - public static final int GL_TEXTURE13 = 0x84CD; - public static final int GL_TEXTURE14 = 0x84CE; - public static final int GL_TEXTURE15 = 0x84CF; - public static final int GL_TEXTURE16 = 0x84D0; - public static final int GL_TEXTURE17 = 0x84D1; - public static final int GL_TEXTURE18 = 0x84D2; - public static final int GL_TEXTURE19 = 0x84D3; - public static final int GL_TEXTURE20 = 0x84D4; - public static final int GL_TEXTURE21 = 0x84D5; - public static final int GL_TEXTURE22 = 0x84D6; - public static final int GL_TEXTURE23 = 0x84D7; - public static final int GL_TEXTURE24 = 0x84D8; - public static final int GL_TEXTURE25 = 0x84D9; - public static final int GL_TEXTURE26 = 0x84DA; - public static final int GL_TEXTURE27 = 0x84DB; - public static final int GL_TEXTURE28 = 0x84DC; - public static final int GL_TEXTURE29 = 0x84DD; - public static final int GL_TEXTURE30 = 0x84DE; - public static final int GL_TEXTURE31 = 0x84DF; - public static final int GL_ACTIVE_TEXTURE = 0x84E0; - public static final int GL_CLIENT_ACTIVE_TEXTURE = 0x84E1; - public static final int GL_MAX_TEXTURE_UNITS = 0x84E2; - public static final int GL_NORMAL_MAP = 0x8511; - public static final int GL_REFLECTION_MAP = 0x8512; - public static final int GL_TEXTURE_CUBE_MAP = 0x8513; - public static final int GL_TEXTURE_BINDING_CUBE_MAP = 0x8514; + public static final int GL_TEXTURE0 = 0x84C0; + public static final int GL_TEXTURE1 = 0x84C1; + public static final int GL_TEXTURE2 = 0x84C2; + public static final int GL_TEXTURE3 = 0x84C3; + public static final int GL_TEXTURE4 = 0x84C4; + public static final int GL_TEXTURE5 = 0x84C5; + public static final int GL_TEXTURE6 = 0x84C6; + public static final int GL_TEXTURE7 = 0x84C7; + public static final int GL_TEXTURE8 = 0x84C8; + public static final int GL_TEXTURE9 = 0x84C9; + public static final int GL_TEXTURE10 = 0x84CA; + public static final int GL_TEXTURE11 = 0x84CB; + public static final int GL_TEXTURE12 = 0x84CC; + public static final int GL_TEXTURE13 = 0x84CD; + public static final int GL_TEXTURE14 = 0x84CE; + public static final int GL_TEXTURE15 = 0x84CF; + public static final int GL_TEXTURE16 = 0x84D0; + public static final int GL_TEXTURE17 = 0x84D1; + public static final int GL_TEXTURE18 = 0x84D2; + public static final int GL_TEXTURE19 = 0x84D3; + public static final int GL_TEXTURE20 = 0x84D4; + public static final int GL_TEXTURE21 = 0x84D5; + public static final int GL_TEXTURE22 = 0x84D6; + public static final int GL_TEXTURE23 = 0x84D7; + public static final int GL_TEXTURE24 = 0x84D8; + public static final int GL_TEXTURE25 = 0x84D9; + public static final int GL_TEXTURE26 = 0x84DA; + public static final int GL_TEXTURE27 = 0x84DB; + public static final int GL_TEXTURE28 = 0x84DC; + public static final int GL_TEXTURE29 = 0x84DD; + public static final int GL_TEXTURE30 = 0x84DE; + public static final int GL_TEXTURE31 = 0x84DF; + public static final int GL_ACTIVE_TEXTURE = 0x84E0; + public static final int GL_CLIENT_ACTIVE_TEXTURE = 0x84E1; + public static final int GL_MAX_TEXTURE_UNITS = 0x84E2; + + public static final int GL_NORMAL_MAP = 0x8511; + public static final int GL_REFLECTION_MAP = 0x8512; + public static final int GL_TEXTURE_CUBE_MAP = 0x8513; + public static final int GL_TEXTURE_BINDING_CUBE_MAP = 0x8514; public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515; public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516; public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517; public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518; public static final int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519; public static final int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A; - public static final int GL_PROXY_TEXTURE_CUBE_MAP = 0x851B; - public static final int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C; + public static final int GL_PROXY_TEXTURE_CUBE_MAP = 0x851B; + public static final int GL_MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C; - public static final int GL_COMPRESSED_ALPHA = 0x84E9; - public static final int GL_COMPRESSED_LUMINANCE = 0x84EA; - public static final int GL_COMPRESSED_LUMINANCE_ALPHA = 0x84EB; - public static final int GL_COMPRESSED_INTENSITY = 0x84EC; - public static final int GL_COMPRESSED_RGB = 0x84ED; - public static final int GL_COMPRESSED_RGBA = 0x84EE; + public static final int GL_COMPRESSED_ALPHA = 0x84E9; + public static final int GL_COMPRESSED_LUMINANCE = 0x84EA; + public static final int GL_COMPRESSED_LUMINANCE_ALPHA = 0x84EB; + public static final int GL_COMPRESSED_INTENSITY = 0x84EC; + public static final int GL_COMPRESSED_RGB = 0x84ED; + public static final int GL_COMPRESSED_RGBA = 0x84EE; public static final int GL_TEXTURE_COMPRESSION_HINT = 0x84EF; public static final int GL_TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0; - public static final int GL_TEXTURE_COMPRESSED = 0x86A1; + public static final int GL_TEXTURE_COMPRESSED = 0x86A1; public static final int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2; public static final int GL_COMPRESSED_TEXTURE_FORMATS = 0x86A3; - public static final int GL_MULTISAMPLE = 0x809D; + public static final int GL_MULTISAMPLE = 0x809D; public static final int GL_SAMPLE_ALPHA_TO_COVERAGE = 0x809E; - public static final int GL_SAMPLE_ALPHA_TO_ONE = 0x809F; - public static final int GL_SAMPLE_COVERAGE = 0x80A0; - public static final int GL_SAMPLE_BUFFERS = 0x80A8; - public static final int GL_SAMPLES = 0x80A9; - public static final int GL_SAMPLE_COVERAGE_VALUE = 0x80AA; - public static final int GL_SAMPLE_COVERAGE_INVERT = 0x80AB; - public static final int GL_MULTISAMPLE_BIT = 0x20000000; + public static final int GL_SAMPLE_ALPHA_TO_ONE = 0x809F; + public static final int GL_SAMPLE_COVERAGE = 0x80A0; + public static final int GL_SAMPLE_BUFFERS = 0x80A8; + public static final int GL_SAMPLES = 0x80A9; + public static final int GL_SAMPLE_COVERAGE_VALUE = 0x80AA; + public static final int GL_SAMPLE_COVERAGE_INVERT = 0x80AB; + public static final int GL_MULTISAMPLE_BIT = 0x20000000; public static final int GL_TRANSPOSE_MODELVIEW_MATRIX = 0x84E3; public static final int GL_TRANSPOSE_PROJECTION_MATRIX = 0x84E4; public static final int GL_TRANSPOSE_TEXTURE_MATRIX = 0x84E5; - public static final int GL_TRANSPOSE_COLOR_MATRIX = 0x84E6; + public static final int GL_TRANSPOSE_COLOR_MATRIX = 0x84E6; - public static final int GL_COMBINE = 0x8570; - public static final int GL_COMBINE_RGB = 0x8571; - public static final int GL_COMBINE_ALPHA = 0x8572; - public static final int GL_SOURCE0_RGB = 0x8580; - public static final int GL_SOURCE1_RGB = 0x8581; - public static final int GL_SOURCE2_RGB = 0x8582; - public static final int GL_SOURCE0_ALPHA = 0x8588; - public static final int GL_SOURCE1_ALPHA = 0x8589; - public static final int GL_SOURCE2_ALPHA = 0x858A; - public static final int GL_OPERAND0_RGB = 0x8590; - public static final int GL_OPERAND1_RGB = 0x8591; - public static final int GL_OPERAND2_RGB = 0x8592; - public static final int GL_OPERAND0_ALPHA = 0x8598; - public static final int GL_OPERAND1_ALPHA = 0x8599; - public static final int GL_OPERAND2_ALPHA = 0x859A; - public static final int GL_RGB_SCALE = 0x8573; - public static final int GL_ADD_SIGNED = 0x8574; - public static final int GL_INTERPOLATE = 0x8575; - public static final int GL_SUBTRACT = 0x84E7; - public static final int GL_CONSTANT = 0x8576; - public static final int GL_PRIMARY_COLOR = 0x8577; - public static final int GL_PREVIOUS = 0x8578; - public static final int GL_DOT3_RGB = 0x86AE; - public static final int GL_DOT3_RGBA = 0x86AF; - public static final int GL_CLAMP_TO_BORDER = 0x812D; + public static final int GL_COMBINE = 0x8570; + public static final int GL_COMBINE_RGB = 0x8571; + public static final int GL_COMBINE_ALPHA = 0x8572; + public static final int GL_SOURCE0_RGB = 0x8580; + public static final int GL_SOURCE1_RGB = 0x8581; + public static final int GL_SOURCE2_RGB = 0x8582; + public static final int GL_SOURCE0_ALPHA = 0x8588; + public static final int GL_SOURCE1_ALPHA = 0x8589; + public static final int GL_SOURCE2_ALPHA = 0x858A; + public static final int GL_OPERAND0_RGB = 0x8590; + public static final int GL_OPERAND1_RGB = 0x8591; + public static final int GL_OPERAND2_RGB = 0x8592; + public static final int GL_OPERAND0_ALPHA = 0x8598; + public static final int GL_OPERAND1_ALPHA = 0x8599; + public static final int GL_OPERAND2_ALPHA = 0x859A; + public static final int GL_RGB_SCALE = 0x8573; + public static final int GL_ADD_SIGNED = 0x8574; + public static final int GL_INTERPOLATE = 0x8575; + public static final int GL_SUBTRACT = 0x84E7; + public static final int GL_CONSTANT = 0x8576; + public static final int GL_PRIMARY_COLOR = 0x8577; + public static final int GL_PREVIOUS = 0x8578; + public static final int GL_DOT3_RGB = 0x86AE; + public static final int GL_DOT3_RGBA = 0x86AF; + public static final int GL_CLAMP_TO_BORDER = 0x812D; private GL13() { } @@ -157,139 +158,183 @@ public final class GL13 { static native void initNativeStubs() throws LWJGLException; public static native void glActiveTexture(int texture); + public static native void glClientActiveTexture(int texture); + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position()); } + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 1); } + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2); } + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2); } + private static native void nglCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, Buffer data, int data_offset); + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position()); } + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 1); } + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2); } + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2); } + private static native void nglCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data, int data_offset); + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position()); } + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 1); } + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2); } + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2); } + private static native void nglCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer data, int data_offset); + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position()); } + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 1); } + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2); } + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2); } + private static native void nglCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, Buffer data, int data_offset); + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position()); } + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 1); } + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2); } + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2); } + private static native void nglCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data, int data_offset); + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position()); } + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 1); } + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2); } + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data) { BufferChecks.checkDirect(data); nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2); } + private static native void nglCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, Buffer data, int data_offset); + public static void glGetCompressedTexImage(int target, int lod, ByteBuffer img) { BufferChecks.checkDirect(img); // TODO: check buffer size valid nglGetCompressedTexImage(target, lod, img, img.position()); } + public static void glGetCompressedTexImage(int target, int lod, ShortBuffer img) { BufferChecks.checkDirect(img); // TODO: check buffer size valid nglGetCompressedTexImage(target, lod, img, img.position() << 1); } + public static void glGetCompressedTexImage(int target, int lod, IntBuffer img) { BufferChecks.checkDirect(img); // TODO: check buffer size valid nglGetCompressedTexImage(target, lod, img, img.position() << 2); } + private static native void nglGetCompressedTexImage(int target, int lod, Buffer img, int img_offset); + public static native void glMultiTexCoord1f(int target, float s); + public static native void glMultiTexCoord2f(int target, float s, float t); + public static native void glMultiTexCoord3f(int target, float s, float t, float r); + public static native void glMultiTexCoord4f(int target, float s, float t, float r, float q); + public static void glLoadTransposeMatrix(FloatBuffer m) { BufferChecks.checkBuffer(m, 16); nglLoadTransposeMatrixf(m, m.position()); } + private static native void nglLoadTransposeMatrixf(FloatBuffer m, int m_offset); + public static void glMultTransposeMatrix(FloatBuffer m) { BufferChecks.checkBuffer(m, 16); nglMultTransposeMatrixf(m, m.position()); } + private static native void nglMultTransposeMatrixf(FloatBuffer m, int m_offset); + public static native void glSampleCoverage(float value, boolean invert); } diff --git a/src/java/org/lwjgl/opengl/GL14.java b/src/java/org/lwjgl/opengl/GL14.java index 11b6dc54..d34b5ca2 100644 --- a/src/java/org/lwjgl/opengl/GL14.java +++ b/src/java/org/lwjgl/opengl/GL14.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,52 +41,53 @@ import org.lwjgl.BufferChecks; /** * $Id$ - * + *

* The core OpenGL1.4 API. - * + * * @author cix_foo * @version $Revision$ */ public final class GL14 { - public static final int GL_GENERATE_MIPMAP = 0x8191; - public static final int GL_GENERATE_MIPMAP_HINT = 0x8192; - public static final int GL_DEPTH_COMPONENT16 = 0x81A5; - public static final int GL_DEPTH_COMPONENT24 = 0x81A6; - public static final int GL_DEPTH_COMPONENT32 = 0x81A7; - public static final int GL_TEXTURE_DEPTH_SIZE = 0x884A; - public static final int GL_DEPTH_TEXTURE_MODE = 0x884B; - public static final int GL_TEXTURE_COMPARE_MODE = 0x884C; - public static final int GL_TEXTURE_COMPARE_FUNC = 0x884D; - public static final int GL_COMPARE_R_TO_TEXTURE = 0x884E; - public static final int GL_FOG_COORDINATE_SOURCE = 0x8450; - public static final int GL_FOG_COORDINATE = 0x8451; - public static final int GL_FRAGMENT_DEPTH = 0x8452; - public static final int GL_CURRENT_FOG_COORDINATE = 0x8453; - public static final int GL_FOG_COORDINATE_ARRAY_TYPE = 0x8454; - public static final int GL_FOG_COORDINATE_ARRAY_STRIDE = 0x8455; - public static final int GL_FOG_COORDINATE_ARRAY_POINTER = 0x8456; - public static final int GL_FOG_COORDINATE_ARRAY = 0x8457; - public static final int GL_POINT_SIZE_MIN = 0x8126; - public static final int GL_POINT_SIZE_MAX = 0x8127; - public static final int GL_POINT_FADE_THRESHOLD_SIZE = 0x8128; - public static final int GL_POINT_DISTANCE_ATTENUATION = 0x8129; - public static final int GL_COLOR_SUM = 0x8458; - public static final int GL_CURRENT_SECONDARY_COLOR = 0x8459; - public static final int GL_SECONDARY_COLOR_ARRAY_SIZE = 0x845A; - public static final int GL_SECONDARY_COLOR_ARRAY_TYPE = 0x845B; - public static final int GL_SECONDARY_COLOR_ARRAY_STRIDE = 0x845C; - public static final int GL_SECONDARY_COLOR_ARRAY_POINTER = 0x845D; - public static final int GL_SECONDARY_COLOR_ARRAY = 0x845E; - public static final int GL_BLEND_DST_RGB = 0x80C8; - public static final int GL_BLEND_SRC_RGB = 0x80C9; - public static final int GL_BLEND_DST_ALPHA = 0x80CA; - public static final int GL_BLEND_SRC_ALPHA = 0x80CB; - public static final int GL_INCR_WRAP = 0x8507; - public static final int GL_DECR_WRAP = 0x8508; - public static final int GL_TEXTURE_FILTER_CONTROL = 0x8500; - public static final int GL_TEXTURE_LOD_BIAS = 0x8501; - public static final int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD; - public static final int GL_GL_MIRRORED_REPEAT = 0x8370; + + public static final int GL_GENERATE_MIPMAP = 0x8191; + public static final int GL_GENERATE_MIPMAP_HINT = 0x8192; + public static final int GL_DEPTH_COMPONENT16 = 0x81A5; + public static final int GL_DEPTH_COMPONENT24 = 0x81A6; + public static final int GL_DEPTH_COMPONENT32 = 0x81A7; + public static final int GL_TEXTURE_DEPTH_SIZE = 0x884A; + public static final int GL_DEPTH_TEXTURE_MODE = 0x884B; + public static final int GL_TEXTURE_COMPARE_MODE = 0x884C; + public static final int GL_TEXTURE_COMPARE_FUNC = 0x884D; + public static final int GL_COMPARE_R_TO_TEXTURE = 0x884E; + public static final int GL_FOG_COORDINATE_SOURCE = 0x8450; + public static final int GL_FOG_COORDINATE = 0x8451; + public static final int GL_FRAGMENT_DEPTH = 0x8452; + public static final int GL_CURRENT_FOG_COORDINATE = 0x8453; + public static final int GL_FOG_COORDINATE_ARRAY_TYPE = 0x8454; + public static final int GL_FOG_COORDINATE_ARRAY_STRIDE = 0x8455; + public static final int GL_FOG_COORDINATE_ARRAY_POINTER = 0x8456; + public static final int GL_FOG_COORDINATE_ARRAY = 0x8457; + public static final int GL_POINT_SIZE_MIN = 0x8126; + public static final int GL_POINT_SIZE_MAX = 0x8127; + public static final int GL_POINT_FADE_THRESHOLD_SIZE = 0x8128; + public static final int GL_POINT_DISTANCE_ATTENUATION = 0x8129; + public static final int GL_COLOR_SUM = 0x8458; + public static final int GL_CURRENT_SECONDARY_COLOR = 0x8459; + public static final int GL_SECONDARY_COLOR_ARRAY_SIZE = 0x845A; + public static final int GL_SECONDARY_COLOR_ARRAY_TYPE = 0x845B; + public static final int GL_SECONDARY_COLOR_ARRAY_STRIDE = 0x845C; + public static final int GL_SECONDARY_COLOR_ARRAY_POINTER = 0x845D; + public static final int GL_SECONDARY_COLOR_ARRAY = 0x845E; + public static final int GL_BLEND_DST_RGB = 0x80C8; + public static final int GL_BLEND_SRC_RGB = 0x80C9; + public static final int GL_BLEND_DST_ALPHA = 0x80CA; + public static final int GL_BLEND_SRC_ALPHA = 0x80CB; + public static final int GL_INCR_WRAP = 0x8507; + public static final int GL_DECR_WRAP = 0x8508; + public static final int GL_TEXTURE_FILTER_CONTROL = 0x8500; + public static final int GL_TEXTURE_LOD_BIAS = 0x8501; + public static final int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD; + public static final int GL_GL_MIRRORED_REPEAT = 0x8370; private GL14() { } @@ -94,58 +95,81 @@ public final class GL14 { static native void initNativeStubs() throws LWJGLException; public static native void glBlendEquation(int mode); + public static native void glBlendColor(float red, float green, float blue, float alpha); + public static native void glFogCoordf(float coord); + public static void glFogCoordPointer(int stride, FloatBuffer data) { BufferChecks.checkDirect(data); GLBufferChecks.ensureArrayVBOdisabled(); nglFogCoordPointer(GL11.GL_FLOAT, stride, data, data.position() << 2); } + private static native void nglFogCoordPointer(int type, int stride, Buffer data, int data_offset); + public static void glFogCoordPointer(int type, int stride, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglFogCoordPointerVBO(type, stride, buffer_offset); } + private static native void nglFogCoordPointerVBO(int type, int stride, int buffer_offset); + public static void glMultiDrawArrays(int mode, IntBuffer piFirst, IntBuffer piCount) { BufferChecks.checkDirect(piFirst); BufferChecks.checkDirect(piCount); - if (piFirst.remaining() != piCount.remaining()) { + if ( piFirst.remaining() != piCount.remaining() ) { throw new IllegalArgumentException("piFirst.remaining() != piCount.remaining()"); } nglMultiDrawArrays(mode, piFirst, piFirst.position(), piCount, piCount.position(), piFirst.remaining()); } + private static native void nglMultiDrawArrays(int mode, IntBuffer piFirst, int piFirst_offset, IntBuffer piCount, int piCount_offset, int primcount); /* public static native void glMultiDrawElements(int mode, int piCount, int type, int pIndices, int primcount);*/ - public static native void glPointParameterf (int pname, float param); + public static native void glPointParameterf(int pname, float param); + public static void glPointParameter(int pname, FloatBuffer params) { BufferChecks.checkBuffer(params); nglPointParameterfv(pname, params, params.position()); } + private static native void nglPointParameterfv(int pname, FloatBuffer params, int params_offset); - public static native void glSecondaryColor3b (byte red, byte green, byte blue); - public static native void glSecondaryColor3f (float red, float green, float blue); - public static native void glSecondaryColor3ub (byte red, byte green, byte blue); + + public static native void glSecondaryColor3b(byte red, byte green, byte blue); + + public static native void glSecondaryColor3f(float red, float green, float blue); + + public static native void glSecondaryColor3ub(byte red, byte green, byte blue); + public static void glSecondaryColorPointer(int size, boolean unsigned, int stride, ByteBuffer data) { BufferChecks.checkDirect(data); GLBufferChecks.ensureArrayVBOdisabled(); nglSecondaryColorPointer(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, data, data.position()); } + public static void glSecondaryColorPointer(int size, int stride, FloatBuffer data) { BufferChecks.checkDirect(data); GLBufferChecks.ensureArrayVBOdisabled(); nglSecondaryColorPointer(size, GL11.GL_FLOAT, stride, data, data.position() << 2); } - private static native void nglSecondaryColorPointer (int size, int type, int stride, Buffer data, int data_offset); + + private static native void nglSecondaryColorPointer(int size, int type, int stride, Buffer data, int data_offset); + public static void glSecondaryColorPointer(int size, int type, int stride, int buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); nglSecondaryColorPointerVBO(size, type, stride, buffer_offset); } + private static native void nglSecondaryColorPointerVBO(int size, int type, int stride, int buffer_offset); - public static native void glBlendFuncSeparate (int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha); - public static native void glWindowPos2f (float x, float y); - public static native void glWindowPos2i (int x, int y); - public static native void glWindowPos3f (float x, float y, float z); - public static native void glWindowPos3i (int x, int y, int z); + + public static native void glBlendFuncSeparate(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha); + + public static native void glWindowPos2f(float x, float y); + + public static native void glWindowPos2i(int x, int y); + + public static native void glWindowPos3f(float x, float y, float z); + + public static native void glWindowPos3i(int x, int y, int z); } diff --git a/src/java/org/lwjgl/opengl/GLBufferChecks.java b/src/java/org/lwjgl/opengl/GLBufferChecks.java index 874674e7..7e283da6 100644 --- a/src/java/org/lwjgl/opengl/GLBufferChecks.java +++ b/src/java/org/lwjgl/opengl/GLBufferChecks.java @@ -33,100 +33,101 @@ package org.lwjgl.opengl; /** - * $Id$ A class to - * check buffer boundaries in GL methods. Many GL methods read data from the GL - * into a native Buffer at its current position. If there is unsufficient space - * in the buffer when the call is made then a buffer overflow would otherwise - * occur and cause unexpected behaviour, a crash, or worse, a security risk. - * Therefore in those methods where GL reads data back into a buffer, we will - * call a bounds check method from this class to ensure that there is - * sufficient space in the buffer. - * - * Thrown by the debug build library of the LWJGL if any OpenGL operation - * causes an error. + * $Id$ A class to check buffer boundaries in GL methods. Many GL + * methods read data from the GL into a native Buffer at its current position. If there is unsufficient space in the buffer when + * the call is made then a buffer overflow would otherwise occur and cause unexpected behaviour, a crash, or worse, a security + * risk. Therefore in those methods where GL reads data back into a buffer, we will call a bounds check method from this class + * to ensure that there is sufficient space in the buffer. + *

+ * Thrown by the debug build library of the LWJGL if any OpenGL operation causes an error. * * @author cix_foo * @version $Revision$ */ class GLBufferChecks { + /** Static methods only! */ private GLBufferChecks() { } - /** - * Helper method to ensure that vertex buffer objects are disabled. If they - * are enabled, we'll throw an OpenGLException - */ + /** Helper method to ensure that vertex buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureArrayVBOdisabled() { - if (VBOTracker.getVBOArrayStack().getState() != 0) { + if ( VBOTracker.getVBOArrayStack().getState() != 0 ) { throw new OpenGLException("Cannot use Buffers when VBO is enabled"); } } - /** - * Helper method to ensure that vertex buffer objects are enabled. If they - * are disabled, we'll throw an OpenGLException - */ + + /** Helper method to ensure that vertex buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureArrayVBOenabled() { - if (VBOTracker.getVBOArrayStack().getState() == 0) { + if ( VBOTracker.getVBOArrayStack().getState() == 0 ) { throw new OpenGLException("Cannot use offsets when VBO is disabled"); } } - /** - * Helper method to ensure that vertex buffer objects are disabled. If they - * are enabled, we'll throw an OpenGLException - */ + + /** Helper method to ensure that vertex buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureElementVBOdisabled() { - if (VBOTracker.getVBOElementStack().getState() != 0) { + if ( VBOTracker.getVBOElementStack().getState() != 0 ) { throw new OpenGLException("Cannot use Buffers when VBO is enabled"); } } - /** - * Helper method to ensure that vertex buffer objects are enabled. If they - * are disabled, we'll throw an OpenGLException - */ + + /** Helper method to ensure that vertex buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureElementVBOenabled() { - if (VBOTracker.getVBOElementStack().getState() == 0) { + if ( VBOTracker.getVBOElementStack().getState() == 0 ) { throw new OpenGLException("Cannot use offsets when VBO is disabled"); } } + /** * Calculate the storage required for an image. * - * @param format - * The format of the image (example: GL_RGBA) - * @param type - * The type of the image elements (example: GL_UNSIGNED_BYTE) - * @param width - * The width of the image - * @param height - * The height of the image (1 for 1D images) - * @param depth - * The depth of the image (1 for 2D images) + * @param format The format of the image (example: GL_RGBA) + * @param type The type of the image elements (example: GL_UNSIGNED_BYTE) + * @param width The width of the image + * @param height The height of the image (1 for 1D images) + * @param depth The depth of the image (1 for 2D images) + * * @return the size, in bytes, of the image */ static int calculateImageStorage(int format, int type, int width, int height, int depth) { + return calculateBytesPerPixel(type, format) * width * height * depth; + } + + static int calculateTexImage1DStorage(int format, int type, int width, int border) { + return calculateBytesPerPixel(type, format) * (width + (border << 1)); + } + + static int calculateTexImage2DStorage(int format, int type, int width, int height, int border) { + return calculateTexImage1DStorage(type, format, width, border) * (height + (border << 1)); + } + + static int calculateTexImage3DStorage(int format, int type, int width, int height, int depth, int border) { + return calculateTexImage2DStorage(type, format, width, height, border) * (depth + (border << 1)); + } + + private static int calculateBytesPerPixel(int type, int format) { int bpe; - switch (type) { - case GL11.GL_UNSIGNED_BYTE : - case GL11.GL_BYTE : + switch ( type ) { + case GL11.GL_UNSIGNED_BYTE: + case GL11.GL_BYTE: bpe = 1; break; - case GL11.GL_UNSIGNED_SHORT : - case GL11.GL_SHORT : + case GL11.GL_UNSIGNED_SHORT: + case GL11.GL_SHORT: bpe = 2; break; - case GL11.GL_UNSIGNED_INT : - case GL11.GL_INT : - case GL11.GL_FLOAT : + case GL11.GL_UNSIGNED_INT: + case GL11.GL_INT: + case GL11.GL_FLOAT: bpe = 4; break; default : // TODO: Add more types (like the GL12 types GL_UNSIGNED_INT_8_8_8_8 return 0; - // throw new IllegalArgumentException("Unknown type " + type); + // throw new IllegalArgumentException("Unknown type " + type); } int epp; - switch (format) { + switch ( format ) { case GL11.GL_LUMINANCE: case GL11.GL_ALPHA: epp = 1; @@ -135,13 +136,13 @@ class GLBufferChecks { case GL11.GL_LUMINANCE_ALPHA: epp = 2; break; - case GL11.GL_RGB : - case EXTBgra.GL_BGR_EXT : + case GL11.GL_RGB: + case EXTBgra.GL_BGR_EXT: epp = 3; break; - case GL11.GL_RGBA : - case EXTAbgr.GL_ABGR_EXT : - case EXTBgra.GL_BGRA_EXT : + case GL11.GL_RGBA: + case EXTAbgr.GL_ABGR_EXT: + case EXTBgra.GL_BGRA_EXT: epp = 4; break; default : @@ -150,6 +151,7 @@ class GLBufferChecks { /* // Assume 4 elements per pixel epp = 4;*/ } - return epp * bpe * width * height * depth; + + return bpe * epp; } } diff --git a/src/java/org/lwjgl/opengl/GLUConstants.java b/src/java/org/lwjgl/opengl/GLUConstants.java index 31a50453..f428d001 100644 --- a/src/java/org/lwjgl/opengl/GLUConstants.java +++ b/src/java/org/lwjgl/opengl/GLUConstants.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -33,26 +33,26 @@ package org.lwjgl.opengl; /** * $Id$ - * + *

* GLU constants. - * + * * @author cix_foo * @version $Revision$ */ public interface GLUConstants { + /* Errors: (return value 0 = no error) */ - public static final int GLU_INVALID_ENUM = 100900; - public static final int GLU_INVALID_VALUE = 100901; - public static final int GLU_OUT_OF_MEMORY = 100902; - public static final int GLU_INCOMPATIBLE_GL_VERSION = 100903; - + int GLU_INVALID_ENUM = 100900; + int GLU_INVALID_VALUE = 100901; + int GLU_OUT_OF_MEMORY = 100902; + int GLU_INCOMPATIBLE_GL_VERSION = 100903; + /* StringName */ - public static final int GLU_VERSION = 100800; - public static final int GLU_EXTENSIONS = 100801; - + int GLU_VERSION = 100800; + int GLU_EXTENSIONS = 100801; + /* Boolean */ - public static final int GLU_TRUE = GL11.GL_TRUE; - public static final int GLU_FALSE = GL11.GL_FALSE; - - + int GLU_TRUE = GL11.GL_TRUE; + int GLU_FALSE = GL11.GL_FALSE; + } diff --git a/src/java/org/lwjgl/opengl/NVCopyDepthToColor.java b/src/java/org/lwjgl/opengl/NVCopyDepthToColor.java index fe4469b6..08abf290 100644 --- a/src/java/org/lwjgl/opengl/NVCopyDepthToColor.java +++ b/src/java/org/lwjgl/opengl/NVCopyDepthToColor.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVCopyDepthToColor { - public static final int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E; - public static final int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F; + + public static final int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E; + public static final int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F; private NVCopyDepthToColor() { } diff --git a/src/java/org/lwjgl/opengl/NVDepthClamp.java b/src/java/org/lwjgl/opengl/NVDepthClamp.java index c19cdee1..d95f626a 100644 --- a/src/java/org/lwjgl/opengl/NVDepthClamp.java +++ b/src/java/org/lwjgl/opengl/NVDepthClamp.java @@ -1,38 +1,39 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVDepthClamp { - public static final int GL_DEPTH_CLAMP_NV = 0x864F; + + public static final int GL_DEPTH_CLAMP_NV = 0x864F; private NVDepthClamp() { } diff --git a/src/java/org/lwjgl/opengl/NVEvaluators.java b/src/java/org/lwjgl/opengl/NVEvaluators.java index f29f8eee..9a40403f 100644 --- a/src/java/org/lwjgl/opengl/NVEvaluators.java +++ b/src/java/org/lwjgl/opengl/NVEvaluators.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -39,30 +39,31 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVEvaluators { - public static final int GL_EVAL_2D_NV = 0x86C0; - public static final int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1; - public static final int GL_MAP_TESSELLATION_NV = 0x86C2; - public static final int GL_MAP_ATTRIB_U_ORDER_NV = 0x86C3; - public static final int GL_MAP_ATTRIB_V_ORDER_NV = 0x86C4; - public static final int GL_EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5; - public static final int GL_EVAL_VERTEX_ATTRIB0_NV = 0x86C6; - public static final int GL_EVAL_VERTEX_ATTRIB1_NV = 0x86C7; - public static final int GL_EVAL_VERTEX_ATTRIB2_NV = 0x86C8; - public static final int GL_EVAL_VERTEX_ATTRIB3_NV = 0x86C9; - public static final int GL_EVAL_VERTEX_ATTRIB4_NV = 0x86CA; - public static final int GL_EVAL_VERTEX_ATTRIB5_NV = 0x86CB; - public static final int GL_EVAL_VERTEX_ATTRIB6_NV = 0x86CC; - public static final int GL_EVAL_VERTEX_ATTRIB7_NV = 0x86CD; - public static final int GL_EVAL_VERTEX_ATTRIB8_NV = 0x86CE; - public static final int GL_EVAL_VERTEX_ATTRIB9_NV = 0x86CF; - public static final int GL_EVAL_VERTEX_ATTRIB10_NV = 0x86D0; - public static final int GL_EVAL_VERTEX_ATTRIB11_NV = 0x86D1; - public static final int GL_EVAL_VERTEX_ATTRIB12_NV = 0x86D2; - public static final int GL_EVAL_VERTEX_ATTRIB13_NV = 0x86D3; - public static final int GL_EVAL_VERTEX_ATTRIB14_NV = 0x86D4; - public static final int GL_EVAL_VERTEX_ATTRIB15_NV = 0x86D5; - public static final int GL_MAX_MAP_TESSELLATION_NV = 0x86D6; - public static final int GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7; + + public static final int GL_EVAL_2D_NV = 0x86C0; + public static final int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1; + public static final int GL_MAP_TESSELLATION_NV = 0x86C2; + public static final int GL_MAP_ATTRIB_U_ORDER_NV = 0x86C3; + public static final int GL_MAP_ATTRIB_V_ORDER_NV = 0x86C4; + public static final int GL_EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5; + public static final int GL_EVAL_VERTEX_ATTRIB0_NV = 0x86C6; + public static final int GL_EVAL_VERTEX_ATTRIB1_NV = 0x86C7; + public static final int GL_EVAL_VERTEX_ATTRIB2_NV = 0x86C8; + public static final int GL_EVAL_VERTEX_ATTRIB3_NV = 0x86C9; + public static final int GL_EVAL_VERTEX_ATTRIB4_NV = 0x86CA; + public static final int GL_EVAL_VERTEX_ATTRIB5_NV = 0x86CB; + public static final int GL_EVAL_VERTEX_ATTRIB6_NV = 0x86CC; + public static final int GL_EVAL_VERTEX_ATTRIB7_NV = 0x86CD; + public static final int GL_EVAL_VERTEX_ATTRIB8_NV = 0x86CE; + public static final int GL_EVAL_VERTEX_ATTRIB9_NV = 0x86CF; + public static final int GL_EVAL_VERTEX_ATTRIB10_NV = 0x86D0; + public static final int GL_EVAL_VERTEX_ATTRIB11_NV = 0x86D1; + public static final int GL_EVAL_VERTEX_ATTRIB12_NV = 0x86D2; + public static final int GL_EVAL_VERTEX_ATTRIB13_NV = 0x86D3; + public static final int GL_EVAL_VERTEX_ATTRIB14_NV = 0x86D4; + public static final int GL_EVAL_VERTEX_ATTRIB15_NV = 0x86D5; + public static final int GL_MAX_MAP_TESSELLATION_NV = 0x86D6; + public static final int GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7; private NVEvaluators() { } @@ -72,47 +73,60 @@ public final class NVEvaluators { public static void glGetMapControlPointsNV(int target, int index, int type, int ustride, int vstride, boolean packed, FloatBuffer pPoints) { // TODO:Check buffer size BufferChecks.checkDirect(pPoints); - nglGetMapControlPointsNV(target, index, type, ustride, vstride, packed, pPoints, pPoints.position()<<2); + nglGetMapControlPointsNV(target, index, type, ustride, vstride, packed, pPoints, pPoints.position() << 2); } + private static native void nglGetMapControlPointsNV(int target, int index, int type, int ustride, int vstride, boolean packed, Buffer pPoints, int pPoints_offset); + public static void glMapControlPointsNV(int target, int index, int type, int ustride, int vstride, int uorder, int vorder, boolean packed, FloatBuffer pPoints) { BufferChecks.checkDirect(pPoints); // TODO:Check buffer size - nglMapControlPointsNV(target, index, type, ustride, vstride, uorder, vorder, packed, pPoints, pPoints.position()<<2); + nglMapControlPointsNV(target, index, type, ustride, vstride, uorder, vorder, packed, pPoints, pPoints.position() << 2); } + private static native void nglMapControlPointsNV(int target, int index, int type, int ustride, int vstride, int uorder, int vorder, boolean packed, Buffer pPoints, int pPoints_offset); + public static void glMapParameterNV(int target, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglMapParameterfvNV(target, pname, pfParams, pfParams.position()); } + private static native void nglMapParameterfvNV(int target, int pname, FloatBuffer pfParams, int pfParams_offset); + public static void glMapParameterNV(int target, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglMapParameterivNV(target, pname, piParams, piParams.position()); } + private static native void nglMapParameterivNV(int target, int pname, IntBuffer piParams, int piParams_offset); public static void glGetMapParameterNV(int target, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglGetMapParameterfvNV(target, pname, pfParams, pfParams.position()); } + private static native void nglGetMapParameterfvNV(int target, int pname, FloatBuffer pfParams, int pfParams_offset); public static void glGetMapParameterNV(int target, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglGetMapParameterivNV(target, pname, piParams, piParams.position()); } + private static native void nglGetMapParameterivNV(int target, int pname, IntBuffer piParams, int piParams_offset); + public static void glGetMapAttribParameterNV(int target, int index, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglGetMapAttribParameterfvNV(target, index, pname, pfParams, pfParams.position()); } + private static native void nglGetMapAttribParameterfvNV(int target, int index, int pname, FloatBuffer pfParams, int pfParams_offset); public static void glGetMapAttribParameterNV(int target, int index, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglGetMapAttribParameterivNV(target, index, pname, piParams, piParams.position()); } + private static native void nglGetMapAttribParameterivNV(int target, int index, int pname, IntBuffer piParams, int piParams_offset); + public static native void glEvalMapsNV(int target, int mode); } diff --git a/src/java/org/lwjgl/opengl/NVFence.java b/src/java/org/lwjgl/opengl/NVFence.java index 889a08cf..54b69ad5 100644 --- a/src/java/org/lwjgl/opengl/NVFence.java +++ b/src/java/org/lwjgl/opengl/NVFence.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,9 +37,10 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVFence { - public static final int GL_ALL_COMPLETED_NV = 0x84F2; - public static final int GL_FENCE_STATUS_NV = 0x84F3; - public static final int GL_FENCE_CONDITION_NV = 0x84F4; + + public static final int GL_ALL_COMPLETED_NV = 0x84F2; + public static final int GL_FENCE_STATUS_NV = 0x84F3; + public static final int GL_FENCE_CONDITION_NV = 0x84F4; private NVFence() { } @@ -50,11 +51,14 @@ public final class NVFence { BufferChecks.checkDirect(piFences); nglGenFencesNV(piFences.remaining(), piFences, piFences.position()); } + private static native void nglGenFencesNV(int n, IntBuffer piFences, int piFences_offset); + public static void glDeleteFencesNV(IntBuffer piFences) { BufferChecks.checkDirect(piFences); nglDeleteFencesNV(piFences.remaining(), piFences, piFences.position()); } + private static native void nglDeleteFencesNV(int n, IntBuffer piFences, int piFences_offset); public static native void glSetFenceNV(int fence, int condition); @@ -69,5 +73,6 @@ public final class NVFence { BufferChecks.checkBuffer(piParams); nglGetFenceivNV(fence, pname, piParams, piParams.position()); } + private static native void nglGetFenceivNV(int fence, int pname, IntBuffer piParams, int piParams_offset); } diff --git a/src/java/org/lwjgl/opengl/NVFloatBuffer.java b/src/java/org/lwjgl/opengl/NVFloatBuffer.java index e2815965..0c308be8 100644 --- a/src/java/org/lwjgl/opengl/NVFloatBuffer.java +++ b/src/java/org/lwjgl/opengl/NVFloatBuffer.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVFloatBuffer { + /* * Accepted by the parameter of TexImage2D and * CopyTexImage2D: diff --git a/src/java/org/lwjgl/opengl/NVFogDistance.java b/src/java/org/lwjgl/opengl/NVFogDistance.java index f3003491..a034d1a9 100644 --- a/src/java/org/lwjgl/opengl/NVFogDistance.java +++ b/src/java/org/lwjgl/opengl/NVFogDistance.java @@ -1,29 +1,29 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS @@ -32,9 +32,10 @@ package org.lwjgl.opengl; public final class NVFogDistance { - public static final int GL_FOG_DISTANCE_MODE_NV = 0x855A; - public static final int GL_EYE_RADIAL_NV = 0x855B; - public static final int GL_EYE_PLANE_ABSOLUTE_NV = 0x855C; + + public static final int GL_FOG_DISTANCE_MODE_NV = 0x855A; + public static final int GL_EYE_RADIAL_NV = 0x855B; + public static final int GL_EYE_PLANE_ABSOLUTE_NV = 0x855C; private NVFogDistance() { } diff --git a/src/java/org/lwjgl/opengl/NVFragmentProgram.java b/src/java/org/lwjgl/opengl/NVFragmentProgram.java index a392d793..4c744e68 100644 --- a/src/java/org/lwjgl/opengl/NVFragmentProgram.java +++ b/src/java/org/lwjgl/opengl/NVFragmentProgram.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -38,19 +38,20 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVFragmentProgram extends NVProgram { + /* - Accepted by the parameter of Disable, Enable, and IsEnabled, by the - parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, - and by the parameter of BindProgramNV, LoadProgramNV, - ProgramLocalParameter4dARB, ProgramLocalParameter4dvARB, - ProgramLocalParameter4fARB, ProgramLocalParameter4fvARB, - GetProgramLocalParameterdvARB, and GetProgramLocalParameterfvARB: + * Accepted by the parameter of Disable, Enable, and IsEnabled, by the + * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, + * and by the parameter of BindProgramNV, LoadProgramNV, + * ProgramLocalParameter4dARB, ProgramLocalParameter4dvARB, + * ProgramLocalParameter4fARB, ProgramLocalParameter4fvARB, + * GetProgramLocalParameterdvARB, and GetProgramLocalParameterfvARB: */ public static final int GL_FRAGMENT_PROGRAM_NV = 0x8870; /* - Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, - and GetDoublev: + * Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, + * and GetDoublev: */ public static final int GL_MAX_TEXTURE_COORDS_NV = 0x8871; public static final int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872; @@ -63,40 +64,22 @@ public final class NVFragmentProgram extends NVProgram { static native void initNativeStubs() throws LWJGLException; // --------------------------- - public static void glProgramNamedParameter4fNV(int id, ByteBuffer name, float x, float y, float z, float w) { BufferChecks.checkDirect(name); nglProgramNamedParameter4fNV(id, name.remaining(), name, name.position(), x, y, z, w); } - private static native void nglProgramNamedParameter4fNV( - int id, - int length, - ByteBuffer name, - int nameOffset, - float x, - float y, - float z, - float w); - + private static native void nglProgramNamedParameter4fNV(int id, int length, ByteBuffer name, int nameOffset, float x, float y, float z, float w); // --------------------------- // --------------------------- - public static void glGetProgramNamedParameterNV(int id, ByteBuffer name, FloatBuffer params) { BufferChecks.checkDirect(name); BufferChecks.checkBuffer(params); nglGetProgramNamedParameterfvNV(id, name.remaining(), name, name.position(), params, params.position()); } - private static native void nglGetProgramNamedParameterfvNV( - int id, - int length, - ByteBuffer name, - int nameOffset, - FloatBuffer params, - int paramsOffset); - + private static native void nglGetProgramNamedParameterfvNV(int id, int length, ByteBuffer name, int nameOffset, FloatBuffer params, int paramsOffset); // --------------------------- } diff --git a/src/java/org/lwjgl/opengl/NVFragmentProgram2.java b/src/java/org/lwjgl/opengl/NVFragmentProgram2.java index ea67d69e..8277b24c 100644 --- a/src/java/org/lwjgl/opengl/NVFragmentProgram2.java +++ b/src/java/org/lwjgl/opengl/NVFragmentProgram2.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVFragmentProgram2 { + /* * Accepted by the parameter of GetProgramivARB: */ diff --git a/src/java/org/lwjgl/opengl/NVHalfFloat.java b/src/java/org/lwjgl/opengl/NVHalfFloat.java index ba9cb6c1..40db8900 100644 --- a/src/java/org/lwjgl/opengl/NVHalfFloat.java +++ b/src/java/org/lwjgl/opengl/NVHalfFloat.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,6 +37,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVHalfFloat { + /* * Accepted by the argument of VertexPointer, NormalPointer, * ColorPointer, TexCoordPointer, FogCoordPointerEXT, @@ -97,8 +98,7 @@ public final class NVHalfFloat { nglVertexAttribs1hvNV(index, attribs.remaining(), attribs, attribs.position()); } - private static native void nglVertexAttribs1hvNV(int index, int n, ShortBuffer attribs, - int attribsOffset); + private static native void nglVertexAttribs1hvNV(int index, int n, ShortBuffer attribs, int attribsOffset); // --------------------------- // --------------------------- @@ -107,8 +107,7 @@ public final class NVHalfFloat { nglVertexAttribs2hvNV(index, attribs.remaining() >> 1, attribs, attribs.position()); } - private static native void nglVertexAttribs2hvNV(int index, int n, ShortBuffer attribs, - int attribsOffset); + private static native void nglVertexAttribs2hvNV(int index, int n, ShortBuffer attribs, int attribsOffset); // --------------------------- // --------------------------- @@ -117,8 +116,7 @@ public final class NVHalfFloat { nglVertexAttribs3hvNV(index, attribs.remaining() / 3, attribs, attribs.position()); } - private static native void nglVertexAttribs3hvNV(int index, int n, ShortBuffer attribs, - int attribsOffset); + private static native void nglVertexAttribs3hvNV(int index, int n, ShortBuffer attribs, int attribsOffset); // --------------------------- // --------------------------- @@ -127,8 +125,7 @@ public final class NVHalfFloat { nglVertexAttribs4hvNV(index, attribs.remaining() >> 2, attribs, attribs.position()); } - private static native void nglVertexAttribs4hvNV(int index, int n, ShortBuffer attribs, - int attribsOffset); + private static native void nglVertexAttribs4hvNV(int index, int n, ShortBuffer attribs, int attribsOffset); // --------------------------- } diff --git a/src/java/org/lwjgl/opengl/NVLightMaxExponent.java b/src/java/org/lwjgl/opengl/NVLightMaxExponent.java index a6f51148..824f531c 100644 --- a/src/java/org/lwjgl/opengl/NVLightMaxExponent.java +++ b/src/java/org/lwjgl/opengl/NVLightMaxExponent.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVLightMaxExponent { - public static final int GL_MAX_SHININESS_NV = 0x8504; - public static final int GL_MAX_SPOT_EXPONENT_NV = 0x8505; + + public static final int GL_MAX_SHININESS_NV = 0x8504; + public static final int GL_MAX_SPOT_EXPONENT_NV = 0x8505; private NVLightMaxExponent() { } diff --git a/src/java/org/lwjgl/opengl/NVMultisampleFilterHint.java b/src/java/org/lwjgl/opengl/NVMultisampleFilterHint.java index 86cc3d17..c5012a48 100644 --- a/src/java/org/lwjgl/opengl/NVMultisampleFilterHint.java +++ b/src/java/org/lwjgl/opengl/NVMultisampleFilterHint.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVMultisampleFilterHint { + /* * Accepted by the parameter of Hint and by the * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: diff --git a/src/java/org/lwjgl/opengl/NVOcclusionQuery.java b/src/java/org/lwjgl/opengl/NVOcclusionQuery.java index b1746c2b..a70e5cc5 100644 --- a/src/java/org/lwjgl/opengl/NVOcclusionQuery.java +++ b/src/java/org/lwjgl/opengl/NVOcclusionQuery.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,13 +37,14 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVOcclusionQuery { - public static final int GL_OCCLUSION_TEST_HP = 0x8165; - public static final int GL_OCCLUSION_TEST_RESULT_HP = 0x8166; + + public static final int GL_OCCLUSION_TEST_HP = 0x8165; + public static final int GL_OCCLUSION_TEST_RESULT_HP = 0x8166; /* HP_occlusion_test */ - public static final int GL_PIXEL_COUNTER_BITS_NV = 0x8864; - public static final int GL_CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865; - public static final int GL_PIXEL_COUNT_NV = 0x8866; - public static final int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867; + public static final int GL_PIXEL_COUNTER_BITS_NV = 0x8864; + public static final int GL_CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865; + public static final int GL_PIXEL_COUNT_NV = 0x8866; + public static final int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867; private NVOcclusionQuery() { } @@ -54,14 +55,18 @@ public final class NVOcclusionQuery { BufferChecks.checkDirect(piIDs); nglGenOcclusionQueriesNV(piIDs.remaining(), piIDs, piIDs.position()); } + private static native void nglGenOcclusionQueriesNV(int n, IntBuffer piIDs, int piIDs_offset); + public static void glDeleteOcclusionQueriesNV(IntBuffer piIDs) { BufferChecks.checkDirect(piIDs); nglDeleteOcclusionQueriesNV(piIDs.remaining(), piIDs, piIDs.position()); } + private static native void nglDeleteOcclusionQueriesNV(int n, IntBuffer piIDs, int piIDs_offset); public static native boolean glIsOcclusionQueryNV(int id); + public static native void glBeginOcclusionQueryNV(int id); public static native void glEndOcclusionQueryNV(); @@ -70,11 +75,13 @@ public final class NVOcclusionQuery { BufferChecks.checkBuffer(piParams); nglGetOcclusionQueryivNV(id, pname, piParams, piParams.position()); } + private static native void nglGetOcclusionQueryivNV(int id, int pname, IntBuffer piParams, int piParams_offset); public static void glGetOcclusionQueryuNV(int id, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglGetOcclusionQueryuivNV(id, pname, piParams, piParams.position()); } + private static native void nglGetOcclusionQueryuivNV(int id, int pname, IntBuffer piParams, int piParams_offset); } diff --git a/src/java/org/lwjgl/opengl/NVPackedDepthStencil.java b/src/java/org/lwjgl/opengl/NVPackedDepthStencil.java index 0cdc2070..fe8a22d4 100644 --- a/src/java/org/lwjgl/opengl/NVPackedDepthStencil.java +++ b/src/java/org/lwjgl/opengl/NVPackedDepthStencil.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVPackedDepthStencil { - public static final int GL_DEPTH_STENCIL_NV = 0x84F9; - public static final int GL_UNSIGNED_INT_24_8_NV = 0x84FA; + + public static final int GL_DEPTH_STENCIL_NV = 0x84F9; + public static final int GL_UNSIGNED_INT_24_8_NV = 0x84FA; private NVPackedDepthStencil() { } diff --git a/src/java/org/lwjgl/opengl/NVPixelDataRange.java b/src/java/org/lwjgl/opengl/NVPixelDataRange.java index 413b3024..52f4aa70 100644 --- a/src/java/org/lwjgl/opengl/NVPixelDataRange.java +++ b/src/java/org/lwjgl/opengl/NVPixelDataRange.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -41,6 +41,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVPixelDataRange { + /* * Accepted by the parameter of PixelDataRangeNV and * FlushPixelDataRangeNV, and by the parameter of @@ -88,8 +89,7 @@ public final class NVPixelDataRange { nglPixelDataRangeNV(target, data.remaining() << 2, data, data.position() << 2); } - private static native void nglPixelDataRangeNV(int target, int length, Buffer data, - int dataOffset); + private static native void nglPixelDataRangeNV(int target, int length, Buffer data, int dataOffset); // --------------------------- public static native void glFlushPixelDataRangeNV(int target); diff --git a/src/java/org/lwjgl/opengl/NVPointSprite.java b/src/java/org/lwjgl/opengl/NVPointSprite.java index 3a3a3c6e..316fe653 100644 --- a/src/java/org/lwjgl/opengl/NVPointSprite.java +++ b/src/java/org/lwjgl/opengl/NVPointSprite.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,9 +37,10 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVPointSprite { - public static final int GL_POINT_SPRITE_NV = 0x8861; - public static final int GL_COORD_REPLACE_NV = 0x8862; - public static final int GL_POINT_SPRITE_R_MODE_NV = 0x8863; + + public static final int GL_POINT_SPRITE_NV = 0x8861; + public static final int GL_COORD_REPLACE_NV = 0x8862; + public static final int GL_POINT_SPRITE_R_MODE_NV = 0x8863; private NVPointSprite() { } @@ -52,5 +53,6 @@ public final class NVPointSprite { BufferChecks.checkBuffer(piParams); nglPointParameterivNV(pname, piParams, piParams.position()); } + private static native void nglPointParameterivNV(int pname, IntBuffer piParams, int piParams_offset); } diff --git a/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java b/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java index 7024a620..933d3c31 100644 --- a/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java +++ b/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,6 +34,7 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; public final class NVPrimitiveRestart { + /* * Accepted by the parameter of EnableClientState and * DisableClientState, by the parameter of IsEnabled, and by diff --git a/src/java/org/lwjgl/opengl/NVProgram.java b/src/java/org/lwjgl/opengl/NVProgram.java index 3426b7f0..5fa308fb 100644 --- a/src/java/org/lwjgl/opengl/NVProgram.java +++ b/src/java/org/lwjgl/opengl/NVProgram.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -122,18 +122,10 @@ public abstract class NVProgram { BufferChecks.checkDirect(programResidences); if ( programIDs.remaining() != programResidences.remaining() ) throw new IllegalArgumentException("programIDs.remaining() != programResidences.remaining()"); - return nglAreProgramsResidentNV(programIDs.remaining(), - programIDs, - programIDs.position(), - programResidences, - programResidences.position()); + return nglAreProgramsResidentNV(programIDs.remaining(), programIDs, programIDs.position(), programResidences, programResidences.position()); } - private static native boolean nglAreProgramsResidentNV(int n, - IntBuffer programIDs, - int programIDsOffset, - ByteBuffer programResidences, - int programResidencesOffset); + private static native boolean nglAreProgramsResidentNV(int n, IntBuffer programIDs, int programIDsOffset, ByteBuffer programResidences, int programResidencesOffset); // --------------------------- // --------------------------- diff --git a/src/java/org/lwjgl/opengl/NVRegisterCombiners.java b/src/java/org/lwjgl/opengl/NVRegisterCombiners.java index 54f7e9a4..612b0dc7 100644 --- a/src/java/org/lwjgl/opengl/NVRegisterCombiners.java +++ b/src/java/org/lwjgl/opengl/NVRegisterCombiners.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -38,57 +38,58 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVRegisterCombiners { - public static final int GL_REGISTER_COMBINERS_NV = 0x8522; - public static final int GL_COMBINER0_NV = 0x8550; - public static final int GL_COMBINER1_NV = 0x8551; - public static final int GL_COMBINER2_NV = 0x8552; - public static final int GL_COMBINER3_NV = 0x8553; - public static final int GL_COMBINER4_NV = 0x8554; - public static final int GL_COMBINER5_NV = 0x8555; - public static final int GL_COMBINER6_NV = 0x8556; - public static final int GL_COMBINER7_NV = 0x8557; - public static final int GL_VARIABLE_A_NV = 0x8523; - public static final int GL_VARIABLE_B_NV = 0x8524; - public static final int GL_VARIABLE_C_NV = 0x8525; - public static final int GL_VARIABLE_D_NV = 0x8526; - public static final int GL_VARIABLE_E_NV = 0x8527; - public static final int GL_VARIABLE_F_NV = 0x8528; - public static final int GL_VARIABLE_G_NV = 0x8529; - public static final int GL_CONSTANT_COLOR0_NV = 0x852A; - public static final int GL_CONSTANT_COLOR1_NV = 0x852B; - public static final int GL_PRIMARY_COLOR_NV = 0x852C; - public static final int GL_SECONDARY_COLOR_NV = 0x852D; - public static final int GL_SPARE0_NV = 0x852E; - public static final int GL_SPARE1_NV = 0x852F; - public static final int GL_UNSIGNED_IDENTITY_NV = 0x8536; - public static final int GL_UNSIGNED_INVERT_NV = 0x8537; - public static final int GL_EXPAND_NORMAL_NV = 0x8538; - public static final int GL_EXPAND_NEGATE_NV = 0x8539; - public static final int GL_HALF_BIAS_NORMAL_NV = 0x853A; - public static final int GL_HALF_BIAS_NEGATE_NV = 0x853B; - public static final int GL_SIGNED_IDENTITY_NV = 0x853C; - public static final int GL_SIGNED_NEGATE_NV = 0x853D; - public static final int GL_E_TIMES_F_NV = 0x8531; - public static final int GL_SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532; - public static final int GL_SCALE_BY_TWO_NV = 0x853E; - public static final int GL_SCALE_BY_FOUR_NV = 0x853F; - public static final int GL_SCALE_BY_ONE_HALF_NV = 0x8540; - public static final int GL_BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541; - public static final int GL_DISCARD_NV = 0x8530; - public static final int GL_COMBINER_INPUT_NV = 0x8542; - public static final int GL_COMBINER_MAPPING_NV = 0x8543; - public static final int GL_COMBINER_COMPONENT_USAGE_NV = 0x8544; - public static final int GL_COMBINER_AB_DOT_PRODUCT_NV = 0x8545; - public static final int GL_COMBINER_CD_DOT_PRODUCT_NV = 0x8546; - public static final int GL_COMBINER_MUX_SUM_NV = 0x8547; - public static final int GL_COMBINER_SCALE_NV = 0x8548; - public static final int GL_COMBINER_BIAS_NV = 0x8549; - public static final int GL_COMBINER_AB_OUTPUT_NV = 0x854A; - public static final int GL_COMBINER_CD_OUTPUT_NV = 0x854B; - public static final int GL_COMBINER_SUM_OUTPUT_NV = 0x854C; - public static final int GL_NUM_GENERAL_COMBINERS_NV = 0x854E; - public static final int GL_COLOR_SUM_CLAMP_NV = 0x854F; - public static final int GL_MAX_GENERAL_COMBINERS_NV = 0x854D; + + public static final int GL_REGISTER_COMBINERS_NV = 0x8522; + public static final int GL_COMBINER0_NV = 0x8550; + public static final int GL_COMBINER1_NV = 0x8551; + public static final int GL_COMBINER2_NV = 0x8552; + public static final int GL_COMBINER3_NV = 0x8553; + public static final int GL_COMBINER4_NV = 0x8554; + public static final int GL_COMBINER5_NV = 0x8555; + public static final int GL_COMBINER6_NV = 0x8556; + public static final int GL_COMBINER7_NV = 0x8557; + public static final int GL_VARIABLE_A_NV = 0x8523; + public static final int GL_VARIABLE_B_NV = 0x8524; + public static final int GL_VARIABLE_C_NV = 0x8525; + public static final int GL_VARIABLE_D_NV = 0x8526; + public static final int GL_VARIABLE_E_NV = 0x8527; + public static final int GL_VARIABLE_F_NV = 0x8528; + public static final int GL_VARIABLE_G_NV = 0x8529; + public static final int GL_CONSTANT_COLOR0_NV = 0x852A; + public static final int GL_CONSTANT_COLOR1_NV = 0x852B; + public static final int GL_PRIMARY_COLOR_NV = 0x852C; + public static final int GL_SECONDARY_COLOR_NV = 0x852D; + public static final int GL_SPARE0_NV = 0x852E; + public static final int GL_SPARE1_NV = 0x852F; + public static final int GL_UNSIGNED_IDENTITY_NV = 0x8536; + public static final int GL_UNSIGNED_INVERT_NV = 0x8537; + public static final int GL_EXPAND_NORMAL_NV = 0x8538; + public static final int GL_EXPAND_NEGATE_NV = 0x8539; + public static final int GL_HALF_BIAS_NORMAL_NV = 0x853A; + public static final int GL_HALF_BIAS_NEGATE_NV = 0x853B; + public static final int GL_SIGNED_IDENTITY_NV = 0x853C; + public static final int GL_SIGNED_NEGATE_NV = 0x853D; + public static final int GL_E_TIMES_F_NV = 0x8531; + public static final int GL_SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532; + public static final int GL_SCALE_BY_TWO_NV = 0x853E; + public static final int GL_SCALE_BY_FOUR_NV = 0x853F; + public static final int GL_SCALE_BY_ONE_HALF_NV = 0x8540; + public static final int GL_BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541; + public static final int GL_DISCARD_NV = 0x8530; + public static final int GL_COMBINER_INPUT_NV = 0x8542; + public static final int GL_COMBINER_MAPPING_NV = 0x8543; + public static final int GL_COMBINER_COMPONENT_USAGE_NV = 0x8544; + public static final int GL_COMBINER_AB_DOT_PRODUCT_NV = 0x8545; + public static final int GL_COMBINER_CD_DOT_PRODUCT_NV = 0x8546; + public static final int GL_COMBINER_MUX_SUM_NV = 0x8547; + public static final int GL_COMBINER_SCALE_NV = 0x8548; + public static final int GL_COMBINER_BIAS_NV = 0x8549; + public static final int GL_COMBINER_AB_OUTPUT_NV = 0x854A; + public static final int GL_COMBINER_CD_OUTPUT_NV = 0x854B; + public static final int GL_COMBINER_SUM_OUTPUT_NV = 0x854C; + public static final int GL_NUM_GENERAL_COMBINERS_NV = 0x854E; + public static final int GL_COLOR_SUM_CLAMP_NV = 0x854F; + public static final int GL_MAX_GENERAL_COMBINERS_NV = 0x854D; private NVRegisterCombiners() { } @@ -101,6 +102,7 @@ public final class NVRegisterCombiners { BufferChecks.checkBuffer(pfParams); nglCombinerParameterfvNV(pname, pfParams, pfParams.position()); } + private static native void nglCombinerParameterfvNV(int pname, FloatBuffer pfParams, int pfParams_offset); public static native void glCombinerParameteriNV(int pname, int param); @@ -109,61 +111,54 @@ public final class NVRegisterCombiners { BufferChecks.checkBuffer(piParams); nglCombinerParameterivNV(pname, piParams, piParams.position()); } + private static native void nglCombinerParameterivNV(int pname, IntBuffer piParams, int piParams_offset); - public static native void glCombinerInputNV( - int stage, - int portion, - int variable, - int input, - int mapping, - int componentUsage); - public static native void glCombinerOutputNV( - int stage, - int portion, - int abOutput, - int cdOutput, - int sumOutput, - int scale, - int bias, - boolean abDotProduct, - boolean cdDotProduct, - boolean muxSum); - public static native void glFinalCombinerInputNV( - int variable, - int input, - int mapping, - int componentUsage); + + public static native void glCombinerInputNV(int stage, int portion, int variable, int input, int mapping, int componentUsage); + + public static native void glCombinerOutputNV(int stage, int portion, int abOutput, int cdOutput, int sumOutput, int scale, int bias, boolean abDotProduct, boolean cdDotProduct, boolean muxSum); + + public static native void glFinalCombinerInputNV(int variable, int input, int mapping, int componentUsage); + public static void glGetCombinerInputParameterNV(int stage, int portion, int variable, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglGetCombinerInputParameterfvNV(stage, portion, variable, pname, pfParams, pfParams.position()); } + private static native void nglGetCombinerInputParameterfvNV(int stage, int portion, int variable, int pname, FloatBuffer pfParams, int pfParams_offset); public static void glGetCombinerInputParameterNV(int stage, int portion, int variable, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglGetCombinerInputParameterivNV(stage, portion, variable, pname, piParams, piParams.position()); } + private static native void nglGetCombinerInputParameterivNV(int stage, int portion, int variable, int pname, IntBuffer piParams, int piParams_offset); + public static void glGetCombinerOutputParameterNV(int stage, int portion, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglGetCombinerOutputParameterfvNV(stage, portion, pname, pfParams, pfParams.position()); } + private static native void nglGetCombinerOutputParameterfvNV(int stage, int portion, int pname, FloatBuffer pfParams, int pfParams_offset); public static void glGetCombinerOutputParameterNV(int stage, int portion, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglGetCombinerOutputParameterivNV(stage, portion, pname, piParams, piParams.position()); } + private static native void nglGetCombinerOutputParameterivNV(int stage, int portion, int pname, IntBuffer piParams, int pfParams_offset); + public static void glGetFinalCombinerInputParameterNV(int variable, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglGetFinalCombinerInputParameterfvNV(variable, pname, pfParams, pfParams.position()); } + private static native void nglGetFinalCombinerInputParameterfvNV(int variable, int pname, FloatBuffer pfParams, int pfParams_offset); public static void glGetFinalCombinerInputParameterNV(int variable, int pname, IntBuffer piParams) { BufferChecks.checkBuffer(piParams); nglGetFinalCombinerInputParameterivNV(variable, pname, piParams, piParams.position()); } + private static native void nglGetFinalCombinerInputParameterivNV(int variable, int pname, IntBuffer piParams, int piParams_offset); } diff --git a/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java b/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java index f66ac5b9..7db10cda 100644 --- a/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java +++ b/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -37,7 +37,8 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVRegisterCombiners2 { - public static final int GL_PER_STAGE_CONSTANTS_NV = 0x8535; + + public static final int GL_PER_STAGE_CONSTANTS_NV = 0x8535; private NVRegisterCombiners2() { } @@ -48,10 +49,13 @@ public final class NVRegisterCombiners2 { BufferChecks.checkBuffer(pfParams); nglCombinerStageParameterfvNV(stage, pname, pfParams, pfParams.position()); } + private static native void nglCombinerStageParameterfvNV(int stage, int pname, FloatBuffer pfParams, int pfParams_offset); + public static void glGetCombinerStageParameterNV(int stage, int pname, FloatBuffer pfParams) { BufferChecks.checkBuffer(pfParams); nglGetCombinerStageParameterfvNV(stage, pname, pfParams, pfParams.position()); } + private static native void nglGetCombinerStageParameterfvNV(int stage, int pname, FloatBuffer pfParams, int pfParams_offset); } diff --git a/src/java/org/lwjgl/opengl/NVTexgenReflection.java b/src/java/org/lwjgl/opengl/NVTexgenReflection.java index 7a66912e..eda146a1 100644 --- a/src/java/org/lwjgl/opengl/NVTexgenReflection.java +++ b/src/java/org/lwjgl/opengl/NVTexgenReflection.java @@ -1,39 +1,40 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVTexgenReflection { - public static final int GL_NORMAL_MAP_NV = 0x8511; - public static final int GL_REFLECTION_MAP_NV = 0x8512; + + public static final int GL_NORMAL_MAP_NV = 0x8511; + public static final int GL_REFLECTION_MAP_NV = 0x8512; private NVTexgenReflection() { } diff --git a/src/java/org/lwjgl/opengl/NVTextureCompressionVTC.java b/src/java/org/lwjgl/opengl/NVTextureCompressionVTC.java index e7080579..475bc13c 100644 --- a/src/java/org/lwjgl/opengl/NVTextureCompressionVTC.java +++ b/src/java/org/lwjgl/opengl/NVTextureCompressionVTC.java @@ -1,46 +1,47 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVTextureCompressionVTC { + /* * Accepted by the parameter of TexImage3D and * CompressedTexImage3DARB and the parameter of * CompressedTexSubImage2DARB: */ - public static final int COMPRESSED_RGB_S3TC_DXT1_EXT =0x83F0; - public static final int COMPRESSED_RGBA_S3TC_DXT1_EXT =0x83F1; - public static final int COMPRESSED_RGBA_S3TC_DXT3_EXT =0x83F2; - public static final int COMPRESSED_RGBA_S3TC_DXT5_EXT =0x83F3; + public static final int COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0; + public static final int COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1; + public static final int COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2; + public static final int COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3; private NVTextureCompressionVTC() { } diff --git a/src/java/org/lwjgl/opengl/NVTextureEnvCombine4.java b/src/java/org/lwjgl/opengl/NVTextureEnvCombine4.java index faa7397e..2de4b756 100644 --- a/src/java/org/lwjgl/opengl/NVTextureEnvCombine4.java +++ b/src/java/org/lwjgl/opengl/NVTextureEnvCombine4.java @@ -1,42 +1,43 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVTextureEnvCombine4 { - public static final int GL_COMBINE4_NV = 0x8503; - public static final int GL_SOURCE3_RGB_NV = 0x8583; - public static final int GL_SOURCE3_ALPHA_NV = 0x858B; - public static final int GL_OPERAND3_RGB_NV = 0x8593; - public static final int GL_OPERAND3_ALPHA_NV = 0x859B; + + public static final int GL_COMBINE4_NV = 0x8503; + public static final int GL_SOURCE3_RGB_NV = 0x8583; + public static final int GL_SOURCE3_ALPHA_NV = 0x858B; + public static final int GL_OPERAND3_RGB_NV = 0x8593; + public static final int GL_OPERAND3_ALPHA_NV = 0x859B; private NVTextureEnvCombine4() { } diff --git a/src/java/org/lwjgl/opengl/NVTextureExpandNormal.java b/src/java/org/lwjgl/opengl/NVTextureExpandNormal.java index 549a7bfd..e733b52e 100644 --- a/src/java/org/lwjgl/opengl/NVTextureExpandNormal.java +++ b/src/java/org/lwjgl/opengl/NVTextureExpandNormal.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVTextureExpandNormal { + /* * Accepted by the parameters of TexParameteri, * TexParameteriv, TexParameterf, TexParameterfv, GetTexParameteri, diff --git a/src/java/org/lwjgl/opengl/NVTextureRectangle.java b/src/java/org/lwjgl/opengl/NVTextureRectangle.java index d4f5a5b0..01e0d25d 100644 --- a/src/java/org/lwjgl/opengl/NVTextureRectangle.java +++ b/src/java/org/lwjgl/opengl/NVTextureRectangle.java @@ -1,41 +1,42 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVTextureRectangle { - public static final int GL_TEXTURE_RECTANGLE_NV = 0x84F5; - public static final int GL_TEXTURE_BINDING_RECTANGLE_NV = 0x84F6; - public static final int GL_PROXY_TEXTURE_RECTANGLE_NV = 0x84F7; - public static final int GL_MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8; + + public static final int GL_TEXTURE_RECTANGLE_NV = 0x84F5; + public static final int GL_TEXTURE_BINDING_RECTANGLE_NV = 0x84F6; + public static final int GL_PROXY_TEXTURE_RECTANGLE_NV = 0x84F7; + public static final int GL_MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8; private NVTextureRectangle() { } diff --git a/src/java/org/lwjgl/opengl/NVTextureShader.java b/src/java/org/lwjgl/opengl/NVTextureShader.java index be3d7977..2a04553c 100644 --- a/src/java/org/lwjgl/opengl/NVTextureShader.java +++ b/src/java/org/lwjgl/opengl/NVTextureShader.java @@ -1,107 +1,108 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVTextureShader { - public static final int GL_TEXTURE_SHADER_NV = 0x86DE; - public static final int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9; - public static final int GL_SHADER_OPERATION_NV = 0x86DF; - public static final int GL_CULL_MODES_NV = 0x86E0; - public static final int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1; - public static final int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2; - public static final int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3; - public static final int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4; - public static final int GL_CONST_EYE_NV = 0x86E5; - public static final int GL_SHADER_CONSISTENT_NV = 0x86DD; - public static final int GL_PASS_THROUGH_NV = 0x86E6; - public static final int GL_CULL_FRAGMENT_NV = 0x86E7; - public static final int GL_OFFSET_TEXTURE_2D_NV = 0x86E8; - public static final int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C; - public static final int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D; - public static final int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9; - public static final int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA; - public static final int GL_DOT_PRODUCT_NV = 0x86EC; - public static final int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED; - public static final int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE; - public static final int GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E; - public static final int GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0; - public static final int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1; - public static final int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2; - public static final int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3; - public static final int GL_HILO_NV = 0x86F4; - public static final int GL_DSDT_NV = 0x86F5; - public static final int GL_DSDT_MAG_NV = 0x86F6; - public static final int GL_DSDT_MAG_VIB_NV = 0x86F7; - public static final int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; - public static final int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; - public static final int GL_SIGNED_RGBA_NV = 0x86FB; - public static final int GL_SIGNED_RGBA8_NV = 0x86FC; - public static final int GL_SIGNED_RGB_NV = 0x86FE; - public static final int GL_SIGNED_RGB8_NV = 0x86FF; - public static final int GL_SIGNED_LUMINANCE_NV = 0x8701; - public static final int GL_SIGNED_LUMINANCE8_NV = 0x8702; - public static final int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703; - public static final int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; - public static final int GL_SIGNED_ALPHA_NV = 0x8705; - public static final int GL_SIGNED_ALPHA8_NV = 0x8706; - public static final int GL_SIGNED_INTENSITY_NV = 0x8707; - public static final int GL_SIGNED_INTENSITY8_NV = 0x8708; - public static final int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; - public static final int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; - public static final int GL_HILO16_NV = 0x86F8; - public static final int GL_SIGNED_HILO_NV = 0x86F9; - public static final int GL_SIGNED_HILO16_NV = 0x86FA; - public static final int GL_DSDT8_NV = 0x8709; - public static final int GL_DSDT8_MAG8_NV = 0x870A; - public static final int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; - public static final int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; - public static final int GL_HI_SCALE_NV = 0x870E; - public static final int GL_LO_SCALE_NV = 0x870F; - public static final int GL_DS_SCALE_NV = 0x8710; - public static final int GL_DT_SCALE_NV = 0x8711; - public static final int GL_MAGNITUDE_SCALE_NV = 0x8712; - public static final int GL_VIBRANCE_SCALE_NV = 0x8713; - public static final int GL_HI_BIAS_NV = 0x8714; - public static final int GL_LO_BIAS_NV = 0x8715; - public static final int GL_DS_BIAS_NV = 0x8716; - public static final int GL_DT_BIAS_NV = 0x8717; - public static final int GL_MAGNITUDE_BIAS_NV = 0x8718; - public static final int GL_VIBRANCE_BIAS_NV = 0x8719; - public static final int GL_TEXTURE_BORDER_VALUES_NV = 0x871A; - public static final int GL_TEXTURE_HI_SIZE_NV = 0x871B; - public static final int GL_TEXTURE_LO_SIZE_NV = 0x871C; - public static final int GL_TEXTURE_DS_SIZE_NV = 0x871D; - public static final int GL_TEXTURE_DT_SIZE_NV = 0x871E; - public static final int GL_TEXTURE_MAG_SIZE_NV = 0x871F; + + public static final int GL_TEXTURE_SHADER_NV = 0x86DE; + public static final int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9; + public static final int GL_SHADER_OPERATION_NV = 0x86DF; + public static final int GL_CULL_MODES_NV = 0x86E0; + public static final int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1; + public static final int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2; + public static final int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3; + public static final int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4; + public static final int GL_CONST_EYE_NV = 0x86E5; + public static final int GL_SHADER_CONSISTENT_NV = 0x86DD; + public static final int GL_PASS_THROUGH_NV = 0x86E6; + public static final int GL_CULL_FRAGMENT_NV = 0x86E7; + public static final int GL_OFFSET_TEXTURE_2D_NV = 0x86E8; + public static final int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C; + public static final int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D; + public static final int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9; + public static final int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA; + public static final int GL_DOT_PRODUCT_NV = 0x86EC; + public static final int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED; + public static final int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE; + public static final int GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E; + public static final int GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0; + public static final int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1; + public static final int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2; + public static final int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3; + public static final int GL_HILO_NV = 0x86F4; + public static final int GL_DSDT_NV = 0x86F5; + public static final int GL_DSDT_MAG_NV = 0x86F6; + public static final int GL_DSDT_MAG_VIB_NV = 0x86F7; + public static final int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; + public static final int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; + public static final int GL_SIGNED_RGBA_NV = 0x86FB; + public static final int GL_SIGNED_RGBA8_NV = 0x86FC; + public static final int GL_SIGNED_RGB_NV = 0x86FE; + public static final int GL_SIGNED_RGB8_NV = 0x86FF; + public static final int GL_SIGNED_LUMINANCE_NV = 0x8701; + public static final int GL_SIGNED_LUMINANCE8_NV = 0x8702; + public static final int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703; + public static final int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; + public static final int GL_SIGNED_ALPHA_NV = 0x8705; + public static final int GL_SIGNED_ALPHA8_NV = 0x8706; + public static final int GL_SIGNED_INTENSITY_NV = 0x8707; + public static final int GL_SIGNED_INTENSITY8_NV = 0x8708; + public static final int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; + public static final int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; + public static final int GL_HILO16_NV = 0x86F8; + public static final int GL_SIGNED_HILO_NV = 0x86F9; + public static final int GL_SIGNED_HILO16_NV = 0x86FA; + public static final int GL_DSDT8_NV = 0x8709; + public static final int GL_DSDT8_MAG8_NV = 0x870A; + public static final int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; + public static final int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; + public static final int GL_HI_SCALE_NV = 0x870E; + public static final int GL_LO_SCALE_NV = 0x870F; + public static final int GL_DS_SCALE_NV = 0x8710; + public static final int GL_DT_SCALE_NV = 0x8711; + public static final int GL_MAGNITUDE_SCALE_NV = 0x8712; + public static final int GL_VIBRANCE_SCALE_NV = 0x8713; + public static final int GL_HI_BIAS_NV = 0x8714; + public static final int GL_LO_BIAS_NV = 0x8715; + public static final int GL_DS_BIAS_NV = 0x8716; + public static final int GL_DT_BIAS_NV = 0x8717; + public static final int GL_MAGNITUDE_BIAS_NV = 0x8718; + public static final int GL_VIBRANCE_BIAS_NV = 0x8719; + public static final int GL_TEXTURE_BORDER_VALUES_NV = 0x871A; + public static final int GL_TEXTURE_HI_SIZE_NV = 0x871B; + public static final int GL_TEXTURE_LO_SIZE_NV = 0x871C; + public static final int GL_TEXTURE_DS_SIZE_NV = 0x871D; + public static final int GL_TEXTURE_DT_SIZE_NV = 0x871E; + public static final int GL_TEXTURE_MAG_SIZE_NV = 0x871F; private NVTextureShader() { } diff --git a/src/java/org/lwjgl/opengl/NVTextureShader2.java b/src/java/org/lwjgl/opengl/NVTextureShader2.java index 0c35e82c..7b508f4e 100644 --- a/src/java/org/lwjgl/opengl/NVTextureShader2.java +++ b/src/java/org/lwjgl/opengl/NVTextureShader2.java @@ -1,65 +1,66 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVTextureShader2 { - public static final int GL_DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF; - public static final int GL_HILO_NV = 0x86F4; - public static final int GL_DSDT_NV = 0x86F5; - public static final int GL_DSDT_MAG_NV = 0x86F6; - public static final int GL_DSDT_MAG_VIB_NV = 0x86F7; - public static final int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; - public static final int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; - public static final int GL_SIGNED_RGBA_NV = 0x86FB; - public static final int GL_SIGNED_RGBA8_NV = 0x86FC; - public static final int GL_SIGNED_RGB_NV = 0x86FE; - public static final int GL_SIGNED_RGB8_NV = 0x86FF; - public static final int GL_SIGNED_LUMINANCE_NV = 0x8701; - public static final int GL_SIGNED_LUMINANCE8_NV = 0x8702; - public static final int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703; - public static final int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; - public static final int GL_SIGNED_ALPHA_NV = 0x8705; - public static final int GL_SIGNED_ALPHA8_NV = 0x8706; - public static final int GL_SIGNED_INTENSITY_NV = 0x8707; - public static final int GL_SIGNED_INTENSITY8_NV = 0x8708; - public static final int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; - public static final int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; - public static final int GL_HILO16_NV = 0x86F8; - public static final int GL_SIGNED_HILO_NV = 0x86F9; - public static final int GL_SIGNED_HILO16_NV = 0x86FA; - public static final int GL_DSDT8_NV = 0x8709; - public static final int GL_DSDT8_MAG8_NV = 0x870A; - public static final int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; - public static final int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; + + public static final int GL_DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF; + public static final int GL_HILO_NV = 0x86F4; + public static final int GL_DSDT_NV = 0x86F5; + public static final int GL_DSDT_MAG_NV = 0x86F6; + public static final int GL_DSDT_MAG_VIB_NV = 0x86F7; + public static final int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; + public static final int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; + public static final int GL_SIGNED_RGBA_NV = 0x86FB; + public static final int GL_SIGNED_RGBA8_NV = 0x86FC; + public static final int GL_SIGNED_RGB_NV = 0x86FE; + public static final int GL_SIGNED_RGB8_NV = 0x86FF; + public static final int GL_SIGNED_LUMINANCE_NV = 0x8701; + public static final int GL_SIGNED_LUMINANCE8_NV = 0x8702; + public static final int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703; + public static final int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; + public static final int GL_SIGNED_ALPHA_NV = 0x8705; + public static final int GL_SIGNED_ALPHA8_NV = 0x8706; + public static final int GL_SIGNED_INTENSITY_NV = 0x8707; + public static final int GL_SIGNED_INTENSITY8_NV = 0x8708; + public static final int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; + public static final int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; + public static final int GL_HILO16_NV = 0x86F8; + public static final int GL_SIGNED_HILO_NV = 0x86F9; + public static final int GL_SIGNED_HILO16_NV = 0x86FA; + public static final int GL_DSDT8_NV = 0x8709; + public static final int GL_DSDT8_MAG8_NV = 0x870A; + public static final int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; + public static final int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; private NVTextureShader2() { } diff --git a/src/java/org/lwjgl/opengl/NVTextureShader3.java b/src/java/org/lwjgl/opengl/NVTextureShader3.java index 38bd37b8..9bfe5786 100644 --- a/src/java/org/lwjgl/opengl/NVTextureShader3.java +++ b/src/java/org/lwjgl/opengl/NVTextureShader3.java @@ -1,54 +1,55 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVTextureShader3 { - public static final int GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850; - public static final int GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851; - public static final int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852; - public static final int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853; - public static final int GL_OFFSET_HILO_TEXTURE_2D_NV = 0x8854; - public static final int GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855; - public static final int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856; - public static final int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857; - public static final int GL_DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858; - public static final int GL_DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859; - public static final int GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A; - public static final int GL_DOT_PRODUCT_PASS_THROUGH_NV = 0x885B; - public static final int GL_DOT_PRODUCT_TEXTURE_1D_NV = 0x885C; - public static final int GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D; - public static final int GL_HILO8_NV = 0x885E; - public static final int GL_SIGNED_HILO8_NV = 0x885F; - public static final int GL_FORCE_BLUE_TO_ONE_NV = 0x8860; + + public static final int GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850; + public static final int GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851; + public static final int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852; + public static final int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853; + public static final int GL_OFFSET_HILO_TEXTURE_2D_NV = 0x8854; + public static final int GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855; + public static final int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856; + public static final int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857; + public static final int GL_DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858; + public static final int GL_DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859; + public static final int GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A; + public static final int GL_DOT_PRODUCT_PASS_THROUGH_NV = 0x885B; + public static final int GL_DOT_PRODUCT_TEXTURE_1D_NV = 0x885C; + public static final int GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D; + public static final int GL_HILO8_NV = 0x885E; + public static final int GL_SIGNED_HILO8_NV = 0x885F; + public static final int GL_FORCE_BLUE_TO_ONE_NV = 0x8860; private NVTextureShader3() { } diff --git a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java b/src/java/org/lwjgl/opengl/NVVertexArrayRange.java index 2e88a1bb..be0c6b24 100644 --- a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java +++ b/src/java/org/lwjgl/opengl/NVVertexArrayRange.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -38,11 +38,12 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVVertexArrayRange { - public static final int GL_VERTEX_ARRAY_RANGE_NV = 0x851D; - public static final int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E; - public static final int GL_VERTEX_ARRAY_RANGE_VALID_NV = 0x851F; - public static final int GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520; - public static final int GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521; + + public static final int GL_VERTEX_ARRAY_RANGE_NV = 0x851D; + public static final int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E; + public static final int GL_VERTEX_ARRAY_RANGE_VALID_NV = 0x851F; + public static final int GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520; + public static final int GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521; private NVVertexArrayRange() { } @@ -53,21 +54,16 @@ public final class NVVertexArrayRange { BufferChecks.checkDirect(pPointer); nglVertexArrayRangeNV(pPointer.remaining(), pPointer, pPointer.position()); } + private static native void nglVertexArrayRangeNV(int size, Buffer pPointer, int pPointer_offset); + public static native void glFlushVertexArrayRangeNV(); - public static native ByteBuffer glXAllocateMemoryNV( - int size, - float readFrequency, - float writeFrequency, - float priority); + public static native ByteBuffer glXAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority); private static native void glXFreeMemoryNV(ByteBuffer pointer); - public static native ByteBuffer wglAllocateMemoryNV( - int size, - float readFrequency, - float writeFrequency, - float priority); + public static native ByteBuffer wglAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority); + public static native void wglFreeMemoryNV(ByteBuffer pointer); } diff --git a/src/java/org/lwjgl/opengl/NVVertexArrayRange2.java b/src/java/org/lwjgl/opengl/NVVertexArrayRange2.java index 2968a247..23aee96d 100644 --- a/src/java/org/lwjgl/opengl/NVVertexArrayRange2.java +++ b/src/java/org/lwjgl/opengl/NVVertexArrayRange2.java @@ -1,38 +1,39 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVVertexArrayRange2 { - public static final int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533; + + public static final int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533; private NVVertexArrayRange2() { } diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram.java b/src/java/org/lwjgl/opengl/NVVertexProgram.java index 402c0a76..bd72fe9b 100644 --- a/src/java/org/lwjgl/opengl/NVVertexProgram.java +++ b/src/java/org/lwjgl/opengl/NVVertexProgram.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -42,6 +42,7 @@ import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; public final class NVVertexProgram extends NVProgram { + /* Accepted by the parameter of Disable, Enable, and IsEnabled, and by the parameter of GetBooleanv, GetIntegerv, GetFloatv, @@ -218,12 +219,7 @@ public final class NVVertexProgram extends NVProgram { nglGetProgramParameterfvNV(target, index, parameterName, params, params.position()); } - private static native void nglGetProgramParameterfvNV( - int target, - int index, - int parameterName, - FloatBuffer params, - int paramsOffset); + private static native void nglGetProgramParameterfvNV(int target, int index, int parameterName, FloatBuffer params, int paramsOffset); // --------------------------- @@ -235,12 +231,7 @@ public final class NVVertexProgram extends NVProgram { } - private static native void nglGetTrackMatrixivNV( - int target, - int address, - int parameterName, - IntBuffer params, - int paramsOffset); + private static native void nglGetTrackMatrixivNV(int target, int address, int parameterName, IntBuffer params, int paramsOffset); // --------------------------- @@ -275,19 +266,14 @@ public final class NVVertexProgram extends NVProgram { public static void glProgramParameters4NV(int target, int index, int count, FloatBuffer params) { BufferChecks.checkDirect(params); // Special case buffer check - if (params.remaining() < count * 4) { + if ( params.remaining() < count * 4 ) { throw new BufferOverflowException(); } nglProgramParameters4fvNV(target, index, count, params, params.position()); } - private static native void nglProgramParameters4fvNV( - int target, - int index, - int count, - FloatBuffer params, - int paramsOffset); + private static native void nglProgramParameters4fvNV(int target, int index, int count, FloatBuffer params, int paramsOffset); // --------------------------- @@ -296,25 +282,13 @@ public final class NVVertexProgram extends NVProgram { public static void glVertexAttribPointerNV(int index, int size, boolean unsigned, int stride, ByteBuffer buffer) { BufferChecks.checkDirect(buffer); GLBufferChecks.ensureArrayVBOdisabled(); - nglVertexAttribPointerNV( - index, - size, - unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, - stride, - buffer, - buffer.position()); + nglVertexAttribPointerNV(index, size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, buffer, buffer.position()); } public static void glVertexAttribPointerNV(int index, int size, boolean unsigned, int stride, ShortBuffer buffer) { BufferChecks.checkDirect(buffer); GLBufferChecks.ensureArrayVBOdisabled(); - nglVertexAttribPointerNV( - index, - size, - unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, - stride, - buffer, - buffer.position() << 1); + nglVertexAttribPointerNV(index, size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, buffer, buffer.position() << 1); } public static void glVertexAttribPointerNV(int index, int size, int stride, FloatBuffer buffer) { @@ -326,22 +300,10 @@ public final class NVVertexProgram extends NVProgram { public static void glVertexAttribPointerNV(int index, int size, boolean unsigned, int stride, IntBuffer buffer) { BufferChecks.checkDirect(buffer); GLBufferChecks.ensureArrayVBOdisabled(); - nglVertexAttribPointerNV( - index, - size, - unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, - stride, - buffer, - buffer.position() << 2); + nglVertexAttribPointerNV(index, size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, buffer, buffer.position() << 2); } - private static native void nglVertexAttribPointerNV( - int index, - int size, - int type, - int stride, - Buffer buffer, - int bufferOffset); + private static native void nglVertexAttribPointerNV(int index, int size, int type, int stride, Buffer buffer, int bufferOffset); // --------------------------- @@ -374,55 +336,64 @@ public final class NVVertexProgram extends NVProgram { public static void glVertexAttribs1NV(int index, ShortBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs1svNV(index, v.remaining(), v, v.position()<<1); + nglVertexAttribs1svNV(index, v.remaining(), v, v.position() << 1); } + private static native void nglVertexAttribs1svNV(int index, int n, ShortBuffer v, int v_offset); public static void glVertexAttribs1NV(int index, FloatBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs1fvNV(index, v.remaining(), v, v.position()<<2); + nglVertexAttribs1fvNV(index, v.remaining(), v, v.position() << 2); } + private static native void nglVertexAttribs1fvNV(int index, int n, FloatBuffer v, int v_offset); public static void glVertexAttribs2NV(int index, ShortBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs2svNV(index, v.remaining()>>1, v, v.position()<<1); + nglVertexAttribs2svNV(index, v.remaining() >> 1, v, v.position() << 1); } + private static native void nglVertexAttribs2svNV(int index, int n, ShortBuffer v, int v_offset); public static void glVertexAttribs2NV(int index, FloatBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs2fvNV(index, v.remaining()>>1, v, v.position()<<2); + nglVertexAttribs2fvNV(index, v.remaining() >> 1, v, v.position() << 2); } + private static native void nglVertexAttribs2fvNV(int index, int n, FloatBuffer v, int v_offset); public static void glVertexAttribs3NV(int index, ShortBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs3svNV(index, v.remaining()/3, v, v.position()<<1); + nglVertexAttribs3svNV(index, v.remaining() / 3, v, v.position() << 1); } + private static native void nglVertexAttribs3svNV(int index, int n, ShortBuffer v, int v_offset); public static void glVertexAttribs3NV(int index, FloatBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs3fvNV(index, v.remaining()/3, v, v.position()<<2); + nglVertexAttribs3fvNV(index, v.remaining() / 3, v, v.position() << 2); } + private static native void nglVertexAttribs3fvNV(int index, int n, FloatBuffer v, int v_offset); public static void glVertexAttribs4NV(int index, ShortBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs4svNV(index, v.remaining()>>2, v, v.position()<<1); + nglVertexAttribs4svNV(index, v.remaining() >> 2, v, v.position() << 1); } + private static native void nglVertexAttribs4svNV(int index, int n, ShortBuffer v, int v_offset); public static void glVertexAttribs4NV(int index, FloatBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs4fvNV(index, v.remaining()>>2, v, v.position()<<2); + nglVertexAttribs4fvNV(index, v.remaining() >> 2, v, v.position() << 2); } + private static native void nglVertexAttribs4fvNV(int index, int n, FloatBuffer v, int v_offset); public static void glVertexAttribs4uNV(int index, ByteBuffer v) { BufferChecks.checkDirect(v); - nglVertexAttribs4ubvNV(index, v.remaining()>>2, v, v.position()); + nglVertexAttribs4ubvNV(index, v.remaining() >> 2, v, v.position()); } + private static native void nglVertexAttribs4ubvNV(int index, int n, ByteBuffer v, int v_offset); } diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram2Option.java b/src/java/org/lwjgl/opengl/NVVertexProgram2Option.java index a816b519..bad52a2d 100644 --- a/src/java/org/lwjgl/opengl/NVVertexProgram2Option.java +++ b/src/java/org/lwjgl/opengl/NVVertexProgram2Option.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVVertexProgram2Option { + /* * Accepted by the parameter of GetProgramivARB: */ diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram3.java b/src/java/org/lwjgl/opengl/NVVertexProgram3.java index b43abd34..c93959cb 100644 --- a/src/java/org/lwjgl/opengl/NVVertexProgram3.java +++ b/src/java/org/lwjgl/opengl/NVVertexProgram3.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; public final class NVVertexProgram3 { + /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: diff --git a/src/java/org/lwjgl/opengl/OpenGLException.java b/src/java/org/lwjgl/opengl/OpenGLException.java index 6d659d18..a589e246 100644 --- a/src/java/org/lwjgl/opengl/OpenGLException.java +++ b/src/java/org/lwjgl/opengl/OpenGLException.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -35,36 +35,32 @@ import org.lwjgl.opengl.glu.GLU; /** * $Id$ + *

+ * Thrown by the debug build library of the LWJGL if any OpenGL operation causes an error. * - * Thrown by the debug build library of the LWJGL if any OpenGL operation - * causes an error. - * * @author cix_foo * @version $Revision$ */ public class OpenGLException extends RuntimeException { - /** - * Constructor for OpenGLException. - */ + /** Constructor for OpenGLException. */ public OpenGLException(int gl_error_code) { this(createErrorMessage(gl_error_code)); } - private final static String createErrorMessage(int gl_error_code) { + private static String createErrorMessage(int gl_error_code) { String error_string = GLU.gluErrorString(gl_error_code); return error_string + " (" + gl_error_code + ")"; } - /** - * Constructor for OpenGLException. - */ + /** Constructor for OpenGLException. */ public OpenGLException() { super(); } /** * Constructor for OpenGLException. + * * @param message */ public OpenGLException(String message) { @@ -73,6 +69,7 @@ public class OpenGLException extends RuntimeException { /** * Constructor for OpenGLException. + * * @param message * @param cause */ @@ -82,6 +79,7 @@ public class OpenGLException extends RuntimeException { /** * Constructor for OpenGLException. + * * @param cause */ public OpenGLException(Throwable cause) { diff --git a/src/java/org/lwjgl/opengl/RenderTexture.java b/src/java/org/lwjgl/opengl/RenderTexture.java index 11d85805..a619e805 100644 --- a/src/java/org/lwjgl/opengl/RenderTexture.java +++ b/src/java/org/lwjgl/opengl/RenderTexture.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -35,9 +35,7 @@ import org.lwjgl.BufferUtils; import java.nio.IntBuffer; -/** - * This class represents the state necessary for render-to-texture. - */ +/** This class represents the state necessary for render-to-texture. */ public final class RenderTexture { // ---------------------------------------------------------------------------------- @@ -168,24 +166,16 @@ public final class RenderTexture { */ static final int WGL_DEPTH_COMPONENT_NV = 0x20A7; - /** - * The TEXTURE_1D target. - */ + /** The TEXTURE_1D target. */ public static final int RENDER_TEXTURE_1D = WGL_TEXTURE_1D_ARB; - /** - * The TEXTURE_2D target. - */ + /** The TEXTURE_2D target. */ public static final int RENDER_TEXTURE_2D = WGL_TEXTURE_2D_ARB; - /** - * The TEXTURE_RECTANGLE target. - */ + /** The TEXTURE_RECTANGLE target. */ public static final int RENDER_TEXTURE_RECTANGLE = WGL_TEXTURE_RECTANGLE_NV; - /** - * The TEXTURE_CUBE_MAP target. - */ + /** The TEXTURE_CUBE_MAP target. */ public static final int RENDER_TEXTURE_CUBE_MAP = WGL_TEXTURE_CUBE_MAP_ARB; IntBuffer pixelFormatCaps; @@ -200,10 +190,7 @@ public final class RenderTexture { *

* NOTE: The target parameter can be one of the following: *

- * RENDER_TEXTURE_1D - * RENDER_TEXTURE_2D - * RENDER_TEXTURE_RECTANGLE - * RENDER_TEXTURE_CUBE_MAP + * RENDER_TEXTURE_1D RENDER_TEXTURE_2D RENDER_TEXTURE_RECTANGLE RENDER_TEXTURE_CUBE_MAP * * @param useRGB - When true the P-buffer can be used as an RGB render texture. * @param useRGBA - When true the P-buffer can be used as an RGBA render texture. diff --git a/src/java/org/lwjgl/opengl/StateStack.java b/src/java/org/lwjgl/opengl/StateStack.java index 0ff0ef1e..14b1b127 100644 --- a/src/java/org/lwjgl/opengl/StateStack.java +++ b/src/java/org/lwjgl/opengl/StateStack.java @@ -1,37 +1,38 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; class StateStack { + /** Only int state is tracked */ private final int[] state_stack; private int stack_pos; diff --git a/src/java/org/lwjgl/opengl/Util.java b/src/java/org/lwjgl/opengl/Util.java index 67ec108f..78a6b97a 100644 --- a/src/java/org/lwjgl/opengl/Util.java +++ b/src/java/org/lwjgl/opengl/Util.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -46,21 +46,22 @@ public final class Util { private static final IntBuffer int_buffer = BufferUtils.createIntBuffer(16); - /** - * No c'tor - */ - private Util() {} - + /** No c'tor */ + private Util() { + } + public static void checkGLError() { int err = GL11.glGetError(); - if (err != GL11.GL_NO_ERROR) { + if ( err != GL11.GL_NO_ERROR ) { throw new OpenGLException(err); } } - + /** * Obtain a GL integer value from the driver + * * @param gl_enum The GL value you want + * * @return the integer value */ public static int glGetInteger(int gl_enum) { @@ -68,17 +69,19 @@ public final class Util { return int_buffer.get(0); } - /** - * Handy mutable integer value class - */ + /** Handy mutable integer value class */ static final class IntValue { + int value; + IntValue(int value) { this.value = value; } + public boolean equals(Object obj) { - return ((IntValue) obj).value == value; + return ((IntValue)obj).value == value; } + public int hashCode() { return value; } diff --git a/src/java/org/lwjgl/opengl/VBOTracker.java b/src/java/org/lwjgl/opengl/VBOTracker.java index 5fbc007c..c6c94f48 100644 --- a/src/java/org/lwjgl/opengl/VBOTracker.java +++ b/src/java/org/lwjgl/opengl/VBOTracker.java @@ -1,31 +1,31 @@ -/* +/* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are + * modification, are permitted provided that the following conditions are * met: - * - * * Redistributions of source code must retain the above copyright + * + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of 'LWJGL' nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -34,12 +34,11 @@ package org.lwjgl.opengl; import java.util.WeakHashMap; import java.util.Map; -/** - * Track Vertex Buffer Objects by context. - */ +/** Track Vertex Buffer Objects by context. */ class VBOTracker { - private static VBOTracker current_tracker = null; - + + private static VBOTracker current_tracker; + private static final Map contextToTracker = new WeakHashMap(3, 1.0f); private final StateStack vbo_array_stack; @@ -64,19 +63,19 @@ class VBOTracker { static StateStack getClientAttribStack() { return current_tracker.attrib_stack; } - + /** - * Called after a GLContext has been made current. This will set up the current - * VBO tracker. + * Called after a GLContext has been made current. This will set up the current VBO tracker. + * * @param context */ static void setCurrent(Object context) { - if (context == null) { + if ( context == null ) { current_tracker = null; return; } current_tracker = (VBOTracker)contextToTracker.get(context); - if (current_tracker == null) { + if ( current_tracker == null ) { current_tracker = new VBOTracker(); contextToTracker.put(context, current_tracker); } diff --git a/src/java/org/lwjgl/util/GL.java b/src/java/org/lwjgl/util/GL.java index 7c9676e1..f4739960 100644 --- a/src/java/org/lwjgl/util/GL.java +++ b/src/java/org/lwjgl/util/GL.java @@ -45,9 +45,7 @@ import java.nio.*; */ public class GL { - /** - * C'tor - */ + /** C'tor */ public GL() { } @@ -67,16 +65,12 @@ public class GL { GL11.glAlphaFunc(func, ref); } - /** - * @param i - */ + /** @param i */ public static void glArrayElement(int i) { GL11.glArrayElement(i); } - /** - * @param mode - */ + /** @param mode */ public static void glBegin(int mode) { GL11.glBegin(mode); } @@ -110,38 +104,27 @@ public class GL { GL11.glBlendFunc(sfactor, dfactor); } - /** - * @param list - */ + /** @param list */ public static void glCallList(int list) { GL11.glCallList(list); } - /** - * @param lists - */ + /** @param lists */ public static void glCallLists(ByteBuffer lists) { GL11.glCallLists(lists); } - /** - * @param n - * @param lists - */ - public static void glCallLists(int n, IntBuffer lists) { - GL11.glCallLists(n, lists); - } - - /** - * @param lists - */ + /** @param lists */ public static void glCallLists(ShortBuffer lists) { GL11.glCallLists(lists); } - /** - * @param mask - */ + /** @param lists */ + public static void glCallLists(IntBuffer lists) { + GL11.glCallLists(lists); + } + + /** @param mask */ public static void glClear(int mask) { GL11.glClear(mask); } @@ -166,23 +149,17 @@ public class GL { GL11.glClearColor(red, green, blue, alpha); } - /** - * @param depth - */ + /** @param depth */ public static void glClearDepth(double depth) { GL11.glClearDepth(depth); } - /** - * @param c - */ + /** @param c */ public static void glClearIndex(float c) { GL11.glClearIndex(c); } - /** - * @param s - */ + /** @param s */ public static void glClearStencil(int s) { GL11.glClearStencil(s); } @@ -333,14 +310,7 @@ public class GL { * @param height * @param border */ - public static void glCopyTexImage2D(int target, - int level, - int internalFormat, - int x, - int y, - int width, - int height, - int border) { + public static void glCopyTexImage2D(int target, int level, int internalFormat, int x, int y, int width, int height, int border) { GL11.glCopyTexImage2D(target, level, internalFormat, x, y, width, height, border); } @@ -370,9 +340,7 @@ public class GL { GL11.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); } - /** - * @param mode - */ + /** @param mode */ public static void glCullFace(int mode) { GL11.glCullFace(mode); } @@ -385,23 +353,17 @@ public class GL { GL11.glDeleteLists(list, range); } - /** - * @param textures - */ + /** @param textures */ public static void glDeleteTextures(IntBuffer textures) { GL11.glDeleteTextures(textures); } - /** - * @param func - */ + /** @param func */ public static void glDepthFunc(int func) { GL11.glDepthFunc(func); } - /** - * @param flag - */ + /** @param flag */ public static void glDepthMask(boolean flag) { GL11.glDepthMask(flag); } @@ -414,16 +376,12 @@ public class GL { GL11.glDepthRange(zNear, zFar); } - /** - * @param cap - */ + /** @param cap */ public static void glDisable(int cap) { GL11.glDisable(cap); } - /** - * @param cap - */ + /** @param cap */ public static void glDisableClientState(int cap) { GL11.glDisableClientState(cap); } @@ -437,9 +395,7 @@ public class GL { GL11.glDrawArrays(mode, first, count); } - /** - * @param mode - */ + /** @param mode */ public static void glDrawBuffer(int mode) { GL11.glDrawBuffer(mode); } @@ -511,9 +467,7 @@ public class GL { GL11.glDrawPixels(width, height, format, type, pixels); } - /** - * @param flag - */ + /** @param flag */ public static void glEdgeFlag(boolean flag) { GL11.glEdgeFlag(flag); } @@ -534,16 +488,12 @@ public class GL { GL11.glEdgeFlagPointer(stride, buffer_offset); } - /** - * @param cap - */ + /** @param cap */ public static void glEnable(int cap) { GL11.glEnable(cap); } - /** - * @param cap - */ + /** @param cap */ public static void glEnableClientState(int cap) { GL11.glEnableClientState(cap); } @@ -562,9 +512,7 @@ public class GL { GL11.glEndList(); } - /** - * @param u - */ + /** @param u */ public static void glEvalCoord1f(float u) { GL11.glEvalCoord1f(u); } @@ -597,9 +545,7 @@ public class GL { GL11.glEvalMesh2(mode, i1, i2, j1, j2); } - /** - * @param i - */ + /** @param i */ public static void glEvalPoint1(int i) { GL11.glEvalPoint1(i); } @@ -666,9 +612,7 @@ public class GL { GL11.glFogi(pname, param); } - /** - * @param mode - */ + /** @param mode */ public static void glFrontFace(int mode) { GL11.glFrontFace(mode); } @@ -694,9 +638,7 @@ public class GL { return GL11.glGenLists(range); } - /** - * @param textures - */ + /** @param textures */ public static void glGenTextures(IntBuffer textures) { GL11.glGenTextures(textures); } @@ -725,9 +667,7 @@ public class GL { GL11.glGetDouble(pname, params); } - /** - * @return - */ + /** @return */ public static int glGetError() { return GL11.glGetError(); } @@ -836,9 +776,7 @@ public class GL { return GL11.glGetPointerv(pname, size); } - /** - * @param mask - */ + /** @param mask */ public static void glGetPolygonStipple(ByteBuffer mask) { GL11.glGetPolygonStipple(mask); } @@ -1122,16 +1060,12 @@ public class GL { GL11.glLineStipple(factor, pattern); } - /** - * @param width - */ + /** @param width */ public static void glLineWidth(float width) { GL11.glLineWidth(width); } - /** - * @param base - */ + /** @param base */ public static void glListBase(int base) { GL11.glListBase(base); } @@ -1143,23 +1077,17 @@ public class GL { GL11.glLoadIdentity(); } - /** - * @param m - */ + /** @param m */ public static void glLoadMatrix(FloatBuffer m) { GL11.glLoadMatrix(m); } - /** - * @param name - */ + /** @param name */ public static void glLoadName(int name) { GL11.glLoadName(name); } - /** - * @param opcode - */ + /** @param opcode */ public static void glLogicOp(int opcode) { GL11.glLogicOp(opcode); } @@ -1188,16 +1116,7 @@ public class GL { * @param vorder * @param points */ - public static void glMap2f(int target, - float u1, - float u2, - int ustride, - int uorder, - float v1, - float v2, - int vstride, - int vorder, - FloatBuffer points) { + public static void glMap2f(int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, FloatBuffer points) { GL11.glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); } @@ -1258,16 +1177,12 @@ public class GL { GL11.glMateriali(face, pname, param); } - /** - * @param mode - */ + /** @param mode */ public static void glMatrixMode(int mode) { GL11.glMatrixMode(mode); } - /** - * @param m - */ + /** @param m */ public static void glMultMatrix(FloatBuffer m) { GL11.glMultMatrix(m); } @@ -1352,9 +1267,7 @@ public class GL { GL11.glOrtho(left, right, bottom, top, zNear, zFar); } - /** - * @param token - */ + /** @param token */ public static void glPassThrough(float token) { GL11.glPassThrough(token); } @@ -1423,9 +1336,7 @@ public class GL { GL11.glPixelZoom(xfactor, yfactor); } - /** - * @param size - */ + /** @param size */ public static void glPointSize(float size) { GL11.glPointSize(size); } @@ -1446,9 +1357,7 @@ public class GL { GL11.glPolygonOffset(factor, units); } - /** - * @param mask - */ + /** @param mask */ public static void glPolygonStipple(ByteBuffer mask) { GL11.glPolygonStipple(mask); } @@ -1481,16 +1390,12 @@ public class GL { GL11.glPopName(); } - /** - * @param mask - */ + /** @param mask */ public static void glPushAttrib(int mask) { GL11.glPushAttrib(mask); } - /** - * @param mask - */ + /** @param mask */ public static void glPushClientAttrib(int mask) { GL11.glPushClientAttrib(mask); } @@ -1502,9 +1407,7 @@ public class GL { GL11.glPushMatrix(); } - /** - * @param name - */ + /** @param name */ public static void glPushName(int name) { GL11.glPushName(name); } @@ -1563,9 +1466,7 @@ public class GL { GL11.glRasterPos4i(x, y, z, w); } - /** - * @param mode - */ + /** @param mode */ public static void glReadBuffer(int mode) { GL11.glReadBuffer(mode); } @@ -1667,16 +1568,12 @@ public class GL { GL11.glScissor(x, y, width, height); } - /** - * @param buffer - */ + /** @param buffer */ public static void glSelectBuffer(IntBuffer buffer) { GL11.glSelectBuffer(buffer); } - /** - * @param mode - */ + /** @param mode */ public static void glShadeModel(int mode) { GL11.glShadeModel(mode); } @@ -1690,9 +1587,7 @@ public class GL { GL11.glStencilFunc(func, ref, mask); } - /** - * @param mask - */ + /** @param mask */ public static void glStencilMask(int mask) { GL11.glStencilMask(mask); } @@ -1706,9 +1601,7 @@ public class GL { GL11.glStencilOp(fail, zfail, zpass); } - /** - * @param s - */ + /** @param s */ public static void glTexCoord1f(float s) { GL11.glTexCoord1f(s); } @@ -1841,14 +1734,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage1D(int target, - int level, - int internalformat, - int width, - int border, - int format, - int type, - ByteBuffer pixels) { + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ByteBuffer pixels) { GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } @@ -1862,14 +1748,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage1D(int target, - int level, - int internalformat, - int width, - int border, - int format, - int type, - FloatBuffer pixels) { + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, FloatBuffer pixels) { GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } @@ -1883,14 +1762,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage1D(int target, - int level, - int internalformat, - int width, - int border, - int format, - int type, - IntBuffer pixels) { + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, IntBuffer pixels) { GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } @@ -1904,14 +1776,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage1D(int target, - int level, - int internalformat, - int width, - int border, - int format, - int type, - ShortBuffer pixels) { + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ShortBuffer pixels) { GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels); } @@ -1926,15 +1791,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage2D(int target, - int level, - int internalformat, - int width, - int height, - int border, - int format, - int type, - ByteBuffer pixels) { + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ByteBuffer pixels) { GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @@ -1949,15 +1806,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage2D(int target, - int level, - int internalformat, - int width, - int height, - int border, - int format, - int type, - FloatBuffer pixels) { + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, FloatBuffer pixels) { GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @@ -1972,15 +1821,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage2D(int target, - int level, - int internalformat, - int width, - int height, - int border, - int format, - int type, - IntBuffer pixels) { + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, IntBuffer pixels) { GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @@ -1995,15 +1836,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage2D(int target, - int level, - int internalformat, - int width, - int height, - int border, - int format, - int type, - ShortBuffer pixels) { + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ShortBuffer pixels) { GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); } @@ -2093,15 +1926,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexSubImage2D(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int format, - int type, - ByteBuffer pixels) { + public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer pixels) { GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } @@ -2116,15 +1941,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexSubImage2D(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int format, - int type, - IntBuffer pixels) { + public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, IntBuffer pixels) { GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } @@ -2139,15 +1956,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexSubImage2D(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int format, - int type, - ShortBuffer pixels) { + public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ShortBuffer pixels) { GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); } @@ -2263,15 +2072,7 @@ public class GL { * @param width * @param height */ - public static void glCopyTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int x, - int y, - int width, - int height) { + public static void glCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height) { GL12.glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height); } @@ -2329,16 +2130,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage3D(int target, - int level, - int internalFormat, - int width, - int height, - int depth, - int border, - int format, - int type, - ByteBuffer pixels) { + public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ByteBuffer pixels) { GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } @@ -2354,16 +2146,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage3D(int target, - int level, - int internalFormat, - int width, - int height, - int depth, - int border, - int format, - int type, - FloatBuffer pixels) { + public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, FloatBuffer pixels) { GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } @@ -2379,16 +2162,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage3D(int target, - int level, - int internalFormat, - int width, - int height, - int depth, - int border, - int format, - int type, - IntBuffer pixels) { + public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, IntBuffer pixels) { GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } @@ -2404,16 +2178,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexImage3D(int target, - int level, - int internalFormat, - int width, - int height, - int depth, - int border, - int format, - int type, - ShortBuffer pixels) { + public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ShortBuffer pixels) { GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels); } @@ -2430,17 +2195,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int format, - int type, - ByteBuffer pixels) { + public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ByteBuffer pixels) { GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } @@ -2457,17 +2212,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int format, - int type, - FloatBuffer pixels) { + public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, FloatBuffer pixels) { GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } @@ -2484,17 +2229,7 @@ public class GL { * @param type * @param pixels */ - public static void glTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int format, - int type, - IntBuffer pixels) { + public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, IntBuffer pixels) { GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } @@ -2511,30 +2246,16 @@ public class GL { * @param type * @param pixels */ - public static void glTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int format, - int type, - ShortBuffer pixels) { + public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ShortBuffer pixels) { GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } - /** - * @param texture - */ + /** @param texture */ public static void glActiveTexture(int texture) { GL13.glActiveTexture(texture); } - /** - * @param texture - */ + /** @param texture */ public static void glClientActiveTexture(int texture) { GL13.glClientActiveTexture(texture); } @@ -2548,13 +2269,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage1D(int target, - int level, - int internalformat, - int width, - int border, - int imageSize, - ByteBuffer data) { + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer data) { GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data); } @@ -2567,13 +2282,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage1D(int target, - int level, - int internalformat, - int width, - int border, - int imageSize, - FloatBuffer data) { + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) { GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data); } @@ -2586,13 +2295,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage1D(int target, - int level, - int internalformat, - int width, - int border, - int imageSize, - IntBuffer data) { + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer data) { GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data); } @@ -2605,13 +2308,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage1D(int target, - int level, - int internalformat, - int width, - int border, - int imageSize, - ShortBuffer data) { + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) { GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data); } @@ -2625,14 +2322,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage2D(int target, - int level, - int internalformat, - int width, - int height, - int border, - int imageSize, - ByteBuffer data) { + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer data) { GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); } @@ -2646,14 +2336,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage2D(int target, - int level, - int internalformat, - int width, - int height, - int border, - int imageSize, - FloatBuffer data) { + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) { GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); } @@ -2667,14 +2350,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage2D(int target, - int level, - int internalformat, - int width, - int height, - int border, - int imageSize, - IntBuffer data) { + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer data) { GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); } @@ -2688,14 +2364,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage2D(int target, - int level, - int internalformat, - int width, - int height, - int border, - int imageSize, - ShortBuffer data) { + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data) { GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); } @@ -2710,15 +2379,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage3D(int target, - int level, - int internalformat, - int width, - int height, - int depth, - int border, - int imageSize, - ByteBuffer data) { + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer data) { GL13.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data); } @@ -2733,15 +2394,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage3D(int target, - int level, - int internalformat, - int width, - int height, - int depth, - int border, - int imageSize, - FloatBuffer data) { + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer data) { GL13.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data); } @@ -2756,15 +2409,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage3D(int target, - int level, - int internalformat, - int width, - int height, - int depth, - int border, - int imageSize, - IntBuffer data) { + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer data) { GL13.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data); } @@ -2779,15 +2424,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexImage3D(int target, - int level, - int internalformat, - int width, - int height, - int depth, - int border, - int imageSize, - ShortBuffer data) { + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data) { GL13.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data); } @@ -2800,13 +2437,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage1D(int target, - int level, - int xoffset, - int width, - int format, - int imageSize, - ByteBuffer data) { + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer data) { GL13.glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data); } @@ -2819,13 +2450,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage1D(int target, - int level, - int xoffset, - int width, - int format, - int imageSize, - FloatBuffer data) { + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer data) { GL13.glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data); } @@ -2838,13 +2463,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage1D(int target, - int level, - int xoffset, - int width, - int format, - int imageSize, - IntBuffer data) { + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer data) { GL13.glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data); } @@ -2857,13 +2476,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage1D(int target, - int level, - int xoffset, - int width, - int format, - int imageSize, - ShortBuffer data) { + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data) { GL13.glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data); } @@ -2878,15 +2491,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage2D(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int format, - int imageSize, - ByteBuffer data) { + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer data) { GL13.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data); } @@ -2901,15 +2506,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage2D(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int format, - int imageSize, - FloatBuffer data) { + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data) { GL13.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data); } @@ -2924,15 +2521,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage2D(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int format, - int imageSize, - IntBuffer data) { + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer data) { GL13.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data); } @@ -2947,15 +2536,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage2D(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int format, - int imageSize, - ShortBuffer data) { + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data) { GL13.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data); } @@ -2972,17 +2553,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int format, - int imageSize, - ByteBuffer data) { + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer data) { GL13.glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data); } @@ -2999,17 +2570,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int format, - int imageSize, - FloatBuffer data) { + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data) { GL13.glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data); } @@ -3026,17 +2587,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int format, - int imageSize, - IntBuffer data) { + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer data) { GL13.glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data); } @@ -3053,17 +2604,7 @@ public class GL { * @param imageSize * @param data */ - public static void glCompressedTexSubImage3D(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int format, - int imageSize, - ShortBuffer data) { + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data) { GL13.glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data); } @@ -3094,9 +2635,7 @@ public class GL { GL13.glGetCompressedTexImage(target, lod, img); } - /** - * @param m - */ + /** @param m */ public static void glLoadTransposeMatrix(FloatBuffer m) { GL13.glLoadTransposeMatrix(m); } @@ -3139,9 +2678,7 @@ public class GL { GL13.glMultiTexCoord4f(target, s, t, r, q); } - /** - * @param m - */ + /** @param m */ public static void glMultTransposeMatrix(FloatBuffer m) { GL13.glMultTransposeMatrix(m); } @@ -3164,9 +2701,7 @@ public class GL { GL14.glBlendColor(red, green, blue, alpha); } - /** - * @param mode - */ + /** @param mode */ public static void glBlendEquation(int mode) { GL14.glBlendEquation(mode); } @@ -3181,9 +2716,7 @@ public class GL { GL14.glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); } - /** - * @param coord - */ + /** @param coord */ public static void glFogCoordf(float coord) { GL14.glFogCoordf(coord); } @@ -3412,37 +2945,27 @@ public class GL { GL15.glBufferSubData(target, offset, data); } - /** - * @param buffers - */ + /** @param buffers */ public static void glDeleteBuffers(IntBuffer buffers) { GL15.glDeleteBuffers(buffers); } - /** - * @param ids - */ + /** @param ids */ public static void glDeleteQueries(IntBuffer ids) { GL15.glDeleteQueries(ids); } - /** - * @param target - */ + /** @param target */ public static void glEndQuery(int target) { GL15.glEndQuery(target); } - /** - * @param buffers - */ + /** @param buffers */ public static void glGenBuffers(IntBuffer buffers) { GL15.glGenBuffers(buffers); } - /** - * @param ids - */ + /** @param ids */ public static void glGenQueries(IntBuffer ids) { GL15.glGenQueries(ids); } @@ -3653,16 +3176,12 @@ public class GL { ARBBufferObject.glBufferSubDataARB(target, offset, data); } - /** - * @param buffers - */ + /** @param buffers */ public static void glDeleteBuffersARB(IntBuffer buffers) { ARBBufferObject.glDeleteBuffersARB(buffers); } - /** - * @param buffers - */ + /** @param buffers */ public static void glGenBuffersARB(IntBuffer buffers) { ARBBufferObject.glGenBuffersARB(buffers); } @@ -3761,16 +3280,12 @@ public class GL { ARBFragmentProgram.glBindProgramARB(target, program); } - /** - * @param programs - */ + /** @param programs */ public static void glDeleteProgramsARB(IntBuffer programs) { ARBFragmentProgram.glDeleteProgramsARB(programs); } - /** - * @param programs - */ + /** @param programs */ public static void glGenProgramsARB(IntBuffer programs) { ARBFragmentProgram.glGenProgramsARB(programs); } @@ -3995,13 +3510,7 @@ public class GL { * @param type * @param image */ - public static void glConvolutionFilter2D(int target, - int internalformat, - int width, - int height, - int format, - int type, - ByteBuffer image) { + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image) { ARBImaging.glConvolutionFilter2D(target, internalformat, width, height, format, type, image); } @@ -4014,13 +3523,7 @@ public class GL { * @param type * @param image */ - public static void glConvolutionFilter2D(int target, - int internalformat, - int width, - int height, - int format, - int type, - IntBuffer image) { + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer image) { ARBImaging.glConvolutionFilter2D(target, internalformat, width, height, format, type, image); } @@ -4033,13 +3536,7 @@ public class GL { * @param type * @param image */ - public static void glConvolutionFilter2D(int target, - int internalformat, - int width, - int height, - int format, - int type, - ShortBuffer image) { + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer image) { ARBImaging.glConvolutionFilter2D(target, internalformat, width, height, format, type, image); } @@ -4376,16 +3873,12 @@ public class GL { ARBImaging.glMinmax(target, internalformat, sink); } - /** - * @param target - */ + /** @param target */ public static void glResetHistogram(int target) { ARBImaging.glResetHistogram(target); } - /** - * @param target - */ + /** @param target */ public static void glResetMinmax(int target) { ARBImaging.glResetMinmax(target); } @@ -4400,20 +3893,11 @@ public class GL { * @param row * @param column */ - public static void glSeparableFilter2D(int target, - int internalformat, - int width, - int height, - int format, - int type, - Buffer row, - Buffer column) { + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, Buffer column) { ARBImaging.glSeparableFilter2D(target, internalformat, width, height, format, type, row, column); } - /** - * @param index - */ + /** @param index */ public static void glCurrentPaletteMatrixARB(int index) { ARBMatrixPalette.glCurrentPaletteMatrixARB(index); } @@ -4455,23 +3939,17 @@ public class GL { ARBMatrixPalette.glMatrixIndexPointerARB(size, stride, pPointer); } - /** - * @param pIndices - */ + /** @param pIndices */ public static void glMatrixIndexuARB(ByteBuffer pIndices) { ARBMatrixPalette.glMatrixIndexuARB(pIndices); } - /** - * @param piIndices - */ + /** @param piIndices */ public static void glMatrixIndexuARB(IntBuffer piIndices) { ARBMatrixPalette.glMatrixIndexuARB(piIndices); } - /** - * @param psIndices - */ + /** @param psIndices */ public static void glMatrixIndexuARB(ShortBuffer psIndices) { ARBMatrixPalette.glMatrixIndexuARB(psIndices); } @@ -4484,16 +3962,12 @@ public class GL { ARBMultisample.glSampleCoverageARB(value, invert); } - /** - * @param texture - */ + /** @param texture */ public static void glActiveTextureARB(int texture) { ARBMultitexture.glActiveTextureARB(texture); } - /** - * @param texture - */ + /** @param texture */ public static void glClientActiveTextureARB(int texture) { ARBMultitexture.glClientActiveTextureARB(texture); } @@ -4620,23 +4094,17 @@ public class GL { ARBOcclusionQuery.glBeginQueryARB(target, id); } - /** - * @param ids - */ + /** @param ids */ public static void glDeleteQueriesARB(IntBuffer ids) { ARBOcclusionQuery.glDeleteQueriesARB(ids); } - /** - * @param target - */ + /** @param target */ public static void glEndQueryARB(int target) { ARBOcclusionQuery.glEndQueryARB(target); } - /** - * @param ids - */ + /** @param ids */ public static void glGenQueriesARB(IntBuffer ids) { ARBOcclusionQuery.glGenQueriesARB(ids); } @@ -4702,13 +4170,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage1DARB(int target, - int level, - int internalformat, - int width, - int border, - int imageSize, - ByteBuffer pData) { + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData) { ARBTextureCompression.glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData); } @@ -4721,13 +4183,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage1DARB(int target, - int level, - int internalformat, - int width, - int border, - int imageSize, - FloatBuffer pData) { + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer pData) { ARBTextureCompression.glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData); } @@ -4740,13 +4196,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage1DARB(int target, - int level, - int internalformat, - int width, - int border, - int imageSize, - IntBuffer pData) { + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer pData) { ARBTextureCompression.glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData); } @@ -4759,13 +4209,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage1DARB(int target, - int level, - int internalformat, - int width, - int border, - int imageSize, - ShortBuffer pData) { + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer pData) { ARBTextureCompression.glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData); } @@ -4779,14 +4223,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage2DARB(int target, - int level, - int internalformat, - int width, - int height, - int border, - int imageSize, - ByteBuffer pData) { + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer pData) { ARBTextureCompression.glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData); } @@ -4800,14 +4237,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage2DARB(int target, - int level, - int internalformat, - int width, - int height, - int border, - int imageSize, - FloatBuffer pData) { + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer pData) { ARBTextureCompression.glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData); } @@ -4821,14 +4251,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage2DARB(int target, - int level, - int internalformat, - int width, - int height, - int border, - int imageSize, - IntBuffer pData) { + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer pData) { ARBTextureCompression.glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData); } @@ -4842,14 +4265,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage2DARB(int target, - int level, - int internalformat, - int width, - int height, - int border, - int imageSize, - ShortBuffer pData) { + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer pData) { ARBTextureCompression.glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData); } @@ -4864,24 +4280,8 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage3DARB(int target, - int level, - int internalformat, - int width, - int height, - int depth, - int border, - int imageSize, - ByteBuffer pData) { - ARBTextureCompression.glCompressedTexImage3DARB(target, - level, - internalformat, - width, - height, - depth, - border, - imageSize, - pData); + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) { + ARBTextureCompression.glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData); } /** @@ -4895,24 +4295,8 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage3DARB(int target, - int level, - int internalformat, - int width, - int height, - int depth, - int border, - int imageSize, - FloatBuffer pData) { - ARBTextureCompression.glCompressedTexImage3DARB(target, - level, - internalformat, - width, - height, - depth, - border, - imageSize, - pData); + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer pData) { + ARBTextureCompression.glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData); } /** @@ -4926,24 +4310,8 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage3DARB(int target, - int level, - int internalformat, - int width, - int height, - int depth, - int border, - int imageSize, - IntBuffer pData) { - ARBTextureCompression.glCompressedTexImage3DARB(target, - level, - internalformat, - width, - height, - depth, - border, - imageSize, - pData); + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer pData) { + ARBTextureCompression.glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData); } /** @@ -4957,24 +4325,8 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexImage3DARB(int target, - int level, - int internalformat, - int width, - int height, - int depth, - int border, - int imageSize, - ShortBuffer pData) { - ARBTextureCompression.glCompressedTexImage3DARB(target, - level, - internalformat, - width, - height, - depth, - border, - imageSize, - pData); + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) { + ARBTextureCompression.glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData); } /** @@ -4986,13 +4338,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage1DARB(int target, - int level, - int xoffset, - int width, - int border, - int imageSize, - ByteBuffer pData) { + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, ByteBuffer pData) { ARBTextureCompression.glCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData); } @@ -5005,13 +4351,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage1DARB(int target, - int level, - int xoffset, - int width, - int border, - int imageSize, - FloatBuffer pData) { + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, FloatBuffer pData) { ARBTextureCompression.glCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData); } @@ -5024,13 +4364,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage1DARB(int target, - int level, - int xoffset, - int width, - int border, - int imageSize, - IntBuffer pData) { + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, IntBuffer pData) { ARBTextureCompression.glCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData); } @@ -5043,13 +4377,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage1DARB(int target, - int level, - int xoffset, - int width, - int border, - int imageSize, - ShortBuffer pData) { + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int border, int imageSize, ShortBuffer pData) { ARBTextureCompression.glCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData); } @@ -5064,15 +4392,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage2DARB(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int border, - int imageSize, - ByteBuffer pData) { + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, ByteBuffer pData) { ARBTextureCompression.glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData); } @@ -5087,15 +4407,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage2DARB(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int border, - int imageSize, - FloatBuffer pData) { + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, FloatBuffer pData) { ARBTextureCompression.glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData); } @@ -5110,15 +4422,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage2DARB(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int border, - int imageSize, - IntBuffer pData) { + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, IntBuffer pData) { ARBTextureCompression.glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData); } @@ -5133,15 +4437,7 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage2DARB(int target, - int level, - int xoffset, - int yoffset, - int width, - int height, - int border, - int imageSize, - ShortBuffer pData) { + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int border, int imageSize, ShortBuffer pData) { ARBTextureCompression.glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData); } @@ -5158,28 +4454,8 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage3DARB(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int border, - int imageSize, - ByteBuffer pData) { - ARBTextureCompression.glCompressedTexSubImage3DARB(target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - border, - imageSize, - pData); + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) { + ARBTextureCompression.glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData); } /** @@ -5195,28 +4471,8 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage3DARB(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int border, - int imageSize, - FloatBuffer pData) { - ARBTextureCompression.glCompressedTexSubImage3DARB(target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - border, - imageSize, - pData); + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, FloatBuffer pData) { + ARBTextureCompression.glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData); } /** @@ -5232,28 +4488,8 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage3DARB(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int border, - int imageSize, - IntBuffer pData) { - ARBTextureCompression.glCompressedTexSubImage3DARB(target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - border, - imageSize, - pData); + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, IntBuffer pData) { + ARBTextureCompression.glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData); } /** @@ -5269,28 +4505,8 @@ public class GL { * @param imageSize * @param pData */ - public static void glCompressedTexSubImage3DARB(int target, - int level, - int xoffset, - int yoffset, - int zoffset, - int width, - int height, - int depth, - int border, - int imageSize, - ShortBuffer pData) { - ARBTextureCompression.glCompressedTexSubImage3DARB(target, - level, - xoffset, - yoffset, - zoffset, - width, - height, - depth, - border, - imageSize, - pData); + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) { + ARBTextureCompression.glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData); } /** @@ -5320,51 +4536,37 @@ public class GL { ARBTextureCompression.glGetCompressedTexImageARB(target, lod, pImg); } - /** - * @param pfMtx - */ + /** @param pfMtx */ public static void glLoadTransposeMatrixARB(FloatBuffer pfMtx) { ARBTransposeMatrix.glLoadTransposeMatrixARB(pfMtx); } - /** - * @param pfMtx - */ + /** @param pfMtx */ public static void glMultTransposeMatrixfARB(FloatBuffer pfMtx) { ARBTransposeMatrix.glMultTransposeMatrixfARB(pfMtx); } - /** - * @param count - */ + /** @param count */ public static void glVertexBlendARB(int count) { ARBVertexBlend.glVertexBlendARB(count); } - /** - * @param pWeights - */ + /** @param pWeights */ public static void glWeightARB(ByteBuffer pWeights) { ARBVertexBlend.glWeightARB(pWeights); } - /** - * @param pfWeights - */ + /** @param pfWeights */ public static void glWeightARB(FloatBuffer pfWeights) { ARBVertexBlend.glWeightARB(pfWeights); } - /** - * @param piWeights - */ + /** @param piWeights */ public static void glWeightARB(IntBuffer piWeights) { ARBVertexBlend.glWeightARB(piWeights); } - /** - * @param psWeights - */ + /** @param psWeights */ public static void glWeightARB(ShortBuffer psWeights) { ARBVertexBlend.glWeightARB(psWeights); } @@ -5418,23 +4620,17 @@ public class GL { ARBVertexBlend.glWeightPointerARB(size, type, stride, buffer_offset); } - /** - * @param pWeights - */ + /** @param pWeights */ public static void glWeightuARB(ByteBuffer pWeights) { ARBVertexBlend.glWeightuARB(pWeights); } - /** - * @param piWeights - */ + /** @param piWeights */ public static void glWeightuARB(IntBuffer piWeights) { ARBVertexBlend.glWeightuARB(piWeights); } - /** - * @param psWeights - */ + /** @param psWeights */ public static void glWeightuARB(ShortBuffer psWeights) { ARBVertexBlend.glWeightuARB(psWeights); } @@ -5456,12 +4652,7 @@ public class GL { * @param type * @param name */ - public static void glGetActiveAttribARB(int programObj, - int index, - IntBuffer length, - IntBuffer size, - IntBuffer type, - ByteBuffer name) { + public static void glGetActiveAttribARB(int programObj, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { ARBVertexShader.glGetActiveAttribARB(programObj, index, length, size, type, name); } @@ -5534,16 +4725,12 @@ public class GL { ARBShaderObjects.glAttachObjectARB(containerObj, obj); } - /** - * @param shaderObj - */ + /** @param shaderObj */ public static void glCompileShaderARB(int shaderObj) { ARBShaderObjects.glCompileShaderARB(shaderObj); } - /** - * @return - */ + /** @return */ public static int glCreateProgramObjectARB() { return ARBShaderObjects.glCreateProgramObjectARB(); } @@ -5557,9 +4744,7 @@ public class GL { return ARBShaderObjects.glCreateShaderObjectARB(shaderType); } - /** - * @param obj - */ + /** @param obj */ public static void glDeleteObjectARB(int obj) { ARBShaderObjects.glDeleteObjectARB(obj); } @@ -5580,12 +4765,7 @@ public class GL { * @param type * @param name */ - public static void glGetActiveUniformARB(int programObj, - int index, - IntBuffer length, - IntBuffer size, - IntBuffer type, - ByteBuffer name) { + public static void glGetActiveUniformARB(int programObj, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { ARBShaderObjects.glGetActiveUniformARB(programObj, index, length, size, type, name); } @@ -5671,9 +4851,7 @@ public class GL { return ARBShaderObjects.glGetUniformLocationARB(programObj, name); } - /** - * @param programObj - */ + /** @param programObj */ public static void glLinkProgramARB(int programObj) { ARBShaderObjects.glLinkProgramARB(programObj); } @@ -5861,30 +5039,22 @@ public class GL { ARBShaderObjects.glUniformMatrix4ARB(location, transpose, matrices); } - /** - * @param programObj - */ + /** @param programObj */ public static void glUseProgramObjectARB(int programObj) { ARBShaderObjects.glUseProgramObjectARB(programObj); } - /** - * @param programObj - */ + /** @param programObj */ public static void glValidateProgramARB(int programObj) { ARBShaderObjects.glValidateProgramARB(programObj); } - /** - * @param index - */ + /** @param index */ public static void glDisableVertexAttribArrayARB(int index) { ARBVertexProgram.glDisableVertexAttribArrayARB(index); } - /** - * @param index - */ + /** @param index */ public static void glEnableVertexAttribArrayARB(int index) { ARBVertexProgram.glEnableVertexAttribArrayARB(index); } @@ -6013,12 +5183,7 @@ public class GL { * @param stride * @param buffer */ - public static void glVertexAttribPointerARB(int index, - int size, - boolean unsigned, - boolean normalized, - int stride, - ByteBuffer buffer) { + public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, ByteBuffer buffer) { ARBVertexProgram.glVertexAttribPointerARB(index, size, unsigned, normalized, stride, buffer); } @@ -6030,12 +5195,7 @@ public class GL { * @param stride * @param buffer */ - public static void glVertexAttribPointerARB(int index, - int size, - boolean unsigned, - boolean normalized, - int stride, - IntBuffer buffer) { + public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, IntBuffer buffer) { ARBVertexProgram.glVertexAttribPointerARB(index, size, unsigned, normalized, stride, buffer); } @@ -6047,12 +5207,7 @@ public class GL { * @param stride * @param buffer */ - public static void glVertexAttribPointerARB(int index, - int size, - boolean unsigned, - boolean normalized, - int stride, - ShortBuffer buffer) { + public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, ShortBuffer buffer) { ARBVertexProgram.glVertexAttribPointerARB(index, size, unsigned, normalized, stride, buffer); } @@ -6162,9 +5317,7 @@ public class GL { EXTDrawRangeElements.glDrawRangeElementsEXT(mode, start, end, pIndices); } - /** - * @param coord - */ + /** @param coord */ public static void glFogCoordfEXT(float coord) { EXTFogCoord.glFogCoordfEXT(coord); } @@ -6267,9 +5420,7 @@ public class GL { EXTSecondaryColor.glSecondaryColorPointerEXT(size, type, stride, buffer_offset); } - /** - * @param face - */ + /** @param face */ public static void glActiveStencilFaceEXT(int face) { EXTStencilTwoSide.glActiveStencilFaceEXT(face); } @@ -6331,30 +5482,22 @@ public class GL { return EXTVertexShader.glBindTextureUnitParameterEXT(unit, value); } - /** - * @param id - */ + /** @param id */ public static void glBindVertexShaderEXT(int id) { EXTVertexShader.glBindVertexShaderEXT(id); } - /** - * @param id - */ + /** @param id */ public static void glDeleteVertexShaderEXT(int id) { EXTVertexShader.glDeleteVertexShaderEXT(id); } - /** - * @param id - */ + /** @param id */ public static void glDisableVariantClientStateEXT(int id) { EXTVertexShader.glDisableVariantClientStateEXT(id); } - /** - * @param id - */ + /** @param id */ public static void glEnableVariantClientStateEXT(int id) { EXTVertexShader.glEnableVariantClientStateEXT(id); } @@ -6736,9 +5879,7 @@ public class GL { EXTVertexShader.glWriteMaskEXT(res, in, outX, outY, outZ, outW); } - /** - * @param weight - */ + /** @param weight */ public static void glVertexWeightfEXT(float weight) { EXTVertexWeighting.glVertexWeightfEXT(weight); } @@ -6784,6 +5925,7 @@ public class GL { /** * @param type + * * @return */ public static int glCreateShader(int type) { @@ -6792,35 +5934,31 @@ public class GL { /** * @param shader + * * @return */ public static boolean glIsShader(int shader) { return GL20.glIsShader(shader); } - /** - * @param shader - */ + /** @param shader */ public static void glCompileShader(int shader) { GL20.glCompileShader(shader); } - /** - * @param shader - */ + /** @param shader */ public static void glDeleteShader(int shader) { GL20.glDeleteShader(shader); } - /** - * @return - */ + /** @return */ public static int glCreateProgram() { return GL20.glCreateProgram(); } /** * @param program + * * @return */ public static boolean glIsProgram(int program) { @@ -6843,30 +5981,22 @@ public class GL { GL20.glDetachShader(program, shader); } - /** - * @param program - */ + /** @param program */ public static void glLinkProgram(int program) { GL20.glLinkProgram(program); } - /** - * @param program - */ + /** @param program */ public static void glUseProgram(int program) { GL20.glUseProgram(program); } - /** - * @param program - */ + /** @param program */ public static void glValidateProgram(int program) { GL20.glValidateProgram(program); } - /** - * @param program - */ + /** @param program */ public static void glDeleteProgram(int program) { GL20.glDeleteProgram(program); } @@ -7104,6 +6234,7 @@ public class GL { /** * @param program * @param name + * * @return */ public static int glGetUniformLocation(int program, ByteBuffer name) { @@ -7118,8 +6249,7 @@ public class GL { * @param type * @param name */ - public static void glGetActiveUniform(int program, int index, - IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { + public static void glGetActiveUniform(int program, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { GL20.glGetActiveUniform(program, index, length, size, type, name); } @@ -7167,23 +6297,21 @@ public class GL { * @param type * @param name */ - public static void glGetActiveAttrib(int program, int index, - IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { + public static void glGetActiveAttrib(int program, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) { GL20.glGetActiveAttrib(program, index, length, size, type, name); } /** * @param program * @param name + * * @return */ public static int glGetAttribLocation(int program, ByteBuffer name) { return GL20.glGetAttribLocation(program, name); } - /** - * @param buffers - */ + /** @param buffers */ public static void glDrawBuffers(IntBuffer buffers) { GL20.glDrawBuffers(buffers); } @@ -7208,4 +6336,4 @@ public class GL { GL20.glStencilOpSeparate(face, sfail, dpfail, dppass); } -} +} \ No newline at end of file diff --git a/src/java/org/lwjgl/util/GLImpl.java b/src/java/org/lwjgl/util/GLImpl.java index cd746db8..19f67fe7 100644 --- a/src/java/org/lwjgl/util/GLImpl.java +++ b/src/java/org/lwjgl/util/GLImpl.java @@ -468,11 +468,10 @@ public class GLImpl implements IGL { } /** - * @param n * @param lists */ - public void glCallLists(int n, IntBuffer lists) { - GL.glCallLists(n, lists); + public void glCallLists(IntBuffer lists) { + GL.glCallLists(lists); } /** diff --git a/src/java/org/lwjgl/util/IGL.java b/src/java/org/lwjgl/util/IGL.java index 349bf2c5..2b85e5ae 100644 --- a/src/java/org/lwjgl/util/IGL.java +++ b/src/java/org/lwjgl/util/IGL.java @@ -99,10 +99,9 @@ public interface IGL { void glCallLists(ByteBuffer lists); /** - * @param n * @param lists */ - void glCallLists(int n, IntBuffer lists); + void glCallLists(IntBuffer lists); /** * @param lists