diff --git a/src/templates/org/lwjgl/openal/AL10.java b/src/templates/org/lwjgl/openal/AL10.java index 80ca63b1..dcaca285 100644 --- a/src/templates/org/lwjgl/openal/AL10.java +++ b/src/templates/org/lwjgl/openal/AL10.java @@ -1,39 +1,37 @@ -/* +/* * 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.openal; import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.ShortBuffer; import java.nio.IntBuffer; import java.nio.FloatBuffer; @@ -42,7 +40,7 @@ import org.lwjgl.generator.*; /** * $Id$ *
- * This is the core OpenAL class. This class implements + * This is the core OpenAL class. This class implements * AL.h version 1.0 * * @author Brian Matzon @@ -50,42 +48,42 @@ import org.lwjgl.generator.*; */ public interface AL10 { /** Bad value */ - public static final int AL_INVALID = -1; + int AL_INVALID = -1; /** Disable value */ - public static final int AL_NONE = 0; + int AL_NONE = 0; /** Boolean False */ - public static final int AL_FALSE = 0; + int AL_FALSE = 0; /** Boolean True */ - public static final int AL_TRUE = 1; + int AL_TRUE = 1; /** * Indicate the type of SOURCE. * Sources can be spatialized */ - public static final int AL_SOURCE_TYPE = 0x200; + int AL_SOURCE_TYPE = 0x200; /** Indicate source has absolute coordinates */ - public static final int AL_SOURCE_ABSOLUTE = 0x201; + int AL_SOURCE_ABSOLUTE = 0x201; /** Indicate Source has listener relative coordinates */ - public static final int AL_SOURCE_RELATIVE = 0x202; + int AL_SOURCE_RELATIVE = 0x202; /** * Directional source, inner cone angle, in degrees * Range: [0-360] * Default: 360 */ - public static final int AL_CONE_INNER_ANGLE = 0x1001; + int AL_CONE_INNER_ANGLE = 0x1001; /** * Directional source, outer cone angle, in degrees. * Range: [0-360] * Default: 360 */ - public static final int AL_CONE_OUTER_ANGLE = 0x1002; + int AL_CONE_OUTER_ANGLE = 0x1002; /** * Specify the pitch to be applied, either at source, @@ -93,7 +91,7 @@ public interface AL10 { * Range: [0.5-2.0] * Default: 1.0 */ - public static final int AL_PITCH = 0x1003; + int AL_PITCH = 0x1003; /** * Specify the current location in three dimensional space. @@ -105,13 +103,13 @@ public interface AL10 { * sign on the Z coordinate. * Listener position is always in the world coordinate system. */ - public static final int AL_POSITION = 0x1004; + int AL_POSITION = 0x1004; /** Specify the current direction as forward vector. */ - public static final int AL_DIRECTION = 0x1005; + int AL_DIRECTION = 0x1005; /** Specify the current velocity in three dimensional space. */ - public static final int AL_VELOCITY = 0x1006; + int AL_VELOCITY = 0x1006; /** * Indicate whether source has to loop infinite. @@ -119,14 +117,14 @@ public interface AL10 { * Range: [TRUE, FALSE] * Default: FALSE */ - public static final int AL_LOOPING = 0x1007; + int AL_LOOPING = 0x1007; /** * Indicate the buffer to provide sound samples. * Type: ALuint. * Range: any valid Buffer id. */ - public static final int AL_BUFFER = 0x1009; + int AL_BUFFER = 0x1009; /** * Indicate the gain (volume amplification) applied. @@ -139,28 +137,28 @@ public interface AL10 { * scale; it is interpreted as zero volume - the channel * is effectively disabled. */ - public static final int AL_GAIN = 0x100A; + int AL_GAIN = 0x100A; /** * Indicate minimum source attenuation. * Type: ALfloat * Range: [0.0 - 1.0] */ - public static final int AL_MIN_GAIN = 0x100D; + int AL_MIN_GAIN = 0x100D; /** * Indicate maximum source attenuation. * Type: ALfloat * Range: [0.0 - 1.0] */ - public static final int AL_MAX_GAIN = 0x100E; + int AL_MAX_GAIN = 0x100E; /** * Specify the current orientation. * Type: ALfv6 (at/up) * Range: N/A */ - public static final int AL_ORIENTATION = 0x100F; + int AL_ORIENTATION = 0x100F; /* byte offset into source (in canon format). -1 if source * is not playing. Don't set this, get this. @@ -169,7 +167,7 @@ public interface AL10 { * Range: [0.0 - ] * Default: 1.0 */ - public static final int AL_REFERENCE_DISTANCE = 0x1020; + int AL_REFERENCE_DISTANCE = 0x1020; /** * Indicate the rolloff factor for the source. @@ -177,7 +175,7 @@ public interface AL10 { * Range: [0.0 - ] * Default: 1.0 */ - public static final int AL_ROLLOFF_FACTOR = 0x1021; + int AL_ROLLOFF_FACTOR = 0x1021; /** * Indicate the gain (volume amplification) applied. @@ -190,57 +188,57 @@ public interface AL10 { * scale; it is interpreted as zero volume - the channel * is effectively disabled. */ - public static final int AL_CONE_OUTER_GAIN = 0x1022; + int AL_CONE_OUTER_GAIN = 0x1022; /** * Specify the maximum distance. * Type: ALfloat * Range: [0.0 - ] */ - public static final int AL_MAX_DISTANCE = 0x1023; + int AL_MAX_DISTANCE = 0x1023; /** * Specify the channel mask. (Creative) * Type: ALuint * Range: [0 - 255] */ - public static final int AL_CHANNEL_MASK = 0x3000; + int AL_CHANNEL_MASK = 0x3000; /** Source state information */ - public static final int AL_SOURCE_STATE = 0x1010; + int AL_SOURCE_STATE = 0x1010; /** Source state information */ - public static final int AL_INITIAL = 0x1011; + int AL_INITIAL = 0x1011; /** Source state information */ - public static final int AL_PLAYING = 0x1012; + int AL_PLAYING = 0x1012; /** Source state information */ - public static final int AL_PAUSED = 0x1013; + int AL_PAUSED = 0x1013; /** Source state information */ - public static final int AL_STOPPED = 0x1014; + int AL_STOPPED = 0x1014; /** Buffer Queue params */ - public static final int AL_BUFFERS_QUEUED = 0x1015; + int AL_BUFFERS_QUEUED = 0x1015; /** Buffer Queue params */ - public static final int AL_BUFFERS_PROCESSED = 0x1016; + int AL_BUFFERS_PROCESSED = 0x1016; /** Sound buffers: format specifier. */ - public static final int AL_FORMAT_MONO8 = 0x1100; + int AL_FORMAT_MONO8 = 0x1100; /** Sound buffers: format specifier. */ - public static final int AL_FORMAT_MONO16 = 0x1101; + int AL_FORMAT_MONO16 = 0x1101; /** Sound buffers: format specifier. */ - public static final int AL_FORMAT_STEREO8 = 0x1102; + int AL_FORMAT_STEREO8 = 0x1102; /** Sound buffers: format specifier. */ - public static final int AL_FORMAT_STEREO16 = 0x1103; - + int AL_FORMAT_STEREO16 = 0x1103; + /** Ogg Vorbis format specifier. */ - public static final int AL_FORMAT_VORBIS_EXT = 0x10003; + int AL_FORMAT_VORBIS_EXT = 0x10003; /** * Sound buffers: frequency, in units of Hertz [Hz]. @@ -248,7 +246,7 @@ public interface AL10 { * sample frequency marks the maximum significant * frequency component. */ - public static final int AL_FREQUENCY = 0x2001; + int AL_FREQUENCY = 0x2001; /** * Sound buffers: frequency, in units of Hertz [Hz]. @@ -256,7 +254,7 @@ public interface AL10 { * sample frequency marks the maximum significant * frequency component. */ - public static final int AL_BITS = 0x2002; + int AL_BITS = 0x2002; /** * Sound buffers: frequency, in units of Hertz [Hz]. @@ -264,7 +262,7 @@ public interface AL10 { * sample frequency marks the maximum significant * frequency component. */ - public static final int AL_CHANNELS = 0x2003; + int AL_CHANNELS = 0x2003; /** * Sound buffers: frequency, in units of Hertz [Hz]. @@ -272,7 +270,7 @@ public interface AL10 { * sample frequency marks the maximum significant * frequency component. */ - public static final int AL_SIZE = 0x2004; + int AL_SIZE = 0x2004; /** * Sound buffers: frequency, in units of Hertz [Hz]. @@ -280,43 +278,43 @@ public interface AL10 { * sample frequency marks the maximum significant * frequency component. */ - public static final int AL_DATA = 0x2005; + int AL_DATA = 0x2005; /** * Buffer state. * * Not supported for public use (yet). */ - public static final int AL_UNUSED = 0x2010; + int AL_UNUSED = 0x2010; /** * Buffer state. * * Not supported for public use (yet). */ - public static final int AL_PENDING = 0x2011; + int AL_PENDING = 0x2011; /** * Buffer state. * * Not supported for public use (yet). */ - public static final int AL_PROCESSED = 0x2012; + int AL_PROCESSED = 0x2012; /** Errors: No Error. */ - public static final int AL_NO_ERROR = AL_FALSE; + int AL_NO_ERROR = AL_FALSE; /** Illegal name passed as an argument to an AL call. */ - public static final int AL_INVALID_NAME = 0xA001; + int AL_INVALID_NAME = 0xA001; /** Illegal enum passed as an argument to an AL call. */ - public static final int AL_INVALID_ENUM = 0xA002; + int AL_INVALID_ENUM = 0xA002; /** * Illegal value passed as an argument to an AL call. * Applies to parameter values, but not to enumerations. */ - public static final int AL_INVALID_VALUE = 0xA003; + int AL_INVALID_VALUE = 0xA003; /** * A function was called at inappropriate time, @@ -324,40 +322,40 @@ public interface AL10 { * This can be an incompatible ALenum, object ID, * and/or function. */ - public static final int AL_INVALID_OPERATION = 0xA004; + int AL_INVALID_OPERATION = 0xA004; /** * A function could not be completed, * because there is not enough memory available. */ - public static final int AL_OUT_OF_MEMORY = 0xA005; + int AL_OUT_OF_MEMORY = 0xA005; /** Context strings: Vendor */ - public static final int AL_VENDOR = 0xB001; + int AL_VENDOR = 0xB001; /** Context strings: Version */ - public static final int AL_VERSION = 0xB002; + int AL_VERSION = 0xB002; /** Context strings: Renderer */ - public static final int AL_RENDERER = 0xB003; + int AL_RENDERER = 0xB003; /** Context strings: Extensions */ - public static final int AL_EXTENSIONS = 0xB004; + int AL_EXTENSIONS = 0xB004; /** Doppler scale. Default 1.0 */ - public static final int AL_DOPPLER_FACTOR = 0xC000; + int AL_DOPPLER_FACTOR = 0xC000; /** Doppler velocity. Default 1.0 */ - public static final int AL_DOPPLER_VELOCITY = 0xC001; + int AL_DOPPLER_VELOCITY = 0xC001; /** Distance model. Default INVERSE_DISTANCE_CLAMPED */ - public static final int AL_DISTANCE_MODEL = 0xD000; + int AL_DISTANCE_MODEL = 0xD000; /** Distance model */ - public static final int AL_INVERSE_DISTANCE = 0xD001; + int AL_INVERSE_DISTANCE = 0xD001; /** Distance model */ - public static final int AL_INVERSE_DISTANCE_CLAMPED = 0xD002; + int AL_INVERSE_DISTANCE_CLAMPED = 0xD002; /** * The application can temporarily disable certain AL capabilities on a per Context @@ -367,7 +365,7 @@ public interface AL10 { * @param capability name of a capability to enable */ @ALvoid - public void alEnable(int capability); + void alEnable(int capability); /** * The application can temporarily disable certain AL capabilities on a per Context @@ -377,7 +375,7 @@ public interface AL10 { * @param capability name of a capability to disable */ @ALvoid - public void alDisable(@ALenum int capability); + void alDisable(@ALenum int capability); /** * The application can also query whether a given capability is currently enabled or @@ -393,7 +391,7 @@ public interface AL10 { * @param capability name of a capability to check * @return true if named feature is enabled */ - public boolean alIsEnabled(@ALenum int capability); + boolean alIsEnabled(@ALenum int capability); /** * Hinting for implementation @@ -403,11 +401,11 @@ public interface AL10 { * @param mode Mode to hint */ // @ALvoid -// public void alHint(@ALenum int target, @ALenum int mode); +// void alHint(@ALenum int target, @ALenum int mode); /** - * Like OpenGL, AL uses a simplified interface for querying global state. - * + * Like OpenGL, AL uses a simplified interface for querying global state. + * * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, * AL_DISTANCE_MODEL. *

@@ -418,11 +416,11 @@ public interface AL10 { * * @return boolean state described by pname will be returned. */ - public boolean alGetBoolean(@ALenum int pname); + boolean alGetBoolean(@ALenum int pname); /** - * Like OpenGL, AL uses a simplified interface for querying global state. - * + * Like OpenGL, AL uses a simplified interface for querying global state. + * * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, * AL_DISTANCE_MODEL. *

@@ -433,11 +431,11 @@ public interface AL10 { * * @return int state described by pname will be returned. */ - public int alGetInteger(@ALenum int pname); + int alGetInteger(@ALenum int pname); /** - * Like OpenGL, AL uses a simplified interface for querying global state. - * + * Like OpenGL, AL uses a simplified interface for querying global state. + * * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, * AL_DISTANCE_MODEL. *

@@ -448,11 +446,11 @@ public interface AL10 { * * @return float state described by pname will be returned. */ - public float alGetFloat(@ALenum int pname); + float alGetFloat(@ALenum int pname); /** - * Like OpenGL, AL uses a simplified interface for querying global state. - * + * Like OpenGL, AL uses a simplified interface for querying global state. + * * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, * AL_DISTANCE_MODEL. *

@@ -466,11 +464,11 @@ public interface AL10 { */ @StripPostfix("data") @ALvoid - public void alGetIntegerv(@ALenum int pname, @Check("1") IntBuffer data); + void alGetIntegerv(@ALenum int pname, @Check("1") IntBuffer data); /** - * Like OpenGL, AL uses a simplified interface for querying global state. - * + * Like OpenGL, AL uses a simplified interface for querying global state. + * * Legal values are e.g. AL_DOPPLER_FACTOR, AL_DOPPLER_VELOCITY, * AL_DISTANCE_MODEL. *

@@ -484,7 +482,7 @@ public interface AL10 { */ @StripPostfix("data") @ALvoid - public void alGetFloatv(@ALenum int pname, @Check("1") FloatBuffer data); + void alGetFloatv(@ALenum int pname, @Check("1") FloatBuffer data); /** * The application can retrieve state information global to the current AL Context. @@ -497,7 +495,7 @@ public interface AL10 { * @return OpenAL String property */ @NoErrorCheck - public String alGetString(@ALenum int pname); + String alGetString(@ALenum int pname); /** * The AL detects only a subset of those conditions that could be considered errors. @@ -577,7 +575,7 @@ public interface AL10 { * @return current error state */ @NoErrorCheck - public @ALenum int alGetError(); + @ALenum int alGetError(); /** * To verify that a given extension is available for the current context and the device it @@ -585,12 +583,12 @@ public interface AL10 { *

* A null name argument returns AL_FALSE, as do invalid and unsupported string * tokens. A null deviceHandle will result in an INVALID_DEVICE error. - *

+ *

* * @param fname String describing the desired extension * @return true if extension is available, false if not */ - public boolean alIsExtensionPresent(String fname); + boolean alIsExtensionPresent(String fname); /** *

@@ -610,7 +608,7 @@ public interface AL10 { * @param ename String describing an OpenAL enum * @return Actual int for the described enumeration name */ - public @ALenum int alGetEnumValue(String ename); + @ALenum int alGetEnumValue(String ename); /** * Listener attributes are changed using the Listener group of commands. @@ -619,7 +617,7 @@ public interface AL10 { * @param value value to set the attribute to */ @ALvoid - public void alListeneri(@ALenum int pname, int value); + void alListeneri(@ALenum int pname, int value); /** * Listener attributes are changed using the Listener group of commands. @@ -628,8 +626,8 @@ public interface AL10 { * @param value floating point value to set the attribute to */ @ALvoid - public void alListenerf(@ALenum int pname, float value); - + void alListenerf(@ALenum int pname, float value); + /** * Listener attributes are changed using the Listener group of commands. * @@ -638,8 +636,8 @@ public interface AL10 { */ @StripPostfix("value") @ALvoid - public void alListenerfv(@ALenum int pname, @Check("1") FloatBuffer value); - + void alListenerfv(@ALenum int pname, @Check("1") FloatBuffer value); + /** * Listener attributes are changed using the Listener group of commands. * @@ -649,8 +647,7 @@ public interface AL10 { * @param v3 float value 3 */ @ALvoid - public void alListener3f(@ALenum int pname, float v1, float v2, float v3); - + void alListener3f(@ALenum int pname, float v1, float v2, float v3); /** * Listener state is maintained inside the AL implementation and can be queried in @@ -659,7 +656,7 @@ public interface AL10 { * @param pname name of the attribute to be retrieved * @return int */ - public int alGetListeneri(@ALenum int pname); + int alGetListeneri(@ALenum int pname); /** * Listener state is maintained inside the AL implementation and can be queried in @@ -668,7 +665,7 @@ public interface AL10 { * @param pname name of the attribute to be retrieved * @return float */ - public float alGetListenerf(@ALenum int pname); + float alGetListenerf(@ALenum int pname); /** * Listener state is maintained inside the AL implementation and can be queried in @@ -680,7 +677,7 @@ public interface AL10 { // TODO: What's the real minimum number of elements? @StripPostfix("floatdata") @ALvoid - public void alGetListenerfv(@ALenum int pname, @Check("1") FloatBuffer floatdata); + void alGetListenerfv(@ALenum int pname, @Check("1") FloatBuffer floatdata); /** * The application requests a number of Sources using GenSources. @@ -688,15 +685,15 @@ public interface AL10 { * @param sources array holding sources */ @ALvoid - public void alGenSources(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); + void alGenSources(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); /** * The application requests deletion of a number of Sources by DeleteSources. * - * @param source Source array to delete from + * @param sources Source array to delete from */ @ALvoid - public void alDeleteSources(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); + void alDeleteSources(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); /** * The application can verify whether a source name is valid using the IsSource query. @@ -704,7 +701,7 @@ public interface AL10 { * @param id id of source to be testes for validity * @return true if id is valid, false if not */ - public boolean alIsSource(@ALuint int id); + boolean alIsSource(@ALuint int id); /** * Specifies the position and other properties as taken into account during @@ -715,7 +712,7 @@ public interface AL10 { * @param value value of property */ @ALvoid - public void alSourcei(@ALuint int source, @ALenum int pname, int value); + void alSourcei(@ALuint int source, @ALenum int pname, int value); /** * Specifies the position and other properties as taken into account during @@ -726,8 +723,8 @@ public interface AL10 { * @param value value of property */ @ALvoid - public void alSourcef(@ALuint int source, @ALenum int pname, float value); - + void alSourcef(@ALuint int source, @ALenum int pname, float value); + /** * Specifies the position and other properties as taken into account during * sound processing. @@ -739,8 +736,8 @@ public interface AL10 { // TODO: What's the correct minimum value? @StripPostfix("value") @ALvoid - public void alSourcefv(@ALuint int source, @ALenum int pname, @Check("1") FloatBuffer value); - + void alSourcefv(@ALuint int source, @ALenum int pname, @Check("1") FloatBuffer value); + /** * Specifies the position and other properties as taken into account during * sound processing. @@ -752,13 +749,13 @@ public interface AL10 { * @param v3 value 3 of property */ @ALvoid - public void alSource3f( + void alSource3f( @ALuint int source, @ALenum int pname, float v1, float v2, float v3); - + /** * Source state is maintained inside the AL implementation, and the current attributes @@ -770,7 +767,7 @@ public interface AL10 { * @return int */ @ALvoid - public void alGetSourcei(@ALuint int source, @ALenum int pname, @Result int value); + void alGetSourcei(@ALuint int source, @ALenum int pname, @Result int value); /** * Source state is maintained inside the AL implementation, and the current attributes @@ -782,7 +779,7 @@ public interface AL10 { * @return float */ @ALvoid - public void alGetSourcef(@ALuint int source, @ALenum int pname, @Result float value); + void alGetSourcef(@ALuint int source, @ALenum int pname, @Result float value); /** * Source state is maintained inside the AL implementation, and the current attributes @@ -796,7 +793,7 @@ public interface AL10 { // TODO: What's the correct minimum value? @StripPostfix("floatdata") @ALvoid - public void alGetSourcefv(@ALuint int source, @ALenum int pname, @Check("1") FloatBuffer floatdata); + void alGetSourcefv(@ALuint int source, @ALenum int pname, @Check("1") FloatBuffer floatdata); /** * Play() applied to an AL_INITIAL Source will promote the Source to AL_PLAYING, thus @@ -812,7 +809,7 @@ public interface AL10 { */ @StripPostfix("sources") @ALvoid - public void alSourcePlayv(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); + void alSourcePlayv(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); /** * Pause() applied to an AL_INITIAL Source is a legal NOP. Pause() applied to a @@ -824,7 +821,7 @@ public interface AL10 { */ @StripPostfix("sources") @ALvoid - public void alSourcePausev(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); + void alSourcePausev(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); /** * Stop() applied to an AL_INITIAL Source is a legal NOP. Stop() applied to a AL_PLAYING @@ -837,7 +834,7 @@ public interface AL10 { */ @StripPostfix("sources") @ALvoid - public void alSourceStopv(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); + void alSourceStopv(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); /** * Rewind() applied to an AL_INITIAL Source is a legal NOP. Rewind() applied to a @@ -852,7 +849,7 @@ public interface AL10 { */ @StripPostfix("sources") @ALvoid - public void alSourceRewindv(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); + void alSourceRewindv(@AutoSize("sources") @ALsizei int n, @ALuint IntBuffer sources); /** * Play() applied to an AL_INITIAL Source will promote the Source to AL_PLAYING, thus @@ -867,7 +864,7 @@ public interface AL10 { * @param source Source to play */ @ALvoid - public void alSourcePlay(@ALuint int source); + void alSourcePlay(@ALuint int source); /** * Pause() applied to an AL_INITIAL Source is a legal NOP. Pause() applied to a @@ -878,7 +875,7 @@ public interface AL10 { * @param source Source to pause */ @ALvoid - public void alSourcePause(@ALuint int source); + void alSourcePause(@ALuint int source); /** * Stop() applied to an AL_INITIAL Source is a legal NOP. Stop() applied to a AL_PLAYING @@ -890,7 +887,7 @@ public interface AL10 { * @param source Source to stop */ @ALvoid - public void alSourceStop(@ALuint int source); + void alSourceStop(@ALuint int source); /** * Rewind() applied to an AL_INITIAL Source is a legal NOP. Rewind() applied to a @@ -904,7 +901,7 @@ public interface AL10 { * @param source Source to rewind */ @ALvoid - public void alSourceRewind(@ALuint int source); + void alSourceRewind(@ALuint int source); /** * The application requests a number of Buffers using GenBuffers. @@ -912,7 +909,7 @@ public interface AL10 { * @param buffers holding buffers */ @ALvoid - public void alGenBuffers(@AutoSize("buffers") @ALsizei int n, @ALuint IntBuffer buffers); + void alGenBuffers(@AutoSize("buffers") @ALsizei int n, @ALuint IntBuffer buffers); /** *

@@ -931,7 +928,7 @@ public interface AL10 { * @param buffers Buffer to delete from */ @ALvoid - public void alDeleteBuffers(@AutoSize("buffers") @ALsizei int n, @ALuint IntBuffer buffers); + void alDeleteBuffers(@AutoSize("buffers") @ALsizei int n, @ALuint IntBuffer buffers); /** * The application can verify whether a buffer Name is valid using the IsBuffer query. @@ -939,7 +936,7 @@ public interface AL10 { * @param buffer buffer to be tested for validity * @return true if supplied buffer is valid, false if not */ - public boolean alIsBuffer(@ALuint int buffer); + boolean alIsBuffer(@ALuint int buffer); /** *

@@ -965,11 +962,11 @@ public interface AL10 { * * @param buffer Buffer to fill * @param format format sound data is in - * @param data location of data + * @param data location of data * @param freq frequency of data */ @ALvoid - public void alBufferData( + void alBufferData( @ALuint int buffer, @ALenum int format, @ALbyte @@ -989,7 +986,7 @@ public interface AL10 { * @param pname name of property to retrieve */ @ALvoid - public void alGetBufferi(@ALuint int buffer, @ALenum int pname, @Result int value); + void alGetBufferi(@ALuint int buffer, @ALenum int pname, @Result int value); /** * Buffer state is maintained inside the AL implementation and can be queried in full.
@@ -1001,7 +998,7 @@ public interface AL10 { * @return float */ @ALvoid - public void alGetBufferf(@ALuint int buffer, @ALenum int pname, @Result float value); + void alGetBufferf(@ALuint int buffer, @ALenum int pname, @Result float value); /** *

@@ -1019,7 +1016,7 @@ public interface AL10 { * @param buffers buffers to be queued */ @ALvoid - public void alSourceQueueBuffers(@ALuint int source, @AutoSize("buffers") @ALsizei int n, @ALuint IntBuffer buffers); + void alSourceQueueBuffers(@ALuint int source, @AutoSize("buffers") @ALsizei int n, @ALuint IntBuffer buffers); /** *

@@ -1041,7 +1038,7 @@ public interface AL10 { * @param buffers buffers to be unqueued */ @ALvoid - public void alSourceUnqueueBuffers(@ALuint int source, @AutoSize("buffers") @ALsizei int n, @ALuint IntBuffer buffers); + void alSourceUnqueueBuffers(@ALuint int source, @AutoSize("buffers") @ALsizei int n, @ALuint IntBuffer buffers); /** *

@@ -1058,7 +1055,7 @@ public interface AL10 { * distance and other attenuation might ultimately limit the overall AL_GAIN to a value * below 1.0. *

- *

+ *

* AL currently supports three modes of operation with respect to distance * attenuation. It supports two distance-dependent attenuation models, one which is * similar to the IASIG I3DL2 (and DS3D) model. The application choses one of these @@ -1067,22 +1064,22 @@ public interface AL10 { *

*

* Legal arguments are AL_NONE, AL_INVERSE_DISTANCE, and - * AL_INVERSE_DISTANCE_CLAMPED. + * AL_INVERSE_DISTANCE_CLAMPED. *
*
* AL_NONE bypasses all distance attenuation * calculation for all Sources. The implementation is expected to optimize this - * situation. + * situation. *
*
* AL_INVERSE_DISTANCE_CLAMPED is the DS3D model, with * AL_REFERENCE_DISTANCE indicating both the reference distance and the distance - * below which gain will be clamped. + * below which gain will be clamped. *
*
* AL_INVERSE_DISTANCE is equivalent to the DS3D * model with the exception that AL_REFERENCE_DISTANCE does not imply any - * clamping. + * clamping. *
*
* The AL implementation is still free to apply any range clamping as @@ -1093,7 +1090,7 @@ public interface AL10 { * @param value distance model to be set */ @ALvoid - public void alDistanceModel(@ALenum int value); + void alDistanceModel(@ALenum int value); /** * The Doppler Effect depends on the velocities of Source and Listener relative to the @@ -1109,7 +1106,7 @@ public interface AL10 { * of the medium (air, water) moving with respect to listener and source are ignored. * AL_DOPPLER_VELOCITY is the propagation speed relative to which the Source * velocities are interpreted. - * + * *

*

 	 *	 VD: AL_DOPPLER_VELOCITY
@@ -1118,9 +1115,9 @@ public interface AL10 {
 	 *	 vs: Source verlocity (scalar, projected on source-listener vector)
 	 *	 f: Frequency in sample
 	 *	 f': effective Doppler shifted frequency
-	 *	 
+	 *
 	 *	 f' = DF * f * (VD-vl)/(VD+vs)
-	 * 
+	 *
 	 *	 vl<0, vs>0 : source and listener approaching each other
 	 *	 vl>0, vs<0 : source and listener moving away from each other
 	 * 
@@ -1148,7 +1145,7 @@ public interface AL10 { * @param value Doppler scale value to set */ @ALvoid - public void alDopplerFactor(float value); + void alDopplerFactor(float value); /** * The Doppler Effect depends on the velocities of Source and Listener relative to the @@ -1164,7 +1161,7 @@ public interface AL10 { * of the medium (air, water) moving with respect to listener and source are ignored. * AL_DOPPLER_VELOCITY is the propagation speed relative to which the Source * velocities are interpreted. - * + * *

*

 	 *	 VD: AL_DOPPLER_VELOCITY
@@ -1173,9 +1170,9 @@ public interface AL10 {
 	 *	 vs: Source verlocity (scalar, projected on source-listener vector)
 	 *	 f: Frequency in sample
 	 *	 f': effective Doppler shifted frequency
-	 *	 
+	 *
 	 *	 f' = DF * f * (VD-vl)/(VD+vs)
-	 * 
+	 *
 	 *	 vl<0, vs>0 : source and listener approaching each other
 	 *	 vl>0, vs<0 : source and listener moving away from each other
 	 * 
@@ -1203,5 +1200,5 @@ public interface AL10 { * @param value Doppler velocity value to set */ @ALvoid - public void alDopplerVelocity(float value); + void alDopplerVelocity(float value); } diff --git a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java index f5ca0ae3..5ea26579 100644 --- a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java +++ b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java @@ -31,8 +31,6 @@ */ package org.lwjgl.opengl; -import org.lwjgl.BufferChecks; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; import java.nio.*; @@ -42,49 +40,49 @@ public interface ARB_buffer_object { /* * 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; + int GL_STREAM_DRAW_ARB = 0x88E0; + int GL_STREAM_READ_ARB = 0x88E1; + int GL_STREAM_COPY_ARB = 0x88E2; + int GL_STATIC_DRAW_ARB = 0x88E4; + int GL_STATIC_READ_ARB = 0x88E5; + int GL_STATIC_COPY_ARB = 0x88E6; + int GL_DYNAMIC_DRAW_ARB = 0x88E8; + int GL_DYNAMIC_READ_ARB = 0x88E9; + 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; + int GL_READ_ONLY_ARB = 0x88B8; + int GL_WRITE_ONLY_ARB = 0x88B9; + 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; + int GL_BUFFER_SIZE_ARB = 0x8764; + int GL_BUFFER_USAGE_ARB = 0x8765; + int GL_BUFFER_ACCESS_ARB = 0x88BB; + int GL_BUFFER_MAPPED_ARB = 0x88BC; + int GL_BUFFER_MAP_POINTER_ARB = 0x88BD; @Code( " BufferObjectTracker.bindBuffer(target, buffer);") - public void glBindBufferARB(@GLenum int target, @GLuint int buffer); + void glBindBufferARB(@GLenum int target, @GLuint int buffer); @Code( " BufferObjectTracker.deleteBuffers(buffers);") - public void glDeleteBuffersARB(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers); - public void glGenBuffersARB(@AutoSize("buffers") int n, @GLuint IntBuffer buffers); - public boolean glIsBufferARB(@GLuint int buffer); + void glDeleteBuffersARB(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers); + void glGenBuffersARB(@AutoSize("buffers") int n, @GLuint IntBuffer buffers); + boolean glIsBufferARB(@GLuint int buffer); @GenerateAutos - public void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB int size, + void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB int size, @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage); - - public void glBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, + + void glBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, @Check @Const @GLbyte @@ -93,7 +91,7 @@ public interface ARB_buffer_object { @GLfloat Buffer data); - public void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, + void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, @Check @GLbyte @GLshort @@ -115,13 +113,13 @@ public interface ARB_buffer_object { * @return A ByteBuffer representing the mapped buffer memory. */ @CachedResult - public @GLvoid ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access); + @GLvoid ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access); - public boolean glUnmapBufferARB(@GLenum int target); + boolean glUnmapBufferARB(@GLenum int target); @StripPostfix("params") - public void glGetBufferParameterivARB(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetBufferParameterivARB(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("pointer") - public void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); + void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); } diff --git a/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java b/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java index a637fd33..bb20cb7b 100644 --- a/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java +++ b/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java @@ -32,27 +32,26 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; -import org.lwjgl.LWJGLException; public interface ARB_color_buffer_float { /* * Accepted by the parameters of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int RGBA_FLOAT_MODE_ARB = 0x8820; + int GL_RGBA_FLOAT_MODE_ARB = 0x8820; /* * Accepted by the parameter of ClampColorARB and the * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev. */ - public static final int CLAMP_VERTEX_COLOR_ARB = 0x891A; - public static final int CLAMP_FRAGMENT_COLOR_ARB = 0x891B; - public static final int CLAMP_READ_COLOR_ARB = 0x891C; + int GL_CLAMP_VERTEX_COLOR_ARB = 0x891A; + int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B; + int GL_CLAMP_READ_COLOR_ARB = 0x891C; /* * Accepted by the parameter of ClampColorARB. */ - public static final int FIXED_ONLY_ARB = 0x891D; + int GL_FIXED_ONLY_ARB = 0x891D; /* * Accepted as a value in the and @@ -60,18 +59,18 @@ public interface ARB_color_buffer_float { * parameter array of wglGetPixelFormatAttribivARB, and the * parameter array of wglGetPixelFormatAttribfvARB: */ - static final int WGL_TYPE_RGBA_FLOAT_ARB = 0x21A0; + int WGL_TYPE_RGBA_FLOAT_ARB = 0x21A0; /* * Accepted as values of the arguments in the * glXCreateNewContext and glXCreateContext functions */ - static final int GLX_RGBA_FLOAT_TYPE = 0x20B9; + int GLX_RGBA_FLOAT_TYPE = 0x20B9; /* * Accepted as a bit set in the GLX_RENDER_TYPE variable */ - static final int GLX_RGBA_FLOAT_BIT = 0x00000004; + int GLX_RGBA_FLOAT_BIT = 0x00000004; - public void glClampColorARB(@GLenum int target, @GLenum int clamp); + void glClampColorARB(@GLenum int target, @GLenum int clamp); } diff --git a/src/templates/org/lwjgl/opengl/ARB_depth_texture.java b/src/templates/org/lwjgl/opengl/ARB_depth_texture.java index 92639e98..36664412 100644 --- a/src/templates/org/lwjgl/opengl/ARB_depth_texture.java +++ b/src/templates/org/lwjgl/opengl/ARB_depth_texture.java @@ -36,19 +36,19 @@ public interface ARB_depth_texture { * Accepted by the parameter of TexImage1D, TexImage2D, * CopyTexImage1D and CopyTexImage2D: */ - public static final int GL_DEPTH_COMPONENT16_ARB = 0x81A5; - public static final int GL_DEPTH_COMPONENT24_ARB = 0x81A6; - public static final int GL_DEPTH_COMPONENT32_ARB = 0x81A7; + int GL_DEPTH_COMPONENT16_ARB = 0x81A5; + int GL_DEPTH_COMPONENT24_ARB = 0x81A6; + int GL_DEPTH_COMPONENT32_ARB = 0x81A7; /* * Accepted by the parameter of GetTexLevelParameterfv and * GetTexLevelParameteriv: */ - public static final int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884A; + int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884A; /* * Accepted by the parameter of TexParameterf, TexParameteri, * TexParameterfv, TexParameteriv, GetTexParameterfv, and GetTexParameteriv: */ - public static final int GL_DEPTH_TEXTURE_MODE_ARB = 0x884B; + int GL_DEPTH_TEXTURE_MODE_ARB = 0x884B; } diff --git a/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java b/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java index c7acebfb..bc5017e7 100644 --- a/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java +++ b/src/templates/org/lwjgl/opengl/ARB_draw_buffers.java @@ -31,8 +31,6 @@ */ package org.lwjgl.opengl; -import org.lwjgl.BufferChecks; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; import java.nio.IntBuffer; @@ -42,23 +40,23 @@ public interface ARB_draw_buffers { * Accepted by the parameters of GetIntegerv, GetFloatv, * and GetDoublev: */ - public static final int GL_MAX_DRAW_BUFFERS_ARB = 0x8824; - public static final int GL_DRAW_BUFFER0_ARB = 0x8825; - public static final int GL_DRAW_BUFFER1_ARB = 0x8826; - public static final int GL_DRAW_BUFFER2_ARB = 0x8827; - public static final int GL_DRAW_BUFFER3_ARB = 0x8828; - public static final int GL_DRAW_BUFFER4_ARB = 0x8829; - public static final int GL_DRAW_BUFFER5_ARB = 0x882A; - public static final int GL_DRAW_BUFFER6_ARB = 0x882B; - public static final int GL_DRAW_BUFFER7_ARB = 0x882C; - public static final int GL_DRAW_BUFFER8_ARB = 0x882D; - public static final int GL_DRAW_BUFFER9_ARB = 0x882E; - public static final int GL_DRAW_BUFFER10_ARB = 0x882F; - public static final int GL_DRAW_BUFFER11_ARB = 0x8830; - public static final int GL_DRAW_BUFFER12_ARB = 0x8831; - public static final int GL_DRAW_BUFFER13_ARB = 0x8832; - public static final int GL_DRAW_BUFFER14_ARB = 0x8833; - public static final int GL_DRAW_BUFFER15_ARB = 0x8834; + int GL_MAX_DRAW_BUFFERS_ARB = 0x8824; + int GL_DRAW_BUFFER0_ARB = 0x8825; + int GL_DRAW_BUFFER1_ARB = 0x8826; + int GL_DRAW_BUFFER2_ARB = 0x8827; + int GL_DRAW_BUFFER3_ARB = 0x8828; + int GL_DRAW_BUFFER4_ARB = 0x8829; + int GL_DRAW_BUFFER5_ARB = 0x882A; + int GL_DRAW_BUFFER6_ARB = 0x882B; + int GL_DRAW_BUFFER7_ARB = 0x882C; + int GL_DRAW_BUFFER8_ARB = 0x882D; + int GL_DRAW_BUFFER9_ARB = 0x882E; + int GL_DRAW_BUFFER10_ARB = 0x882F; + int GL_DRAW_BUFFER11_ARB = 0x8830; + int GL_DRAW_BUFFER12_ARB = 0x8831; + int GL_DRAW_BUFFER13_ARB = 0x8832; + int GL_DRAW_BUFFER14_ARB = 0x8833; + int GL_DRAW_BUFFER15_ARB = 0x8834; - public void glDrawBuffersARB(@AutoSize("buffers") @GLsizei int size, @Const @GLenum IntBuffer buffers); + void glDrawBuffersARB(@AutoSize("buffers") @GLsizei int size, @Const @GLenum IntBuffer buffers); } diff --git a/src/templates/org/lwjgl/opengl/ARB_fragment_program.java b/src/templates/org/lwjgl/opengl/ARB_fragment_program.java index 6515b34a..ad1c6cc6 100644 --- a/src/templates/org/lwjgl/opengl/ARB_fragment_program.java +++ b/src/templates/org/lwjgl/opengl/ARB_fragment_program.java @@ -40,29 +40,29 @@ public interface ARB_fragment_program extends ARB_program { * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB, * GetProgramivARB and GetProgramStringARB. */ - public static final int GL_FRAGMENT_PROGRAM_ARB = 0x8804; + int GL_FRAGMENT_PROGRAM_ARB = 0x8804; /* * Accepted by the parameter of GetProgramivARB: */ - public static final int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805; - public static final int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806; - public static final int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807; - public static final int GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x8808; - public static final int GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x8809; - public static final int GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x880A; - public static final int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x880B; - public static final int GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x880C; - public static final int GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB = 0x880D; - public static final int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880E; - public static final int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F; - public static final int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810; + int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805; + int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806; + int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807; + int GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x8808; + int GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x8809; + int GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x880A; + int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x880B; + int GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x880C; + int GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB = 0x880D; + int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880E; + int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F; + int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, * and GetDoublev: */ - public static final int GL_MAX_TEXTURE_COORDS_ARB = 0x8871; - public static final int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872; + int GL_MAX_TEXTURE_COORDS_ARB = 0x8871; + int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872; } diff --git a/src/templates/org/lwjgl/opengl/ARB_fragment_shader.java b/src/templates/org/lwjgl/opengl/ARB_fragment_shader.java index a4904fa6..2257ad47 100644 --- a/src/templates/org/lwjgl/opengl/ARB_fragment_shader.java +++ b/src/templates/org/lwjgl/opengl/ARB_fragment_shader.java @@ -36,19 +36,19 @@ public interface ARB_fragment_shader { * Accepted by the argument of CreateShaderObjectARB and * returned by the parameter of GetObjectParameter{fi}vARB: */ - public static final int GL_FRAGMENT_SHADER_ARB = 0x8B30; + int GL_FRAGMENT_SHADER_ARB = 0x8B30; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8B49; - public static final int GL_MAX_TEXTURE_COORDS_ARB = 0x8871; - public static final int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872; + int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8B49; + int GL_MAX_TEXTURE_COORDS_ARB = 0x8871; + int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872; /* * Accepted by the parameter of Hint and the parameter of * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8B8B; + int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8B8B; } diff --git a/src/templates/org/lwjgl/opengl/ARB_half_float_pixel.java b/src/templates/org/lwjgl/opengl/ARB_half_float_pixel.java index 7b30ae82..c063ff51 100644 --- a/src/templates/org/lwjgl/opengl/ARB_half_float_pixel.java +++ b/src/templates/org/lwjgl/opengl/ARB_half_float_pixel.java @@ -40,5 +40,5 @@ public interface ARB_half_float_pixel { * SeparableFilter2D, GetSeparableFilter, ColorTable, ColorSubTable, * and GetColorTable: */ - public static final int HALF_FLOAT_ARB = 0x140B; + int HALF_FLOAT_ARB = 0x140B; } diff --git a/src/templates/org/lwjgl/opengl/ARB_imaging.java b/src/templates/org/lwjgl/opengl/ARB_imaging.java index 6a01aa1a..5024462f 100644 --- a/src/templates/org/lwjgl/opengl/ARB_imaging.java +++ b/src/templates/org/lwjgl/opengl/ARB_imaging.java @@ -32,14 +32,9 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import java.nio.ShortBuffer; -import org.lwjgl.BufferChecks; -import org.lwjgl.BufferUtils; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; /** @@ -53,91 +48,91 @@ import org.lwjgl.generator.*; @Extension(postfix="") public interface ARB_imaging { - 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; + int GL_CONSTANT_COLOR = 0x8001; + int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002; + int GL_CONSTANT_ALPHA = 0x8003; + int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004; + int GL_BLEND_COLOR = 0x8005; + int GL_FUNC_ADD = 0x8006; + int GL_MIN = 0x8007; + int GL_MAX = 0x8008; + int GL_BLEND_EQUATION = 0x8009; + int GL_FUNC_SUBTRACT = 0x800A; + int GL_FUNC_REVERSE_SUBTRACT = 0x800B; + int GL_COLOR_MATRIX = 0x80B1; + int GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2; + int GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3; + int GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4; + int GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5; + int GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6; + int GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7; + int GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8; + int GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9; + int GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA; + int GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB; + int GL_COLOR_TABLE = 0x80D0; + int GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1; + int GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2; + int GL_PROXY_COLOR_TABLE = 0x80D3; + int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4; + int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5; + int GL_COLOR_TABLE_SCALE = 0x80D6; + int GL_COLOR_TABLE_BIAS = 0x80D7; + int GL_COLOR_TABLE_FORMAT = 0x80D8; + int GL_COLOR_TABLE_WIDTH = 0x80D9; + int GL_COLOR_TABLE_RED_SIZE = 0x80DA; + int GL_COLOR_TABLE_GREEN_SIZE = 0x80DB; + int GL_COLOR_TABLE_BLUE_SIZE = 0x80DC; + int GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD; + int GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE; + int GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF; + int GL_CONVOLUTION_1D = 0x8010; + int GL_CONVOLUTION_2D = 0x8011; + int GL_SEPARABLE_2D = 0x8012; + int GL_CONVOLUTION_BORDER_MODE = 0x8013; + int GL_CONVOLUTION_FILTER_SCALE = 0x8014; + int GL_CONVOLUTION_FILTER_BIAS = 0x8015; + int GL_REDUCE = 0x8016; + int GL_CONVOLUTION_FORMAT = 0x8017; + int GL_CONVOLUTION_WIDTH = 0x8018; + int GL_CONVOLUTION_HEIGHT = 0x8019; + int GL_MAX_CONVOLUTION_WIDTH = 0x801A; + int GL_MAX_CONVOLUTION_HEIGHT = 0x801B; + int GL_POST_CONVOLUTION_RED_SCALE = 0x801C; + int GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D; + int GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E; + int GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F; + int GL_POST_CONVOLUTION_RED_BIAS = 0x8020; + int GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021; + int GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022; + int GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023; + int GL_IGNORE_BORDER = 0x8150; + int GL_CONSTANT_BORDER = 0x8151; + int GL_REPLICATE_BORDER = 0x8153; + int GL_CONVOLUTION_BORDER_COLOR = 0x8154; + int GL_HISTOGRAM = 0x8024; + int GL_PROXY_HISTOGRAM = 0x8025; + int GL_HISTOGRAM_WIDTH = 0x8026; + int GL_HISTOGRAM_FORMAT = 0x8027; + int GL_HISTOGRAM_RED_SIZE = 0x8028; + int GL_HISTOGRAM_GREEN_SIZE = 0x8029; + int GL_HISTOGRAM_BLUE_SIZE = 0x802A; + int GL_HISTOGRAM_ALPHA_SIZE = 0x802B; + int GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C; + int GL_HISTOGRAM_SINK = 0x802D; + int GL_MINMAX = 0x802E; + int GL_MINMAX_FORMAT = 0x802F; + int GL_MINMAX_SINK = 0x8030; - public void glColorTable(@GLenum int target, @GLenum int internalFormat, @GLsizei int width, @GLenum int format, @GLenum int type, + void glColorTable(@GLenum int target, @GLenum int internalFormat, @GLsizei int width, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check("256") @Const @GLbyte @GLfloat Buffer data); - - public void glColorSubTable(@GLenum int target, @GLsizei int start, @GLsizei int count, @GLenum int format, @GLenum int type, + + void glColorSubTable(@GLenum int target, @GLsizei int start, @GLsizei int count, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check("256") @Const @@ -146,35 +141,35 @@ public interface ARB_imaging { Buffer data); @StripPostfix("params") - public void glColorTableParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glColorTableParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glColorTableParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); + void glColorTableParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); - public void glCopyColorSubTable(@GLenum int target, @GLsizei int start, int x, int y, @GLsizei int width); + void glCopyColorSubTable(@GLenum int target, @GLsizei int start, int x, int y, @GLsizei int width); - public void glCopyColorTable(@GLenum int target, @GLenum int internalformat, int x, int y, @GLsizei int width); + void glCopyColorTable(@GLenum int target, @GLenum int internalformat, int x, int y, @GLsizei int width); - public void glGetColorTable(@GLenum int target, @GLenum int format, @GLenum int type, + void glGetColorTable(@GLenum int target, @GLenum int format, @GLenum int type, @Check("256") @GLbyte @GLfloat Buffer data); @StripPostfix("params") - public void glGetColorTableParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetColorTableParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetColorTableParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetColorTableParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); - public void glBlendEquation(@GLenum int mode); + void glBlendEquation(@GLenum int mode); - public void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); + void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); - public void glHistogram(@GLenum int target, @GLsizei int width, @GLenum int internalformat, boolean sink); + void glHistogram(@GLenum int target, @GLsizei int width, @GLenum int internalformat, boolean sink); - public void glResetHistogram(@GLenum int target); + void glResetHistogram(@GLenum int target); - public void glGetHistogram(@GLenum int target, boolean reset, @GLenum int format, @GLenum int type, + void glGetHistogram(@GLenum int target, boolean reset, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.PackPBO) @Check("256") @GLbyte @@ -184,15 +179,15 @@ public interface ARB_imaging { Buffer values); @StripPostfix("params") - public void glGetHistogramParameterfv(@GLenum int target, @GLenum int pname, @Check("256") FloatBuffer params); + void glGetHistogramParameterfv(@GLenum int target, @GLenum int pname, @Check("256") FloatBuffer params); @StripPostfix("params") - public void glGetHistogramParameteriv(@GLenum int target, @GLenum int pname, @Check("256") IntBuffer params); + void glGetHistogramParameteriv(@GLenum int target, @GLenum int pname, @Check("256") IntBuffer params); - public void glMinmax(@GLenum int target, @GLenum int internalformat, boolean sink); + void glMinmax(@GLenum int target, @GLenum int internalformat, boolean sink); - public void glResetMinmax(@GLenum int target); + void glResetMinmax(@GLenum int target); - public void glGetMinmax(@GLenum int target, boolean reset, @GLenum int format, @GLenum int types, + void glGetMinmax(@GLenum int target, boolean reset, @GLenum int format, @GLenum int types, @BufferObject(BufferKind.PackPBO) @Check("4") @GLbyte @@ -200,13 +195,13 @@ public interface ARB_imaging { @GLint @GLfloat Buffer values); - - @StripPostfix("params") - public void glGetMinmaxParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); - @StripPostfix("params") - public void glGetMinmaxParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); - public void glConvolutionFilter1D(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLenum int format, @GLenum int type, + @StripPostfix("params") + void glGetMinmaxParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); + @StripPostfix("params") + void glGetMinmaxParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + + void glConvolutionFilter1D(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check("GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1)") @GLbyte @@ -215,7 +210,7 @@ public interface ARB_imaging { @GLfloat Buffer image); - public void glConvolutionFilter2D(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, + void glConvolutionFilter2D(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check("GLBufferChecks.calculateImageStorage(image, format, type, width, height, 1)") @GLbyte @@ -223,22 +218,22 @@ public interface ARB_imaging { @GLint Buffer image); - public void glConvolutionParameterf(@GLenum int target, @GLenum int pname, float params); - - @StripPostfix("params") - public void glConvolutionParameterfv(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params); - - public void glConvolutionParameteri(@GLenum int target, @GLenum int pname, int params); - - @StripPostfix("params") - public void glConvolutionParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params); + void glConvolutionParameterf(@GLenum int target, @GLenum int pname, float params); - public void glCopyConvolutionFilter1D(@GLenum int target, @GLenum int internalformat, int x, int y, @GLsizei int width); + @StripPostfix("params") + void glConvolutionParameterfv(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params); - public void glCopyConvolutionFilter2D(@GLenum int target, @GLenum int internalformat, int x, int y, @GLsizei int width, @GLsizei int height); + void glConvolutionParameteri(@GLenum int target, @GLenum int pname, int params); + + @StripPostfix("params") + void glConvolutionParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params); + + void glCopyConvolutionFilter1D(@GLenum int target, @GLenum int internalformat, int x, int y, @GLsizei int width); + + void glCopyConvolutionFilter2D(@GLenum int target, @GLenum int internalformat, int x, int y, @GLsizei int width, @GLsizei int height); // TODO: check buffer size valid - public void glGetConvolutionFilter(@GLenum int target, @GLenum int format, @GLenum int type, + void glGetConvolutionFilter(@GLenum int target, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.PackPBO) @Check @GLbyte @@ -248,12 +243,12 @@ public interface ARB_imaging { Buffer image); @StripPostfix("params") - public void glGetConvolutionParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetConvolutionParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetConvolutionParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetConvolutionParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); // TODO: check buffer size valid - public void glSeparableFilter2D(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, + void glSeparableFilter2D(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check @Const @@ -272,7 +267,7 @@ public interface ARB_imaging { Buffer column); // TODO: check buffer size valid - public void glGetSeparableFilter(@GLenum int target, @GLenum int format, @GLenum int type, + void glGetSeparableFilter(@GLenum int target, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.PackPBO) @Check @GLbyte diff --git a/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java b/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java index 295b8c0c..8c23b8e5 100644 --- a/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java +++ b/src/templates/org/lwjgl/opengl/ARB_matrix_palette.java @@ -36,25 +36,23 @@ import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; -import org.lwjgl.LWJGLException; -import org.lwjgl.BufferChecks; import org.lwjgl.generator.*; public interface ARB_matrix_palette { - 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; + int GL_MATRIX_PALETTE_ARB = 0x8840; + int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841; + int GL_MAX_PALETTE_MATRICES_ARB = 0x8842; + int GL_CURRENT_PALETTE_MATRIX_ARB = 0x8843; + int GL_MATRIX_INDEX_ARRAY_ARB = 0x8844; + int GL_CURRENT_MATRIX_INDEX_ARB = 0x8845; + int GL_MATRIX_INDEX_ARRAY_SIZE_ARB = 0x8846; + int GL_MATRIX_INDEX_ARRAY_TYPE_ARB = 0x8847; + int GL_MATRIX_INDEX_ARRAY_STRIDE_ARB = 0x8848; + int GL_MATRIX_INDEX_ARRAY_POINTER_ARB = 0x8849; - public void glCurrentPaletteMatrixARB(int index); + void glCurrentPaletteMatrixARB(int index); - public void glMatrixIndexPointerARB(int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, + void glMatrixIndexPointerARB(int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @GLubyte @@ -63,9 +61,9 @@ public interface ARB_matrix_palette { Buffer pPointer); @StripPostfix("pIndices") - public void glMatrixIndexubvARB(@AutoSize("pIndices") int size, @GLubyte ByteBuffer pIndices); + void glMatrixIndexubvARB(@AutoSize("pIndices") int size, @GLubyte ByteBuffer pIndices); @StripPostfix("pIndices") - public void glMatrixIndexusvARB(@AutoSize("pIndices") int size, @GLushort ShortBuffer pIndices); + void glMatrixIndexusvARB(@AutoSize("pIndices") int size, @GLushort ShortBuffer pIndices); @StripPostfix("pIndices") - public void glMatrixIndexuivARB(@AutoSize("pIndices") int size, @GLuint IntBuffer pIndices); + void glMatrixIndexuivARB(@AutoSize("pIndices") int size, @GLuint IntBuffer pIndices); } diff --git a/src/templates/org/lwjgl/opengl/ARB_multisample.java b/src/templates/org/lwjgl/opengl/ARB_multisample.java index 14e47724..da719c21 100644 --- a/src/templates/org/lwjgl/opengl/ARB_multisample.java +++ b/src/templates/org/lwjgl/opengl/ARB_multisample.java @@ -31,19 +31,18 @@ */ package org.lwjgl.opengl; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_multisample { - 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; + int GL_MULTISAMPLE_ARB = 0x809D; + int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E; + int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F; + int GL_SAMPLE_COVERAGE_ARB = 0x80A0; + int GL_SAMPLE_BUFFERS_ARB = 0x80A8; + int GL_SAMPLES_ARB = 0x80A9; + int GL_SAMPLE_COVERAGE_VALUE_ARB = 0x80AA; + int GL_SAMPLE_COVERAGE_INVERT_ARB = 0x80AB; + int GL_MULTISAMPLE_BIT_ARB = 0x20000000; - public void glSampleCoverageARB(@GLclampf float value, boolean invert); + void glSampleCoverageARB(@GLclampf float value, boolean invert); } diff --git a/src/templates/org/lwjgl/opengl/ARB_multitexture.java b/src/templates/org/lwjgl/opengl/ARB_multitexture.java index c90867db..c366aa1f 100644 --- a/src/templates/org/lwjgl/opengl/ARB_multitexture.java +++ b/src/templates/org/lwjgl/opengl/ARB_multitexture.java @@ -31,71 +31,70 @@ */ package org.lwjgl.opengl; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_multitexture { - 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; + int GL_TEXTURE0_ARB = 0x84C0; + int GL_TEXTURE1_ARB = 0x84C1; + int GL_TEXTURE2_ARB = 0x84C2; + int GL_TEXTURE3_ARB = 0x84C3; + int GL_TEXTURE4_ARB = 0x84C4; + int GL_TEXTURE5_ARB = 0x84C5; + int GL_TEXTURE6_ARB = 0x84C6; + int GL_TEXTURE7_ARB = 0x84C7; + int GL_TEXTURE8_ARB = 0x84C8; + int GL_TEXTURE9_ARB = 0x84C9; + int GL_TEXTURE10_ARB = 0x84CA; + int GL_TEXTURE11_ARB = 0x84CB; + int GL_TEXTURE12_ARB = 0x84CC; + int GL_TEXTURE13_ARB = 0x84CD; + int GL_TEXTURE14_ARB = 0x84CE; + int GL_TEXTURE15_ARB = 0x84CF; + int GL_TEXTURE16_ARB = 0x84D0; + int GL_TEXTURE17_ARB = 0x84D1; + int GL_TEXTURE18_ARB = 0x84D2; + int GL_TEXTURE19_ARB = 0x84D3; + int GL_TEXTURE20_ARB = 0x84D4; + int GL_TEXTURE21_ARB = 0x84D5; + int GL_TEXTURE22_ARB = 0x84D6; + int GL_TEXTURE23_ARB = 0x84D7; + int GL_TEXTURE24_ARB = 0x84D8; + int GL_TEXTURE25_ARB = 0x84D9; + int GL_TEXTURE26_ARB = 0x84DA; + int GL_TEXTURE27_ARB = 0x84DB; + int GL_TEXTURE28_ARB = 0x84DC; + int GL_TEXTURE29_ARB = 0x84DD; + int GL_TEXTURE30_ARB = 0x84DE; + int GL_TEXTURE31_ARB = 0x84DF; + int GL_ACTIVE_TEXTURE_ARB = 0x84E0; + int GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1; + int GL_MAX_TEXTURE_UNITS_ARB = 0x84E2; - public void glClientActiveTextureARB(@GLenum int texture); + void glClientActiveTextureARB(@GLenum int texture); - public void glActiveTextureARB(@GLenum int texture); + void glActiveTextureARB(@GLenum int texture); - public void glMultiTexCoord1fARB(@GLenum int target, float s); + void glMultiTexCoord1fARB(@GLenum int target, float s); - public void glMultiTexCoord1iARB(@GLenum int target, int s); + void glMultiTexCoord1iARB(@GLenum int target, int s); - public void glMultiTexCoord1sARB(@GLenum int target, short s); + void glMultiTexCoord1sARB(@GLenum int target, short s); - public void glMultiTexCoord2fARB(@GLenum int target, float s, float t); + void glMultiTexCoord2fARB(@GLenum int target, float s, float t); - public void glMultiTexCoord2iARB(@GLenum int target, int s, int t); + void glMultiTexCoord2iARB(@GLenum int target, int s, int t); - public void glMultiTexCoord2sARB(@GLenum int target, short s, short t); + void glMultiTexCoord2sARB(@GLenum int target, short s, short t); - public void glMultiTexCoord3fARB(@GLenum int target, float s, float t, float r); + void glMultiTexCoord3fARB(@GLenum int target, float s, float t, float r); - public void glMultiTexCoord3iARB(@GLenum int target, int s, int t, int r); + void glMultiTexCoord3iARB(@GLenum int target, int s, int t, int r); - public void glMultiTexCoord3sARB(@GLenum int target, short s, short t, short r); + void glMultiTexCoord3sARB(@GLenum int target, short s, short t, short r); - public void glMultiTexCoord4fARB(@GLenum int target, float s, float t, float r, float q); + void glMultiTexCoord4fARB(@GLenum int target, float s, float t, float r, float q); - public void glMultiTexCoord4iARB(@GLenum int target, int s, int t, int r, int q); + void glMultiTexCoord4iARB(@GLenum int target, int s, int t, int r, int q); - public void glMultiTexCoord4sARB(@GLenum int target, short s, short t, short r, short q); + void glMultiTexCoord4sARB(@GLenum int target, short s, short t, short r, short q); } diff --git a/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java b/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java index e8673678..b798afc1 100644 --- a/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java +++ b/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java @@ -33,7 +33,6 @@ package org.lwjgl.opengl; import java.nio.IntBuffer; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_occlusion_query { @@ -41,37 +40,37 @@ public interface ARB_occlusion_query { * Accepted by the parameter of BeginQueryARB, EndQueryARB, * and GetQueryivARB: */ - public static final int GL_SAMPLES_PASSED_ARB = 0x8914; + int GL_SAMPLES_PASSED_ARB = 0x8914; /* * Accepted by the parameter of GetQueryivARB: */ - public static final int GL_QUERY_COUNTER_BITS_ARB = 0x8864; - public static final int GL_CURRENT_QUERY_ARB = 0x8865; + int GL_QUERY_COUNTER_BITS_ARB = 0x8864; + int GL_CURRENT_QUERY_ARB = 0x8865; /* * Accepted by the parameter of GetQueryObjectivARB and * GetQueryObjectuivARB: */ - public static final int GL_QUERY_RESULT_ARB = 0x8866; - public static final int GL_QUERY_RESULT_AVAILABLE_ARB = 0x8867; + int GL_QUERY_RESULT_ARB = 0x8866; + int GL_QUERY_RESULT_AVAILABLE_ARB = 0x8867; - public void glGenQueriesARB(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); + void glGenQueriesARB(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); - public void glDeleteQueriesARB(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); + void glDeleteQueriesARB(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); - public boolean glIsQueryARB(@GLuint int id); + boolean glIsQueryARB(@GLuint int id); - public void glBeginQueryARB(@GLenum int target, @GLuint int id); + void glBeginQueryARB(@GLenum int target, @GLuint int id); - public void glEndQueryARB(@GLenum int target); + void glEndQueryARB(@GLenum int target); @StripPostfix("params") - public void glGetQueryivARB(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetQueryivARB(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetQueryObjectivARB(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params); + void glGetQueryObjectivARB(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetQueryObjectuivARB(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params); + void glGetQueryObjectuivARB(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/ARB_pixel_buffer_object.java b/src/templates/org/lwjgl/opengl/ARB_pixel_buffer_object.java index a4585806..4a24643e 100644 --- a/src/templates/org/lwjgl/opengl/ARB_pixel_buffer_object.java +++ b/src/templates/org/lwjgl/opengl/ARB_pixel_buffer_object.java @@ -37,13 +37,13 @@ public interface ARB_pixel_buffer_object extends ARB_buffer_object { * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, * GetBufferParameteriv, and GetBufferPointerv: */ - public static final int GL_PIXEL_PACK_BUFFER_ARB = 0x88EB; - public static final int GL_PIXEL_UNPACK_BUFFER_ARB = 0x88EC; + int GL_PIXEL_PACK_BUFFER_ARB = 0x88EB; + int GL_PIXEL_UNPACK_BUFFER_ARB = 0x88EC; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ED; - public static final int PIXEL_UNPACK_BUFFER_BINDING_ARB = 0x88EF; + int PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ED; + int PIXEL_UNPACK_BUFFER_BINDING_ARB = 0x88EF; } diff --git a/src/templates/org/lwjgl/opengl/ARB_point_parameters.java b/src/templates/org/lwjgl/opengl/ARB_point_parameters.java index 3462a12a..18261488 100644 --- a/src/templates/org/lwjgl/opengl/ARB_point_parameters.java +++ b/src/templates/org/lwjgl/opengl/ARB_point_parameters.java @@ -33,17 +33,16 @@ package org.lwjgl.opengl; import java.nio.FloatBuffer; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_point_parameters { - 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; + int GL_POINT_SIZE_MIN_ARB = 0x8126; + int GL_POINT_SIZE_MAX_ARB = 0x8127; + int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128; + int GL_POINT_DISTANCE_ATTENUATION_ARB = 0x8129; - public void glPointParameterfARB(@GLenum int pname, float param); + void glPointParameterfARB(@GLenum int pname, float param); @StripPostfix("pfParams") - public void glPointParameterfvARB(@GLenum int pname, @Check("4") FloatBuffer pfParams); + void glPointParameterfvARB(@GLenum int pname, @Check("4") FloatBuffer pfParams); } diff --git a/src/templates/org/lwjgl/opengl/ARB_point_sprite.java b/src/templates/org/lwjgl/opengl/ARB_point_sprite.java index 880a5395..a2fa5083 100644 --- a/src/templates/org/lwjgl/opengl/ARB_point_sprite.java +++ b/src/templates/org/lwjgl/opengl/ARB_point_sprite.java @@ -31,8 +31,6 @@ */ package org.lwjgl.opengl; -import org.lwjgl.generator.*; - public interface ARB_point_sprite { /* * Accepted by the parameter of Enable, Disable, and IsEnabled, by @@ -40,12 +38,12 @@ public interface ARB_point_sprite { * GetDoublev, and by the parameter of TexEnvi, TexEnviv, * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv: */ - public static final int GL_POINT_SPRITE_ARB = 0x8861; + int GL_POINT_SPRITE_ARB = 0x8861; /* * When the parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv, * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE_ARB, then the value of * may be: */ - public static final int GL_COORD_REPLACE_ARB = 0x8862; + int GL_COORD_REPLACE_ARB = 0x8862; } diff --git a/src/templates/org/lwjgl/opengl/ARB_program.java b/src/templates/org/lwjgl/opengl/ARB_program.java index c4c27afe..a3385d7c 100644 --- a/src/templates/org/lwjgl/opengl/ARB_program.java +++ b/src/templates/org/lwjgl/opengl/ARB_program.java @@ -32,13 +32,9 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.BufferUnderflowException; -import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import org.lwjgl.BufferChecks; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; @Extension(postfix="ARB", isFinal=false) @@ -46,118 +42,118 @@ public interface ARB_program { /* * Accepted by the parameter of ProgramStringARB: */ - public static final int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875; + int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875; /* * Accepted by the parameter of GetProgramivARB: */ - public static final int GL_PROGRAM_LENGTH_ARB = 0x8627; - public static final int GL_PROGRAM_FORMAT_ARB = 0x8876; - public static final int GL_PROGRAM_BINDING_ARB = 0x8677; - public static final int GL_PROGRAM_INSTRUCTIONS_ARB = 0x88A0; - public static final int GL_MAX_PROGRAM_INSTRUCTIONS_ARB = 0x88A1; - public static final int GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A2; - public static final int GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A3; - public static final int GL_PROGRAM_TEMPORARIES_ARB = 0x88A4; - public static final int GL_MAX_PROGRAM_TEMPORARIES_ARB = 0x88A5; - public static final int GL_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A6; - public static final int GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A7; - public static final int GL_PROGRAM_PARAMETERS_ARB = 0x88A8; - public static final int GL_MAX_PROGRAM_PARAMETERS_ARB = 0x88A9; - public static final int GL_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AA; - public static final int GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AB; - public static final int GL_PROGRAM_ATTRIBS_ARB = 0x88AC; - public static final int GL_MAX_PROGRAM_ATTRIBS_ARB = 0x88AD; - public static final int GL_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AE; - public static final int GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AF; - public static final int GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88B4; - public static final int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5; - public static final int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6; + int GL_PROGRAM_LENGTH_ARB = 0x8627; + int GL_PROGRAM_FORMAT_ARB = 0x8876; + int GL_PROGRAM_BINDING_ARB = 0x8677; + int GL_PROGRAM_INSTRUCTIONS_ARB = 0x88A0; + int GL_MAX_PROGRAM_INSTRUCTIONS_ARB = 0x88A1; + int GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A2; + int GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB = 0x88A3; + int GL_PROGRAM_TEMPORARIES_ARB = 0x88A4; + int GL_MAX_PROGRAM_TEMPORARIES_ARB = 0x88A5; + int GL_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A6; + int GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB = 0x88A7; + int GL_PROGRAM_PARAMETERS_ARB = 0x88A8; + int GL_MAX_PROGRAM_PARAMETERS_ARB = 0x88A9; + int GL_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AA; + int GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB = 0x88AB; + int GL_PROGRAM_ATTRIBS_ARB = 0x88AC; + int GL_MAX_PROGRAM_ATTRIBS_ARB = 0x88AD; + int GL_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AE; + int GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB = 0x88AF; + int GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88B4; + int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5; + int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6; /* * Accepted by the parameter of GetProgramStringARB: */ - public static final int GL_PROGRAM_STRING_ARB = 0x8628; + int GL_PROGRAM_STRING_ARB = 0x8628; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B; - public static final int GL_CURRENT_MATRIX_ARB = 0x8641; - public static final int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7; - public static final int GL_CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640; - public static final int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F; - public static final int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E; + int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B; + int GL_CURRENT_MATRIX_ARB = 0x8641; + int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7; + int GL_CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640; + int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F; + int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E; /* * Accepted by the parameter of GetString: */ - public static final int GL_PROGRAM_ERROR_STRING_ARB = 0x8874; + int GL_PROGRAM_ERROR_STRING_ARB = 0x8874; /* * Accepted by the parameter of MatrixMode: */ - public static final int GL_MATRIX0_ARB = 0x88C0; - public static final int GL_MATRIX1_ARB = 0x88C1; - public static final int GL_MATRIX2_ARB = 0x88C2; - public static final int GL_MATRIX3_ARB = 0x88C3; - public static final int GL_MATRIX4_ARB = 0x88C4; - public static final int GL_MATRIX5_ARB = 0x88C5; - public static final int GL_MATRIX6_ARB = 0x88C6; - public static final int GL_MATRIX7_ARB = 0x88C7; - public static final int GL_MATRIX8_ARB = 0x88C8; - public static final int GL_MATRIX9_ARB = 0x88C9; - public static final int GL_MATRIX10_ARB = 0x88CA; - public static final int GL_MATRIX11_ARB = 0x88CB; - public static final int GL_MATRIX12_ARB = 0x88CC; - public static final int GL_MATRIX13_ARB = 0x88CD; - public static final int GL_MATRIX14_ARB = 0x88CE; - public static final int GL_MATRIX15_ARB = 0x88CF; - public static final int GL_MATRIX16_ARB = 0x88D0; - public static final int GL_MATRIX17_ARB = 0x88D1; - public static final int GL_MATRIX18_ARB = 0x88D2; - public static final int GL_MATRIX19_ARB = 0x88D3; - public static final int GL_MATRIX20_ARB = 0x88D4; - public static final int GL_MATRIX21_ARB = 0x88D5; - public static final int GL_MATRIX22_ARB = 0x88D6; - public static final int GL_MATRIX23_ARB = 0x88D7; - public static final int GL_MATRIX24_ARB = 0x88D8; - public static final int GL_MATRIX25_ARB = 0x88D9; - public static final int GL_MATRIX26_ARB = 0x88DA; - public static final int GL_MATRIX27_ARB = 0x88DB; - public static final int GL_MATRIX28_ARB = 0x88DC; - public static final int GL_MATRIX29_ARB = 0x88DD; - public static final int GL_MATRIX30_ARB = 0x88DE; - public static final int GL_MATRIX31_ARB = 0x88DF; + int GL_MATRIX0_ARB = 0x88C0; + int GL_MATRIX1_ARB = 0x88C1; + int GL_MATRIX2_ARB = 0x88C2; + int GL_MATRIX3_ARB = 0x88C3; + int GL_MATRIX4_ARB = 0x88C4; + int GL_MATRIX5_ARB = 0x88C5; + int GL_MATRIX6_ARB = 0x88C6; + int GL_MATRIX7_ARB = 0x88C7; + int GL_MATRIX8_ARB = 0x88C8; + int GL_MATRIX9_ARB = 0x88C9; + int GL_MATRIX10_ARB = 0x88CA; + int GL_MATRIX11_ARB = 0x88CB; + int GL_MATRIX12_ARB = 0x88CC; + int GL_MATRIX13_ARB = 0x88CD; + int GL_MATRIX14_ARB = 0x88CE; + int GL_MATRIX15_ARB = 0x88CF; + int GL_MATRIX16_ARB = 0x88D0; + int GL_MATRIX17_ARB = 0x88D1; + int GL_MATRIX18_ARB = 0x88D2; + int GL_MATRIX19_ARB = 0x88D3; + int GL_MATRIX20_ARB = 0x88D4; + int GL_MATRIX21_ARB = 0x88D5; + int GL_MATRIX22_ARB = 0x88D6; + int GL_MATRIX23_ARB = 0x88D7; + int GL_MATRIX24_ARB = 0x88D8; + int GL_MATRIX25_ARB = 0x88D9; + int GL_MATRIX26_ARB = 0x88DA; + int GL_MATRIX27_ARB = 0x88DB; + int GL_MATRIX28_ARB = 0x88DC; + int GL_MATRIX29_ARB = 0x88DD; + int GL_MATRIX30_ARB = 0x88DE; + int GL_MATRIX31_ARB = 0x88DF; - public void glProgramStringARB(@GLenum int target, @GLenum int format, @AutoSize("string") @GLsizei int length, @Const @GLbyte Buffer string); + void glProgramStringARB(@GLenum int target, @GLenum int format, @AutoSize("string") @GLsizei int length, @Const @GLbyte Buffer string); - public void glBindProgramARB(@GLenum int target, @GLuint int program); + void glBindProgramARB(@GLenum int target, @GLuint int program); - public void glDeleteProgramsARB(@AutoSize("programs") @GLsizei int n, @Const @GLuint IntBuffer programs); - public void glGenProgramsARB(@AutoSize("programs") @GLsizei int n, @GLuint IntBuffer programs); + void glDeleteProgramsARB(@AutoSize("programs") @GLsizei int n, @Const @GLuint IntBuffer programs); + void glGenProgramsARB(@AutoSize("programs") @GLsizei int n, @GLuint IntBuffer programs); - public void glProgramEnvParameter4fARB(int target, int index, float x, float y, float z, float w); + void glProgramEnvParameter4fARB(int target, int index, float x, float y, float z, float w); @StripPostfix("params") - public void glProgramEnvParameter4fvARB(@GLenum int target, @GLuint int index, @Check("4") @Const FloatBuffer params); + void glProgramEnvParameter4fvARB(@GLenum int target, @GLuint int index, @Check("4") @Const FloatBuffer params); - public void glProgramLocalParameter4fARB(@GLenum int target, @GLuint int index, float x, float y, float z, float w); + void glProgramLocalParameter4fARB(@GLenum int target, @GLuint int index, float x, float y, float z, float w); @StripPostfix("params") - public void glProgramLocalParameter4fvARB(@GLenum int target, @GLuint int index, @Check("4") @Const FloatBuffer params); + void glProgramLocalParameter4fvARB(@GLenum int target, @GLuint int index, @Check("4") @Const FloatBuffer params); @StripPostfix("params") - public void glGetProgramEnvParameterfvARB(@GLenum int target, @GLuint int index, @Check("4") FloatBuffer params); + void glGetProgramEnvParameterfvARB(@GLenum int target, @GLuint int index, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetProgramLocalParameterfvARB(@GLenum int target, @GLuint int index, @Check("4") FloatBuffer params); + void glGetProgramLocalParameterfvARB(@GLenum int target, @GLuint int index, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetProgramivARB(@GLenum int target, @GLenum int parameterName, @Check("4") IntBuffer params); + void glGetProgramivARB(@GLenum int target, @GLenum int parameterName, @Check("4") IntBuffer params); - public void glGetProgramStringARB(@GLenum int target, @GLenum int parameterName, @Check @GLbyte Buffer paramString); + void glGetProgramStringARB(@GLenum int target, @GLenum int parameterName, @Check @GLbyte Buffer paramString); - public boolean glIsProgramARB(@GLuint int program); + boolean glIsProgramARB(@GLuint int program); } diff --git a/src/templates/org/lwjgl/opengl/ARB_shader_objects.java b/src/templates/org/lwjgl/opengl/ARB_shader_objects.java index 0d537ce4..83653cf0 100644 --- a/src/templates/org/lwjgl/opengl/ARB_shader_objects.java +++ b/src/templates/org/lwjgl/opengl/ARB_shader_objects.java @@ -31,74 +31,72 @@ */ package org.lwjgl.opengl; -import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_shader_objects { /* * Accepted by the argument of GetHandleARB: */ - public static final int GL_PROGRAM_OBJECT_ARB = 0x8B40; + int GL_PROGRAM_OBJECT_ARB = 0x8B40; /* * Accepted by the parameter of GetObjectParameter{fi}vARB: */ - public static final int GL_OBJECT_TYPE_ARB = 0x8B4E; - public static final int GL_OBJECT_SUBTYPE_ARB = 0x8B4F; - public static final int GL_OBJECT_DELETE_STATUS_ARB = 0x8B80; - public static final int GL_OBJECT_COMPILE_STATUS_ARB = 0x8B81; - public static final int GL_OBJECT_LINK_STATUS_ARB = 0x8B82; - public static final int GL_OBJECT_VALIDATE_STATUS_ARB = 0x8B83; - public static final int GL_OBJECT_INFO_LOG_LENGTH_ARB = 0x8B84; - public static final int GL_OBJECT_ATTACHED_OBJECTS_ARB = 0x8B85; - public static final int GL_OBJECT_ACTIVE_UNIFORMS_ARB = 0x8B86; - public static final int GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB = 0x8B87; - public static final int GL_OBJECT_SHADER_SOURCE_LENGTH_ARB = 0x8B88; + int GL_OBJECT_TYPE_ARB = 0x8B4E; + int GL_OBJECT_SUBTYPE_ARB = 0x8B4F; + int GL_OBJECT_DELETE_STATUS_ARB = 0x8B80; + int GL_OBJECT_COMPILE_STATUS_ARB = 0x8B81; + int GL_OBJECT_LINK_STATUS_ARB = 0x8B82; + int GL_OBJECT_VALIDATE_STATUS_ARB = 0x8B83; + int GL_OBJECT_INFO_LOG_LENGTH_ARB = 0x8B84; + int GL_OBJECT_ATTACHED_OBJECTS_ARB = 0x8B85; + int GL_OBJECT_ACTIVE_UNIFORMS_ARB = 0x8B86; + int GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB = 0x8B87; + int GL_OBJECT_SHADER_SOURCE_LENGTH_ARB = 0x8B88; /* * Returned by the parameter of GetObjectParameter{fi}vARB: */ - public static final int GL_SHADER_OBJECT_ARB = 0x8B48; + int GL_SHADER_OBJECT_ARB = 0x8B48; /* * Returned by the parameter of GetActiveUniformARB: */ - public static final int GL_FLOAT = 0x1406; - public static final int GL_FLOAT_VEC2_ARB = 0x8B50; - public static final int GL_FLOAT_VEC3_ARB = 0x8B51; - public static final int GL_FLOAT_VEC4_ARB = 0x8B52; - public static final int GL_INT = 0x1404; - public static final int GL_INT_VEC2_ARB = 0x8B53; - public static final int GL_INT_VEC3_ARB = 0x8B54; - public static final int GL_INT_VEC4_ARB = 0x8B55; - public static final int GL_BOOL_ARB = 0x8B56; - public static final int GL_BOOL_VEC2_ARB = 0x8B57; - public static final int GL_BOOL_VEC3_ARB = 0x8B58; - public static final int GL_BOOL_VEC4_ARB = 0x8B59; - public static final int GL_FLOAT_MAT2_ARB = 0x8B5A; - public static final int GL_FLOAT_MAT3_ARB = 0x8B5B; - public static final int GL_FLOAT_MAT4_ARB = 0x8B5C; - public static final int GL_SAMPLER_1D_ARB = 0x8B5D; - public static final int GL_SAMPLER_2D_ARB = 0x8B5E; - public static final int GL_SAMPLER_3D_ARB = 0x8B5F; - public static final int GL_SAMPLER_CUBE_ARB = 0x8B60; - public static final int GL_SAMPLER_1D_SHADOW_ARB = 0x8B61; - public static final int GL_SAMPLER_2D_SHADOW_ARB = 0x8B62; - public static final int GL_SAMPLER_2D_RECT_ARB = 0x8B63; - public static final int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64; + int GL_FLOAT = 0x1406; + int GL_FLOAT_VEC2_ARB = 0x8B50; + int GL_FLOAT_VEC3_ARB = 0x8B51; + int GL_FLOAT_VEC4_ARB = 0x8B52; + int GL_INT = 0x1404; + int GL_INT_VEC2_ARB = 0x8B53; + int GL_INT_VEC3_ARB = 0x8B54; + int GL_INT_VEC4_ARB = 0x8B55; + int GL_BOOL_ARB = 0x8B56; + int GL_BOOL_VEC2_ARB = 0x8B57; + int GL_BOOL_VEC3_ARB = 0x8B58; + int GL_BOOL_VEC4_ARB = 0x8B59; + int GL_FLOAT_MAT2_ARB = 0x8B5A; + int GL_FLOAT_MAT3_ARB = 0x8B5B; + int GL_FLOAT_MAT4_ARB = 0x8B5C; + int GL_SAMPLER_1D_ARB = 0x8B5D; + int GL_SAMPLER_2D_ARB = 0x8B5E; + int GL_SAMPLER_3D_ARB = 0x8B5F; + int GL_SAMPLER_CUBE_ARB = 0x8B60; + int GL_SAMPLER_1D_SHADOW_ARB = 0x8B61; + int GL_SAMPLER_2D_SHADOW_ARB = 0x8B62; + int GL_SAMPLER_2D_RECT_ARB = 0x8B63; + int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64; - public void glDeleteObjectARB(@GLhandleARB int obj); + void glDeleteObjectARB(@GLhandleARB int obj); - public @GLhandleARB int glGetHandleARB(@GLenum int pname); + @GLhandleARB int glGetHandleARB(@GLenum int pname); - public void glDetachObjectARB(@GLhandleARB int containerObj, @GLhandleARB int attachedObj); + void glDetachObjectARB(@GLhandleARB int containerObj, @GLhandleARB int attachedObj); - public @GLhandleARB int glCreateShaderObjectARB(@GLenum int shaderType); + @GLhandleARB int glCreateShaderObjectARB(@GLenum int shaderType); /** * The ARB_shader_objects extension allows multiple, optionally null-terminated, source strings to define a shader program. @@ -108,7 +106,7 @@ public interface ARB_shader_objects { * @param shaderObj * @param string */ - public void glShaderSourceARB(@GLhandleARB int shader, @Constant("1") @GLsizei int count, + void glShaderSourceARB(@GLhandleARB int shader, @Constant("1") @GLsizei int count, @Indirect @Check @Const @@ -120,71 +118,71 @@ public interface ARB_shader_objects { @GLint int length); - public void glCompileShaderARB(@GLhandleARB int shaderObj); + void glCompileShaderARB(@GLhandleARB int shaderObj); - public @GLhandleARB int glCreateProgramObjectARB(); + @GLhandleARB int glCreateProgramObjectARB(); - public void glAttachObjectARB(@GLhandleARB int containerObj, @GLhandleARB int obj); + void glAttachObjectARB(@GLhandleARB int containerObj, @GLhandleARB int obj); - public void glLinkProgramARB(@GLhandleARB int programObj); + void glLinkProgramARB(@GLhandleARB int programObj); - public void glUseProgramObjectARB(@GLhandleARB int programObj); + void glUseProgramObjectARB(@GLhandleARB int programObj); - public void glValidateProgramARB(@GLhandleARB int programObj); + void glValidateProgramARB(@GLhandleARB int programObj); - public void glUniform1fARB(int location, float v0); + void glUniform1fARB(int location, float v0); - public void glUniform2fARB(int location, float v0, float v1); + void glUniform2fARB(int location, float v0, float v1); - public void glUniform3fARB(int location, float v0, float v1, float v2); + void glUniform3fARB(int location, float v0, float v1, float v2); - public void glUniform4fARB(int location, float v0, float v1, float v2, float v3); + void glUniform4fARB(int location, float v0, float v1, float v2, float v3); - public void glUniform1iARB(int location, int v0); + void glUniform1iARB(int location, int v0); - public void glUniform2iARB(int location, int v0, int v1); + void glUniform2iARB(int location, int v0, int v1); - public void glUniform3iARB(int location, int v0, int v1, int v2); + void glUniform3iARB(int location, int v0, int v1, int v2); - public void glUniform4iARB(int location, int v0, int v1, int v2, int v3); + void glUniform4iARB(int location, int v0, int v1, int v2, int v3); @StripPostfix("values") - public void glUniform1fvARB(int location, @AutoSize("values") @GLsizei int count, FloatBuffer values); + void glUniform1fvARB(int location, @AutoSize("values") @GLsizei int count, FloatBuffer values); @StripPostfix("values") - public void glUniform2fvARB(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, FloatBuffer values); + void glUniform2fvARB(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, FloatBuffer values); @StripPostfix("values") - public void glUniform3fvARB(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, FloatBuffer values); + void glUniform3fvARB(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, FloatBuffer values); @StripPostfix("values") - public void glUniform4fvARB(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, FloatBuffer values); + void glUniform4fvARB(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, FloatBuffer values); @StripPostfix("values") - public void glUniform1ivARB(int location, @AutoSize(value="values") @GLsizei int count, IntBuffer values); + void glUniform1ivARB(int location, @AutoSize(value="values") @GLsizei int count, IntBuffer values); @StripPostfix("values") - public void glUniform2ivARB(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, IntBuffer values); + void glUniform2ivARB(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, IntBuffer values); @StripPostfix("values") - public void glUniform3ivARB(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, IntBuffer values); + void glUniform3ivARB(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, IntBuffer values); @StripPostfix("values") - public void glUniform4ivARB(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, IntBuffer values); + void glUniform4ivARB(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, IntBuffer values); @StripPostfix("matrices") - public void glUniformMatrix2fvARB(int location, @AutoSize(value="matrices", expression=" >> 2") @GLsizei int count, boolean transpose, FloatBuffer matrices); + void glUniformMatrix2fvARB(int location, @AutoSize(value="matrices", expression=" >> 2") @GLsizei int count, boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") - public void glUniformMatrix3fvARB(int location, @AutoSize(value="matrices", expression=" / (3 * 3)") @GLsizei int count, boolean transpose, FloatBuffer matrices); + void glUniformMatrix3fvARB(int location, @AutoSize(value="matrices", expression=" / (3 * 3)") @GLsizei int count, boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") - public void glUniformMatrix4fvARB(int location, @AutoSize(value="matrices", expression=" >> 4") @GLsizei int count, boolean transpose, FloatBuffer matrices); + void glUniformMatrix4fvARB(int location, @AutoSize(value="matrices", expression=" >> 4") @GLsizei int count, boolean transpose, FloatBuffer matrices); @StripPostfix("params") - public void glGetObjectParameterfvARB(@GLhandleARB int obj, @GLenum int pname, @Check FloatBuffer params); + void glGetObjectParameterfvARB(@GLhandleARB int obj, @GLenum int pname, @Check FloatBuffer params); @StripPostfix("params") - public void glGetObjectParameterivARB(@GLhandleARB int obj, @GLenum int pname, @Check IntBuffer params); + void glGetObjectParameterivARB(@GLhandleARB int obj, @GLenum int pname, @Check IntBuffer params); - public void glGetInfoLogARB(@GLhandleARB int obj, @AutoSize("infoLog") @GLsizei int maxLength, - @Check(value="1", canBeNull=true) - @GLsizei IntBuffer length, - @GLcharARB - ByteBuffer infoLog); + void glGetInfoLogARB(@GLhandleARB int obj, @AutoSize("infoLog") @GLsizei int maxLength, + @Check(value="1", canBeNull=true) + @GLsizei IntBuffer length, + @GLcharARB + ByteBuffer infoLog); - public void glGetAttachedObjectsARB(@GLhandleARB int containerObj, @AutoSize("obj") @GLsizei int maxCount, + void glGetAttachedObjectsARB(@GLhandleARB int containerObj, @AutoSize("obj") @GLsizei int maxCount, @Check(value="1", canBeNull=true) @GLsizei IntBuffer count, @@ -199,9 +197,9 @@ public interface ARB_shader_objects { * * @return */ - public int glGetUniformLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name); + int glGetUniformLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name); - public void glGetActiveUniformARB(@GLhandleARB int programObj, @GLuint int index, @AutoSize("name") @GLsizei int maxLength, + void glGetActiveUniformARB(@GLhandleARB int programObj, @GLuint int index, @AutoSize("name") @GLsizei int maxLength, @Check(value="1", canBeNull=true) @GLsizei IntBuffer length, @@ -214,11 +212,11 @@ public interface ARB_shader_objects { ByteBuffer name); @StripPostfix("params") - public void glGetUniformfvARB(@GLhandleARB int programObj, int location, @Check FloatBuffer params); + void glGetUniformfvARB(@GLhandleARB int programObj, int location, @Check FloatBuffer params); @StripPostfix("params") - public void glGetUniformivARB(@GLhandleARB int programObj, int location, @Check IntBuffer params); + void glGetUniformivARB(@GLhandleARB int programObj, int location, @Check IntBuffer params); - public void glGetShaderSourceARB(@GLhandleARB int obj, @AutoSize("source") @GLsizei int maxLength, + void glGetShaderSourceARB(@GLhandleARB int obj, @AutoSize("source") @GLsizei int maxLength, @Check(value="1", canBeNull=true) @GLsizei IntBuffer length, diff --git a/src/templates/org/lwjgl/opengl/ARB_shading_language_100.java b/src/templates/org/lwjgl/opengl/ARB_shading_language_100.java index 868d8d8f..ff1490b6 100644 --- a/src/templates/org/lwjgl/opengl/ARB_shading_language_100.java +++ b/src/templates/org/lwjgl/opengl/ARB_shading_language_100.java @@ -35,5 +35,5 @@ public interface ARB_shading_language_100 { /** * Accepted by the parameter of GetString: */ - public static final int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C; + int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C; } diff --git a/src/templates/org/lwjgl/opengl/ARB_shadow.java b/src/templates/org/lwjgl/opengl/ARB_shadow.java index 8a98e72b..9cb8191f 100644 --- a/src/templates/org/lwjgl/opengl/ARB_shadow.java +++ b/src/templates/org/lwjgl/opengl/ARB_shadow.java @@ -32,7 +32,7 @@ package org.lwjgl.opengl; public interface ARB_shadow { - 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; + int GL_TEXTURE_COMPARE_MODE_ARB = 0x884C; + int GL_TEXTURE_COMPARE_FUNC_ARB = 0x884D; + int GL_COMPARE_R_TO_TEXTURE_ARB = 0x884E; } diff --git a/src/templates/org/lwjgl/opengl/ARB_shadow_ambient.java b/src/templates/org/lwjgl/opengl/ARB_shadow_ambient.java index 85a467f6..f1d8fd89 100644 --- a/src/templates/org/lwjgl/opengl/ARB_shadow_ambient.java +++ b/src/templates/org/lwjgl/opengl/ARB_shadow_ambient.java @@ -32,5 +32,5 @@ package org.lwjgl.opengl; public interface ARB_shadow_ambient { - public static final int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF; + int GL_TEXTURE_COMPARE_FAIL_VALUE_ARB = 0x80BF; } diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_border_clamp.java b/src/templates/org/lwjgl/opengl/ARB_texture_border_clamp.java index 93a389aa..ba524cdf 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_border_clamp.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_border_clamp.java @@ -32,5 +32,5 @@ package org.lwjgl.opengl; public interface ARB_texture_border_clamp { - public static final int GL_CLAMP_TO_BORDER_ARB = 0x812D; + int GL_CLAMP_TO_BORDER_ARB = 0x812D; } diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_compression.java b/src/templates/org/lwjgl/opengl/ARB_texture_compression.java index bbe176b2..e2f116cd 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_compression.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_compression.java @@ -32,94 +32,88 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.ShortBuffer; -import org.lwjgl.LWJGLException; -import org.lwjgl.BufferChecks; import org.lwjgl.generator.*; public interface ARB_texture_compression { - 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; + int GL_COMPRESSED_ALPHA_ARB = 0x84E9; + int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA; + int GL_COMPRESSED_LUMINANCE_ALPHA_ARB = 0x84EB; + int GL_COMPRESSED_INTENSITY_ARB = 0x84EC; + int GL_COMPRESSED_RGB_ARB = 0x84ED; + int GL_COMPRESSED_RGBA_ARB = 0x84EE; + int GL_TEXTURE_COMPRESSION_HINT_ARB = 0x84EF; + int GL_TEXTURE_IMAGE_SIZE_ARB = 0x86A0; + int GL_TEXTURE_COMPRESSED_ARB = 0x86A1; + int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2; + int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3; - public void glCompressedTexImage1DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - Buffer pData); + void glCompressedTexImage1DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize, + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + Buffer pData); - public void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - Buffer pData); + void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize, + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + Buffer pData); - public void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - Buffer pData); + void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize, + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + Buffer pData); - public void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - Buffer pData); - - public void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - Buffer pData); - - public void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - Buffer pData); + void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize, + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + Buffer pData); - public void glGetCompressedTexImageARB(@GLenum int target, int lod, - @BufferObject(BufferKind.PackPBO) - @Check - @GLbyte - @GLshort - @GLint - @GLfloat - Buffer pImg); + void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize, + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + Buffer pData); + + void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize, + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + Buffer pData); + + void glGetCompressedTexImageARB(@GLenum int target, int lod, + @BufferObject(BufferKind.PackPBO) + @Check + @GLbyte + @GLshort + @GLint + @GLfloat + Buffer pImg); } diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_cube_map.java b/src/templates/org/lwjgl/opengl/ARB_texture_cube_map.java index 5fb7833a..0e06f3b3 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_cube_map.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_cube_map.java @@ -32,16 +32,16 @@ package org.lwjgl.opengl; public interface ARB_texture_cube_map { - 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; + int GL_NORMAL_MAP_ARB = 0x8511; + int GL_REFLECTION_MAP_ARB = 0x8512; + int GL_TEXTURE_CUBE_MAP_ARB = 0x8513; + int GL_TEXTURE_BINDING_CUBE_MAP_ARB = 0x8514; + int GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB = 0x8515; + int GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB = 0x8516; + int GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB = 0x8517; + int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB = 0x8518; + int GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB = 0x8519; + int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB = 0x851A; + int GL_PROXY_TEXTURE_CUBE_MAP_ARB = 0x851B; + int GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB = 0x851C; } diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java b/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java index 52e2e38e..c3327fcf 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_env_combine.java @@ -32,25 +32,25 @@ package org.lwjgl.opengl; public interface ARB_texture_env_combine { - 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; + int GL_COMBINE_ARB = 0x8570; + int GL_COMBINE_RGB_ARB = 0x8571; + int GL_COMBINE_ALPHA_ARB = 0x8572; + int GL_RGB_SCALE_ARB = 0x8573; + int GL_ADD_SIGNED_ARB = 0x8574; + int GL_INTERPOLATE_ARB = 0x8575; + int GL_CONSTANT_ARB = 0x8576; + int GL_PRIMARY_COLOR_ARB = 0x8577; + int GL_PREVIOUS_ARB = 0x8578; + int GL_SOURCE0_RGB_ARB = 0x8580; + int GL_SOURCE1_RGB_ARB = 0x8581; + int GL_SOURCE2_RGB_ARB = 0x8582; + int GL_SOURCE0_ALPHA_ARB = 0x8588; + int GL_SOURCE1_ALPHA_ARB = 0x8589; + int GL_SOURCE2_ALPHA_ARB = 0x858A; + int GL_OPERAND0_RGB_ARB = 0x8590; + int GL_OPERAND1_RGB_ARB = 0x8591; + int GL_OPERAND2_RGB_ARB = 0x8592; + int GL_OPERAND0_ALPHA_ARB = 0x8598; + int GL_OPERAND1_ALPHA_ARB = 0x8599; + int GL_OPERAND2_ALPHA_ARB = 0x859A; } diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_env_dot3.java b/src/templates/org/lwjgl/opengl/ARB_texture_env_dot3.java index f981e306..363d5eaf 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_env_dot3.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_env_dot3.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface ARB_texture_env_dot3 { - public static final int GL_DOT3_RGB_ARB = 0x86AE; - public static final int GL_DOT3_RGBA_ARB = 0x86AF; + int GL_DOT3_RGB_ARB = 0x86AE; + int GL_DOT3_RGBA_ARB = 0x86AF; } diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_float.java b/src/templates/org/lwjgl/opengl/ARB_texture_float.java index 3a3e0853..a1c352ed 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_float.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_float.java @@ -35,33 +35,33 @@ public interface ARB_texture_float { /* * Accepted by the parameter of GetTexLevelParameter: */ - public static final int TEXTURE_RED_TYPE_ARB = 0x8C10; - public static final int TEXTURE_GREEN_TYPE_ARB = 0x8C11; - public static final int TEXTURE_BLUE_TYPE_ARB = 0x8C12; - public static final int TEXTURE_ALPHA_TYPE_ARB = 0x8C13; - public static final int TEXTURE_LUMINANCE_TYPE_ARB = 0x8C14; - public static final int TEXTURE_INTENSITY_TYPE_ARB = 0x8C15; - public static final int TEXTURE_DEPTH_TYPE_ARB = 0x8C16; + int TEXTURE_RED_TYPE_ARB = 0x8C10; + int TEXTURE_GREEN_TYPE_ARB = 0x8C11; + int TEXTURE_BLUE_TYPE_ARB = 0x8C12; + int TEXTURE_ALPHA_TYPE_ARB = 0x8C13; + int TEXTURE_LUMINANCE_TYPE_ARB = 0x8C14; + int TEXTURE_INTENSITY_TYPE_ARB = 0x8C15; + int TEXTURE_DEPTH_TYPE_ARB = 0x8C16; /* * Returned by the parameter of GetTexLevelParameter: */ - public static final int UNSIGNED_NORMALIZED_ARB = 0x8C17; + int UNSIGNED_NORMALIZED_ARB = 0x8C17; /* * Accepted by the parameter of TexImage1D, * TexImage2D, and TexImage3D: */ - public static final int RGBA32F_ARB = 0x8814; - public static final int RGB32F_ARB = 0x8815; - public static final int ALPHA32F_ARB = 0x8816; - public static final int INTENSITY32F_ARB = 0x8817; - public static final int LUMINANCE32F_ARB = 0x8818; - public static final int LUMINANCE_ALPHA32F_ARB = 0x8819; - public static final int RGBA16F_ARB = 0x881A; - public static final int RGB16F_ARB = 0x881B; - public static final int ALPHA16F_ARB = 0x881C; - public static final int INTENSITY16F_ARB = 0x881D; - public static final int LUMINANCE16F_ARB = 0x881E; - public static final int LUMINANCE_ALPHA16F_ARB = 0x881F; + int RGBA32F_ARB = 0x8814; + int RGB32F_ARB = 0x8815; + int ALPHA32F_ARB = 0x8816; + int INTENSITY32F_ARB = 0x8817; + int LUMINANCE32F_ARB = 0x8818; + int LUMINANCE_ALPHA32F_ARB = 0x8819; + int RGBA16F_ARB = 0x881A; + int RGB16F_ARB = 0x881B; + int ALPHA16F_ARB = 0x881C; + int INTENSITY16F_ARB = 0x881D; + int LUMINANCE16F_ARB = 0x881E; + int LUMINANCE_ALPHA16F_ARB = 0x881F; } diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_mirrored_repeat.java b/src/templates/org/lwjgl/opengl/ARB_texture_mirrored_repeat.java index 21049c70..2c0431b0 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_mirrored_repeat.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_mirrored_repeat.java @@ -32,5 +32,5 @@ package org.lwjgl.opengl; public interface ARB_texture_mirrored_repeat { - public static final int GL_MIRRORED_REPEAT_ARB = 0x8370; + int GL_MIRRORED_REPEAT_ARB = 0x8370; } diff --git a/src/templates/org/lwjgl/opengl/ARB_texture_rectangle.java b/src/templates/org/lwjgl/opengl/ARB_texture_rectangle.java index b75da7bd..be7814c0 100644 --- a/src/templates/org/lwjgl/opengl/ARB_texture_rectangle.java +++ b/src/templates/org/lwjgl/opengl/ARB_texture_rectangle.java @@ -43,23 +43,23 @@ public interface ARB_texture_rectangle { * GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D, * CopyTexImage2D, TexSubImage2D and CopySubTexImage2D: */ - public static final int GL_TEXTURE_RECTANGLE_ARB = 0x84F5; + int GL_TEXTURE_RECTANGLE_ARB = 0x84F5; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv and GetDoublev: */ - public static final int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6; + int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6; /* * Accepted by the parameter of GetTexLevelParameteriv, * GetTexLevelParameterfv, GetTexParameteriv and TexImage2D: */ - public static final int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7; + int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7; /* * Accepted by the parameter of GetBooleanv, GetDoublev, * GetIntegerv and GetFloatv: */ - public static final int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8; + int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8; } diff --git a/src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java b/src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java index 48c80e3f..d15887ac 100644 --- a/src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java +++ b/src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java @@ -33,17 +33,16 @@ package org.lwjgl.opengl; import java.nio.FloatBuffer; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_transpose_matrix { - 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; + int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3; + int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4; + int GL_TRANSPOSE_TEXTURE_MATRIX_ARB = 0x84E5; + int GL_TRANSPOSE_COLOR_MATRIX_ARB = 0x84E6; @StripPostfix("pfMtx") - public void glLoadTransposeMatrixfARB(@Check("16") FloatBuffer pfMtx); + void glLoadTransposeMatrixfARB(@Check("16") FloatBuffer pfMtx); @StripPostfix("pfMtx") - public void glMultTransposeMatrixfARB(@Check("16") FloatBuffer pfMtx); + void glMultTransposeMatrixfARB(@Check("16") FloatBuffer pfMtx); } diff --git a/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java b/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java index 539d1431..1246c86d 100644 --- a/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java +++ b/src/templates/org/lwjgl/opengl/ARB_vertex_blend.java @@ -37,70 +37,69 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_vertex_blend { - 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; + int GL_MAX_VERTEX_UNITS_ARB = 0x86A4; + int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5; + int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6; + int GL_VERTEX_BLEND_ARB = 0x86A7; + int GL_CURRENT_WEIGHT_ARB = 0x86A8; + int GL_WEIGHT_ARRAY_TYPE_ARB = 0x86A9; + int GL_WEIGHT_ARRAY_STRIDE_ARB = 0x86AA; + int GL_WEIGHT_ARRAY_SIZE_ARB = 0x86AB; + int GL_WEIGHT_ARRAY_POINTER_ARB = 0x86AC; + int GL_WEIGHT_ARRAY_ARB = 0x86AD; + int GL_MODELVIEW0_ARB = 0x1700; + int GL_MODELVIEW1_ARB = 0x850a; + int GL_MODELVIEW2_ARB = 0x8722; + int GL_MODELVIEW3_ARB = 0x8723; + int GL_MODELVIEW4_ARB = 0x8724; + int GL_MODELVIEW5_ARB = 0x8725; + int GL_MODELVIEW6_ARB = 0x8726; + int GL_MODELVIEW7_ARB = 0x8727; + int GL_MODELVIEW8_ARB = 0x8728; + int GL_MODELVIEW9_ARB = 0x8729; + int GL_MODELVIEW10_ARB = 0x872A; + int GL_MODELVIEW11_ARB = 0x872B; + int GL_MODELVIEW12_ARB = 0x872C; + int GL_MODELVIEW13_ARB = 0x872D; + int GL_MODELVIEW14_ARB = 0x872E; + int GL_MODELVIEW15_ARB = 0x872F; + int GL_MODELVIEW16_ARB = 0x8730; + int GL_MODELVIEW17_ARB = 0x8731; + int GL_MODELVIEW18_ARB = 0x8732; + int GL_MODELVIEW19_ARB = 0x8733; + int GL_MODELVIEW20_ARB = 0x8734; + int GL_MODELVIEW21_ARB = 0x8735; + int GL_MODELVIEW22_ARB = 0x8736; + int GL_MODELVIEW23_ARB = 0x8737; + int GL_MODELVIEW24_ARB = 0x8738; + int GL_MODELVIEW25_ARB = 0x8739; + int GL_MODELVIEW26_ARB = 0x873A; + int GL_MODELVIEW27_ARB = 0x873B; + int GL_MODELVIEW28_ARB = 0x873C; + int GL_MODELVIEW29_ARB = 0x873D; + int GL_MODELVIEW30_ARB = 0x873E; + int GL_MODELVIEW31_ARB = 0x873F; @StripPostfix("pWeights") - public void glWeightbvARB(@AutoSize("pWeights") int size, ByteBuffer pWeights); + void glWeightbvARB(@AutoSize("pWeights") int size, ByteBuffer pWeights); @StripPostfix("pWeights") - public void glWeightsvARB(@AutoSize("pWeights") int size, ShortBuffer pWeights); + void glWeightsvARB(@AutoSize("pWeights") int size, ShortBuffer pWeights); @StripPostfix("pWeights") - public void glWeightivARB(@AutoSize("pWeights") int size, IntBuffer pWeights); + void glWeightivARB(@AutoSize("pWeights") int size, IntBuffer pWeights); @StripPostfix("pWeights") - public void glWeightfvARB(@AutoSize("pWeights") int size, FloatBuffer pWeights); + void glWeightfvARB(@AutoSize("pWeights") int size, FloatBuffer pWeights); @StripPostfix("pWeights") - public void glWeightubvARB(@AutoSize("pWeights") int size, @GLubyte ByteBuffer pWeights); + void glWeightubvARB(@AutoSize("pWeights") int size, @GLubyte ByteBuffer pWeights); @StripPostfix("pWeights") - public void glWeightusvARB(@AutoSize("pWeights") int size, @GLushort ShortBuffer pWeights); + void glWeightusvARB(@AutoSize("pWeights") int size, @GLushort ShortBuffer pWeights); @StripPostfix("pWeights") - public void glWeightuivARB(@AutoSize("pWeights") int size, @GLuint IntBuffer pWeights); + void glWeightuivARB(@AutoSize("pWeights") int size, @GLuint IntBuffer pWeights); - public void glWeightPointerARB(int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, + void glWeightPointerARB(int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -113,5 +112,5 @@ public interface ARB_vertex_blend { @GLfloat Buffer pPointer); - public void glVertexBlendARB(int count); + void glVertexBlendARB(int count); } diff --git a/src/templates/org/lwjgl/opengl/ARB_vertex_buffer_object.java b/src/templates/org/lwjgl/opengl/ARB_vertex_buffer_object.java index f918ddc3..0413e03d 100644 --- a/src/templates/org/lwjgl/opengl/ARB_vertex_buffer_object.java +++ b/src/templates/org/lwjgl/opengl/ARB_vertex_buffer_object.java @@ -38,27 +38,27 @@ public interface ARB_vertex_buffer_object extends ARB_buffer_object { * GetBufferSubDataARB, GetBufferParameterivARB, and * GetBufferPointervARB: */ - public static final int GL_ARRAY_BUFFER_ARB = 0x8892; - public static final int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893; + int GL_ARRAY_BUFFER_ARB = 0x8892; + 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; + int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894; + int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895; + int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896; + int GL_NORMAL_ARRAY_BUFFER_BINDING_ARB = 0x8897; + int GL_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x8898; + int GL_INDEX_ARRAY_BUFFER_BINDING_ARB = 0x8899; + int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB = 0x889A; + int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB = 0x889B; + int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889C; + int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D; + 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; + int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F; } diff --git a/src/templates/org/lwjgl/opengl/ARB_vertex_program.java b/src/templates/org/lwjgl/opengl/ARB_vertex_program.java index ef476a32..af7e05b3 100644 --- a/src/templates/org/lwjgl/opengl/ARB_vertex_program.java +++ b/src/templates/org/lwjgl/opengl/ARB_vertex_program.java @@ -35,9 +35,7 @@ import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import java.nio.ShortBuffer; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_vertex_program extends ARB_program { @@ -49,65 +47,65 @@ public interface ARB_vertex_program extends ARB_program { * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB, * GetProgramivARB, and GetProgramStringARB. */ - public static final int GL_VERTEX_PROGRAM_ARB = 0x8620; + int GL_VERTEX_PROGRAM_ARB = 0x8620; /* * Accepted by the parameter of Disable, Enable, and IsEnabled, and by * the parameter of GetBooleanv, GetIntegerv, GetFloatv, and * GetDoublev: */ - public static final int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642; - public static final int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643; - public static final int GL_COLOR_SUM_ARB = 0x8458; + int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642; + int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643; + int GL_COLOR_SUM_ARB = 0x8458; /* * Accepted by the parameter of GetVertexAttrib[dfi]vARB: */ - public static final int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622; - public static final int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623; - public static final int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624; - public static final int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625; - public static final int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A; - public static final int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626; + int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622; + int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623; + int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624; + int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625; + int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A; + int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626; /* * Accepted by the parameter of GetVertexAttribPointervARB: */ - public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; + int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; /* * Accepted by the parameter of GetProgramivARB: */ - public static final int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0; - public static final int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1; - public static final int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2; - public static final int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3; + int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0; + int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1; + int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2; + int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869; + int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869; - public void glVertexAttrib1sARB(@GLuint int index, short x); + void glVertexAttrib1sARB(@GLuint int index, short x); - public void glVertexAttrib1fARB(@GLuint int index, float x); + void glVertexAttrib1fARB(@GLuint int index, float x); - public void glVertexAttrib2sARB(@GLuint int index, short x, short y); + void glVertexAttrib2sARB(@GLuint int index, short x, short y); - public void glVertexAttrib2fARB(@GLuint int index, float x, float y); + void glVertexAttrib2fARB(@GLuint int index, float x, float y); - public void glVertexAttrib3sARB(@GLuint int index, short x, short y, short z); + void glVertexAttrib3sARB(@GLuint int index, short x, short y, short z); - public void glVertexAttrib3fARB(@GLuint int index, float x, float y, float z); + void glVertexAttrib3fARB(@GLuint int index, float x, float y, float z); - public void glVertexAttrib4sARB(@GLuint int index, short x, short y, short z, short w); + void glVertexAttrib4sARB(@GLuint int index, short x, short y, short z, short w); - public void glVertexAttrib4fARB(@GLuint int index, float x, float y, float z, float w); + void glVertexAttrib4fARB(@GLuint int index, float x, float y, float z, float w); - public void glVertexAttrib4NubARB(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); + void glVertexAttrib4NubARB(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); - public void glVertexAttribPointerARB(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride, + void glVertexAttribPointerARB(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -120,15 +118,15 @@ public interface ARB_vertex_program extends ARB_program { @GLfloat Buffer buffer); - public void glEnableVertexAttribArrayARB(@GLuint int index); + void glEnableVertexAttribArrayARB(@GLuint int index); - public void glDisableVertexAttribArrayARB(@GLuint int index); + void glDisableVertexAttribArrayARB(@GLuint int index); @StripPostfix("params") - public void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @Check FloatBuffer params); + void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @Check FloatBuffer params); @StripPostfix("params") - public void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @Check IntBuffer params); + void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @Check IntBuffer params); @StripPostfix("result") - public void glGetVertexAttribPointervARB(@GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer result); + void glGetVertexAttribPointervARB(@GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer result); } diff --git a/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java b/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java index 744dae59..58f8ae84 100644 --- a/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java +++ b/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java @@ -34,7 +34,6 @@ package org.lwjgl.opengl; import java.nio.ByteBuffer; import java.nio.IntBuffer; -import org.lwjgl.LWJGLException; import org.lwjgl.generator.*; public interface ARB_vertex_shader { @@ -42,64 +41,64 @@ public interface ARB_vertex_shader { * Accepted by the argument of CreateShaderObjectARB and * returned by the parameter of GetObjectParameter{if}vARB: */ - public static final int GL_VERTEX_SHADER_ARB = 0x8B31; + int GL_VERTEX_SHADER_ARB = 0x8B31; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A; - public static final int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B; - public static final int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869; - public static final int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872; - public static final int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C; - public static final int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D; - public static final int GL_MAX_TEXTURE_COORDS_ARB = 0x8871; + int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A; + int GL_MAX_VARYING_FLOATS_ARB = 0x8B4B; + int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869; + int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872; + int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C; + int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D; + int GL_MAX_TEXTURE_COORDS_ARB = 0x8871; /* * Accepted by the parameter of Disable, Enable, and IsEnabled, and * by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and * GetDoublev: */ - public static final int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642; - public static final int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643; + int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642; + int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643; /* * Accepted by the parameter GetObjectParameter{if}vARB: */ - public static final int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89; - public static final int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A; + int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89; + int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A; /* * Accepted by the parameter of GetVertexAttrib{dfi}vARB: */ - public static final int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622; - public static final int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623; - public static final int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624; - public static final int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625; - public static final int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A; - public static final int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626; + int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622; + int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623; + int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624; + int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625; + int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A; + int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626; /* * Accepted by the parameter of GetVertexAttribPointervARB: */ - public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; + int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; /* * Returned by the parameter of GetActiveAttribARB: */ - public static final int GL_FLOAT = 0x1406; - public static final int GL_FLOAT_VEC2_ARB = 0x8B50; - public static final int GL_FLOAT_VEC3_ARB = 0x8B51; - public static final int GL_FLOAT_VEC4_ARB = 0x8B52; - public static final int GL_FLOAT_MAT2_ARB = 0x8B5A; - public static final int GL_FLOAT_MAT3_ARB = 0x8B5B; - public static final int GL_FLOAT_MAT4_ARB = 0x8B5C; + int GL_FLOAT = 0x1406; + int GL_FLOAT_VEC2_ARB = 0x8B50; + int GL_FLOAT_VEC3_ARB = 0x8B51; + int GL_FLOAT_VEC4_ARB = 0x8B52; + int GL_FLOAT_MAT2_ARB = 0x8B5A; + int GL_FLOAT_MAT3_ARB = 0x8B5B; + int GL_FLOAT_MAT4_ARB = 0x8B5C; - public void glBindAttribLocationARB(@GLhandleARB int programObj, @GLuint int index, @NullTerminated @Const @GLcharARB ByteBuffer name); + void glBindAttribLocationARB(@GLhandleARB int programObj, @GLuint int index, @NullTerminated @Const @GLcharARB ByteBuffer name); // --------------------------- - public void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, + void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, @AutoSize("name") @GLsizei int maxLength, @@ -114,5 +113,5 @@ public interface ARB_vertex_shader { @GLcharARB ByteBuffer name); - public int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name); + int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name); } diff --git a/src/templates/org/lwjgl/opengl/ARB_window_pos.java b/src/templates/org/lwjgl/opengl/ARB_window_pos.java index 7a6df852..76a96b0d 100644 --- a/src/templates/org/lwjgl/opengl/ARB_window_pos.java +++ b/src/templates/org/lwjgl/opengl/ARB_window_pos.java @@ -31,19 +31,17 @@ */ package org.lwjgl.opengl; -import org.lwjgl.LWJGLException; - public interface ARB_window_pos { - public void glWindowPos2fARB(float x, float y); + void glWindowPos2fARB(float x, float y); - public void glWindowPos2iARB(int x, int y); + void glWindowPos2iARB(int x, int y); - public void glWindowPos2sARB(short x, short y); + void glWindowPos2sARB(short x, short y); - public void glWindowPos3fARB(float x, float y, float z); + void glWindowPos3fARB(float x, float y, float z); - public void glWindowPos3iARB(int x, int y, int z); + void glWindowPos3iARB(int x, int y, int z); - public void glWindowPos3sARB(short x, short y, short z); + void glWindowPos3sARB(short x, short y, short z); } diff --git a/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java b/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java index cdb810ee..8f364803 100644 --- a/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java +++ b/src/templates/org/lwjgl/opengl/ATI_draw_buffers.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,23 +40,23 @@ public interface ATI_draw_buffers { * Accepted by the parameters of GetIntegerv, GetFloatv, * and GetDoublev: */ - public static final int GL_MAX_DRAW_BUFFERS_ATI = 0x8824; - public static final int GL_DRAW_BUFFER0_ATI = 0x8825; - public static final int GL_DRAW_BUFFER1_ATI = 0x8826; - public static final int GL_DRAW_BUFFER2_ATI = 0x8827; - public static final int GL_DRAW_BUFFER3_ATI = 0x8828; - public static final int GL_DRAW_BUFFER4_ATI = 0x8829; - public static final int GL_DRAW_BUFFER5_ATI = 0x882A; - public static final int GL_DRAW_BUFFER6_ATI = 0x882B; - public static final int GL_DRAW_BUFFER7_ATI = 0x882C; - public static final int GL_DRAW_BUFFER8_ATI = 0x882D; - public static final int GL_DRAW_BUFFER9_ATI = 0x882E; - public static final int GL_DRAW_BUFFER10_ATI = 0x882F; - public static final int GL_DRAW_BUFFER11_ATI = 0x8830; - public static final int GL_DRAW_BUFFER12_ATI = 0x8831; - public static final int GL_DRAW_BUFFER13_ATI = 0x8832; - public static final int GL_DRAW_BUFFER14_ATI = 0x8833; - public static final int GL_DRAW_BUFFER15_ATI = 0x8834; + int GL_MAX_DRAW_BUFFERS_ATI = 0x8824; + int GL_DRAW_BUFFER0_ATI = 0x8825; + int GL_DRAW_BUFFER1_ATI = 0x8826; + int GL_DRAW_BUFFER2_ATI = 0x8827; + int GL_DRAW_BUFFER3_ATI = 0x8828; + int GL_DRAW_BUFFER4_ATI = 0x8829; + int GL_DRAW_BUFFER5_ATI = 0x882A; + int GL_DRAW_BUFFER6_ATI = 0x882B; + int GL_DRAW_BUFFER7_ATI = 0x882C; + int GL_DRAW_BUFFER8_ATI = 0x882D; + int GL_DRAW_BUFFER9_ATI = 0x882E; + int GL_DRAW_BUFFER10_ATI = 0x882F; + int GL_DRAW_BUFFER11_ATI = 0x8830; + int GL_DRAW_BUFFER12_ATI = 0x8831; + int GL_DRAW_BUFFER13_ATI = 0x8832; + int GL_DRAW_BUFFER14_ATI = 0x8833; + int GL_DRAW_BUFFER15_ATI = 0x8834; - public void glDrawBuffersATI(@AutoSize("buffers") @GLsizei int size, @Const @GLenum IntBuffer buffers); + void glDrawBuffersATI(@AutoSize("buffers") @GLsizei int size, @Const @GLenum IntBuffer buffers); } diff --git a/src/templates/org/lwjgl/opengl/ATI_element_array.java b/src/templates/org/lwjgl/opengl/ATI_element_array.java index 92573beb..ef5be090 100644 --- a/src/templates/org/lwjgl/opengl/ATI_element_array.java +++ b/src/templates/org/lwjgl/opengl/ATI_element_array.java @@ -32,18 +32,15 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.IntBuffer; -import java.nio.ShortBuffer; import org.lwjgl.generator.*; public interface ATI_element_array { - 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; + int GL_ELEMENT_ARRAY_ATI = 0x8768; + int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769; + int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A; - public void glElementPointerATI(@AutoType("pPointer") @GLenum int type, + void glElementPointerATI(@AutoType("pPointer") @GLenum int type, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -52,7 +49,7 @@ public interface ATI_element_array { @GLuint Buffer pPointer); - public void glDrawElementArrayATI(@GLenum int mode, @GLsizei int count); + void glDrawElementArrayATI(@GLenum int mode, @GLsizei int count); - public void glDrawRangeElementArrayATI(@GLenum int mode, @GLuint int start, @GLuint int end, @GLsizei int count); + void glDrawRangeElementArrayATI(@GLenum int mode, @GLuint int start, @GLuint int end, @GLsizei int count); } diff --git a/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java b/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java index fb34c7ff..702a5dc0 100644 --- a/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java +++ b/src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java @@ -37,22 +37,22 @@ import java.nio.IntBuffer; import org.lwjgl.generator.*; public interface ATI_envmap_bumpmap { - 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; + int GL_BUMP_ROT_MATRIX_ATI = 0x8775; + int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776; + int GL_BUMP_NUM_TEX_UNITS_ATI = 0x8777; + int GL_BUMP_TEX_UNITS_ATI = 0x8778; + int GL_DUDV_ATI = 0x8779; + int GL_DU8DV8_ATI = 0x877A; + int GL_BUMP_ENVMAP_ATI = 0x877B; + int GL_BUMP_TARGET_ATI = 0x877C; @StripPostfix("param") - public void glTexBumpParameterfvATI(@GLenum int pname, @Check("4") FloatBuffer param); + void glTexBumpParameterfvATI(@GLenum int pname, @Check("4") FloatBuffer param); @StripPostfix("param") - public void glTexBumpParameterivATI(@GLenum int pname, @Check("4") IntBuffer param); + void glTexBumpParameterivATI(@GLenum int pname, @Check("4") IntBuffer param); @StripPostfix("param") - public void glGetTexBumpParameterfvATI(@GLenum int pname, @Check("4") FloatBuffer param); + void glGetTexBumpParameterfvATI(@GLenum int pname, @Check("4") FloatBuffer param); @StripPostfix("param") - public void glGetTexBumpParameterivATI(@GLenum int pname, @Check("4") IntBuffer param); + void glGetTexBumpParameterivATI(@GLenum int pname, @Check("4") IntBuffer param); } diff --git a/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java b/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java index b1037f9d..95ccf631 100644 --- a/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java +++ b/src/templates/org/lwjgl/opengl/ATI_fragment_shader.java @@ -41,137 +41,137 @@ import java.nio.FloatBuffer; import org.lwjgl.generator.*; public interface ATI_fragment_shader { - 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; + int GL_FRAGMENT_SHADER_ATI = 0x8920; + int GL_REG_0_ATI = 0x8921; + int GL_REG_1_ATI = 0x8922; + int GL_REG_2_ATI = 0x8923; + int GL_REG_3_ATI = 0x8924; + int GL_REG_4_ATI = 0x8925; + int GL_REG_5_ATI = 0x8926; + int GL_REG_6_ATI = 0x8927; + int GL_REG_7_ATI = 0x8928; + int GL_REG_8_ATI = 0x8929; + int GL_REG_9_ATI = 0x892A; + int GL_REG_10_ATI = 0x892B; + int GL_REG_11_ATI = 0x892C; + int GL_REG_12_ATI = 0x892D; + int GL_REG_13_ATI = 0x892E; + int GL_REG_14_ATI = 0x892F; + int GL_REG_15_ATI = 0x8930; + int GL_REG_16_ATI = 0x8931; + int GL_REG_17_ATI = 0x8932; + int GL_REG_18_ATI = 0x8933; + int GL_REG_19_ATI = 0x8934; + int GL_REG_20_ATI = 0x8935; + int GL_REG_21_ATI = 0x8936; + int GL_REG_22_ATI = 0x8937; + int GL_REG_23_ATI = 0x8938; + int GL_REG_24_ATI = 0x8939; + int GL_REG_25_ATI = 0x893A; + int GL_REG_26_ATI = 0x893B; + int GL_REG_27_ATI = 0x893C; + int GL_REG_28_ATI = 0x893D; + int GL_REG_29_ATI = 0x893E; + int GL_REG_30_ATI = 0x893F; + int GL_REG_31_ATI = 0x8940; + int GL_CON_0_ATI = 0x8941; + int GL_CON_1_ATI = 0x8942; + int GL_CON_2_ATI = 0x8943; + int GL_CON_3_ATI = 0x8944; + int GL_CON_4_ATI = 0x8945; + int GL_CON_5_ATI = 0x8946; + int GL_CON_6_ATI = 0x8947; + int GL_CON_7_ATI = 0x8948; + int GL_CON_8_ATI = 0x8949; + int GL_CON_9_ATI = 0x894A; + int GL_CON_10_ATI = 0x894B; + int GL_CON_11_ATI = 0x894C; + int GL_CON_12_ATI = 0x894D; + int GL_CON_13_ATI = 0x894E; + int GL_CON_14_ATI = 0x894F; + int GL_CON_15_ATI = 0x8950; + int GL_CON_16_ATI = 0x8951; + int GL_CON_17_ATI = 0x8952; + int GL_CON_18_ATI = 0x8953; + int GL_CON_19_ATI = 0x8954; + int GL_CON_20_ATI = 0x8955; + int GL_CON_21_ATI = 0x8956; + int GL_CON_22_ATI = 0x8957; + int GL_CON_23_ATI = 0x8958; + int GL_CON_24_ATI = 0x8959; + int GL_CON_25_ATI = 0x895A; + int GL_CON_26_ATI = 0x895B; + int GL_CON_27_ATI = 0x895C; + int GL_CON_28_ATI = 0x895D; + int GL_CON_29_ATI = 0x895E; + int GL_CON_30_ATI = 0x895F; + int GL_CON_31_ATI = 0x8960; + int GL_MOV_ATI = 0x8961; + int GL_ADD_ATI = 0x8963; + int GL_MUL_ATI = 0x8964; + int GL_SUB_ATI = 0x8965; + int GL_DOT3_ATI = 0x8966; + int GL_DOT4_ATI = 0x8967; + int GL_MAD_ATI = 0x8968; + int GL_LERP_ATI = 0x8969; + int GL_CND_ATI = 0x896A; + int GL_CND0_ATI = 0x896B; + int GL_DOT2_ADD_ATI = 0x896C; + int GL_SECONDARY_INTERPOLATOR_ATI = 0x896D; + int GL_NUM_FRAGMENT_REGISTERS_ATI = 0x896E; + int GL_NUM_FRAGMENT_CONSTANTS_ATI = 0x896F; + int GL_NUM_PASSES_ATI = 0x8970; + int GL_NUM_INSTRUCTIONS_PER_PASS_ATI = 0x8971; + int GL_NUM_INSTRUCTIONS_TOTAL_ATI = 0x8972; + int GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI = 0x8973; + int GL_NUM_LOOPBACK_COMPONENTS_ATI = 0x8974; + int GL_COLOR_ALPHA_PAIRING_ATI = 0x8975; + int GL_SWIZZLE_STR_ATI = 0x8976; + int GL_SWIZZLE_STQ_ATI = 0x8977; + int GL_SWIZZLE_STR_DR_ATI = 0x8978; + int GL_SWIZZLE_STQ_DQ_ATI = 0x8979; + int GL_SWIZZLE_STRQ_ATI = 0x897A; + int GL_SWIZZLE_STRQ_DQ_ATI = 0x897B; + int GL_RED_BIT_ATI = 0x00000001; + int GL_GREEN_BIT_ATI = 0x00000002; + int GL_BLUE_BIT_ATI = 0x00000004; + int GL_X2_BIT_ATI = 0x00000001; + int GL_X4_BIT_ATI = 0x00000002; + int GL_X8_BIT_ATI = 0x00000004; + int GL_HALF_BIT_ATI = 0x00000008; + int GL_QUARTER_BIT_ATI = 0x00000010; + int GL_EIGHTH_BIT_ATI = 0x00000020; + int GL_SATURATE_BIT_ATI = 0x00000040; + int GL_COMP_BIT_ATI = 0x00000002; + int GL_NEGATE_BIT_ATI = 0x00000004; + int GL_BIAS_BIT_ATI = 0x00000008; - public @GLuint int glGenFragmentShadersATI(@GLuint int range); + @GLuint int glGenFragmentShadersATI(@GLuint int range); - public void glBindFragmentShaderATI(@GLuint int id); + void glBindFragmentShaderATI(@GLuint int id); - public void glDeleteFragmentShaderATI(@GLuint int id); + void glDeleteFragmentShaderATI(@GLuint int id); - public void glBeginFragmentShaderATI(); + void glBeginFragmentShaderATI(); - public void glEndFragmentShaderATI(); + void glEndFragmentShaderATI(); - public void glPassTexCoordATI(@GLuint int dst, @GLuint int coord, @GLenum int swizzle); + void glPassTexCoordATI(@GLuint int dst, @GLuint int coord, @GLenum int swizzle); - public void glSampleMapATI(@GLuint int dst, @GLuint int interp, @GLenum int swizzle); + void glSampleMapATI(@GLuint int dst, @GLuint int interp, @GLenum int swizzle); - public void glColorFragmentOp1ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMask, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod); + void glColorFragmentOp1ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMask, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod); - public void glColorFragmentOp2ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMask, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod, @GLuint int arg2, @GLuint int arg2Rep, @GLuint int arg2Mod); + void glColorFragmentOp2ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMask, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod, @GLuint int arg2, @GLuint int arg2Rep, @GLuint int arg2Mod); - public void glColorFragmentOp3ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMask, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod, @GLuint int arg2, @GLuint int arg2Rep, @GLuint int arg2Mod, @GLuint int arg3, @GLuint int arg3Rep, @GLuint int arg3Mod); + void glColorFragmentOp3ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMask, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod, @GLuint int arg2, @GLuint int arg2Rep, @GLuint int arg2Mod, @GLuint int arg3, @GLuint int arg3Rep, @GLuint int arg3Mod); - public void glAlphaFragmentOp1ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod); + void glAlphaFragmentOp1ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod); - public void glAlphaFragmentOp2ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod, @GLuint int arg2, @GLuint int arg2Rep, @GLuint int arg2Mod); + void glAlphaFragmentOp2ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod, @GLuint int arg2, @GLuint int arg2Rep, @GLuint int arg2Mod); - public void glAlphaFragmentOp3ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod, @GLuint int arg2, @GLuint int arg2Rep, @GLuint int arg2Mod, @GLuint int arg3, @GLuint int arg3Rep, @GLuint int arg3Mod); + void glAlphaFragmentOp3ATI(@GLenum int op, @GLuint int dst, @GLuint int dstMod, @GLuint int arg1, @GLuint int arg1Rep, @GLuint int arg1Mod, @GLuint int arg2, @GLuint int arg2Rep, @GLuint int arg2Mod, @GLuint int arg3, @GLuint int arg3Rep, @GLuint int arg3Mod); // TODO:is the @Check correct? - public void glSetFragmentShaderConstantATI(@GLuint int dst, @Check("4") @Const FloatBuffer pfValue); + void glSetFragmentShaderConstantATI(@GLuint int dst, @Check("4") @Const FloatBuffer pfValue); } diff --git a/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java b/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java index e43be67d..5201ecc9 100644 --- a/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java +++ b/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.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,8 +50,8 @@ public interface ATI_map_object_buffer { * @return A ByteBuffer representing the mapped object buffer memory. */ @CachedResult - public @GLvoid ByteBuffer glMapObjectBufferATI(@GLuint int buffer); + @GLvoid ByteBuffer glMapObjectBufferATI(@GLuint int buffer); - public void glUnmapObjectBufferATI(@GLuint int buffer); + void glUnmapObjectBufferATI(@GLuint int buffer); } diff --git a/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java b/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java index 35e91bf9..886a3b16 100644 --- a/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java +++ b/src/templates/org/lwjgl/opengl/ATI_pn_triangles.java @@ -34,17 +34,17 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; public interface ATI_pn_triangles { - 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; + int GL_PN_TRIANGLES_ATI = 0x87F0; + int GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F1; + int GL_PN_TRIANGLES_POINT_MODE_ATI = 0x87F2; + int GL_PN_TRIANGLES_NORMAL_MODE_ATI = 0x87F3; + int GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI = 0x87F4; + int GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI = 0x87F5; + int GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI = 0x87F6; + int GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI = 0x87F7; + int GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI = 0x87F8; - public void glPNTrianglesfATI(@GLenum int pname, float param); + void glPNTrianglesfATI(@GLenum int pname, float param); - public void glPNTrianglesiATI(@GLenum int pname, int param); + void glPNTrianglesiATI(@GLenum int pname, int param); } diff --git a/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java b/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java index 4541331d..d928361b 100644 --- a/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java +++ b/src/templates/org/lwjgl/opengl/ATI_separate_stencil.java @@ -34,12 +34,12 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; public interface ATI_separate_stencil { - 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; + int GL_STENCIL_BACK_FUNC_ATI = 0x8800; + int GL_STENCIL_BACK_FAIL_ATI = 0x8801; + int GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI = 0x8802; + int GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI = 0x8803; - public void glStencilOpSeparateATI(@GLenum int face, @GLenum int sfail, @GLenum int dpfail, @GLenum int dppass); + void glStencilOpSeparateATI(@GLenum int face, @GLenum int sfail, @GLenum int dpfail, @GLenum int dppass); - public void glStencilFuncSeparateATI(@GLenum int frontfunc, @GLenum int backfunc, int ref, @GLuint int mask); + void glStencilFuncSeparateATI(@GLenum int frontfunc, @GLenum int backfunc, int ref, @GLuint int mask); } diff --git a/src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java b/src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java index 345ea1bd..6e300156 100644 --- a/src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java +++ b/src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java @@ -35,5 +35,5 @@ import org.lwjgl.generator.*; @Extension(postfix="ATI", className="ATITextureCompression3DC") public interface ATI_texture_compression_3dc { - public static final int GL_COMPRESSED_RGB_3DC_ATI = 0x8837; + int GL_COMPRESSED_RGB_3DC_ATI = 0x8837; } diff --git a/src/templates/org/lwjgl/opengl/ATI_texture_float.java b/src/templates/org/lwjgl/opengl/ATI_texture_float.java index 8fc70535..cb3121bb 100644 --- a/src/templates/org/lwjgl/opengl/ATI_texture_float.java +++ b/src/templates/org/lwjgl/opengl/ATI_texture_float.java @@ -36,16 +36,16 @@ public interface ATI_texture_float { * Accepted by the parameter of TexImage1D, * TexImage2D, and TexImage3D: */ - public static final int GL_RGBA_FLOAT32_ATI = 0x8814; - public static final int GL_RGB_FLOAT32_ATI = 0x8815; - public static final int GL_ALPHA_FLOAT32_ATI = 0x8816; - public static final int GL_INTENSITY_FLOAT32_ATI = 0x8817; - public static final int GL_LUMINANCE_FLOAT32_ATI = 0x8818; - public static final int GL_LUMINANCE_ALPHA_FLOAT32_ATI = 0x8819; - public static final int GL_RGBA_FLOAT16_ATI = 0x881A; - public static final int GL_RGB_FLOAT16_ATI = 0x881B; - public static final int GL_ALPHA_FLOAT16_ATI = 0x881C; - public static final int GL_INTENSITY_FLOAT16_ATI = 0x881D; - public static final int GL_LUMINANCE_FLOAT16_ATI = 0x881E; - public static final int GL_LUMINANCE_ALPHA_FLOAT16_ATI = 0x881F; + int GL_RGBA_FLOAT32_ATI = 0x8814; + int GL_RGB_FLOAT32_ATI = 0x8815; + int GL_ALPHA_FLOAT32_ATI = 0x8816; + int GL_INTENSITY_FLOAT32_ATI = 0x8817; + int GL_LUMINANCE_FLOAT32_ATI = 0x8818; + int GL_LUMINANCE_ALPHA_FLOAT32_ATI = 0x8819; + int GL_RGBA_FLOAT16_ATI = 0x881A; + int GL_RGB_FLOAT16_ATI = 0x881B; + int GL_ALPHA_FLOAT16_ATI = 0x881C; + int GL_INTENSITY_FLOAT16_ATI = 0x881D; + int GL_LUMINANCE_FLOAT16_ATI = 0x881E; + int GL_LUMINANCE_ALPHA_FLOAT16_ATI = 0x881F; } diff --git a/src/templates/org/lwjgl/opengl/ATI_texture_mirror_once.java b/src/templates/org/lwjgl/opengl/ATI_texture_mirror_once.java index d33a40b0..17d86971 100644 --- a/src/templates/org/lwjgl/opengl/ATI_texture_mirror_once.java +++ b/src/templates/org/lwjgl/opengl/ATI_texture_mirror_once.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface ATI_texture_mirror_once { - public static final int GL_MIRROR_CLAMP_ATI = 0x8742; - public static final int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743; + int GL_MIRROR_CLAMP_ATI = 0x8742; + int GL_MIRROR_CLAMP_TO_EDGE_ATI = 0x8743; } diff --git a/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java b/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java index 34ff802b..7d2ed44c 100644 --- a/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java +++ b/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java @@ -32,25 +32,23 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import java.nio.ShortBuffer; import org.lwjgl.generator.*; public interface ATI_vertex_array_object { - 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; + int GL_STATIC_ATI = 0x8760; + int GL_DYNAMIC_ATI = 0x8761; + int GL_PRESERVE_ATI = 0x8762; + int GL_DISCARD_ATI = 0x8763; + int GL_OBJECT_BUFFER_SIZE_ATI = 0x8764; + int GL_OBJECT_BUFFER_USAGE_ATI = 0x8765; + int GL_ARRAY_OBJECT_BUFFER_ATI = 0x8766; + int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767; @GenerateAutos - public @GLuint int glNewObjectBufferATI(@AutoSize("pPointer") @GLsizei int size, + @GLuint int glNewObjectBufferATI(@AutoSize("pPointer") @GLsizei int size, @Const @GLbyte @GLshort @@ -58,9 +56,9 @@ public interface ATI_vertex_array_object { @GLfloat Buffer pPointer, @GLenum int usage); - public boolean glIsObjectBufferATI(@GLuint int buffer); + boolean glIsObjectBufferATI(@GLuint int buffer); - public void glUpdateObjectBufferATI(@GLuint int buffer, @GLuint int offset, @AutoSize("pPointer") @GLsizei int size, + void glUpdateObjectBufferATI(@GLuint int buffer, @GLuint int offset, @AutoSize("pPointer") @GLsizei int size, @Const @GLbyte @GLshort @@ -69,23 +67,23 @@ public interface ATI_vertex_array_object { Buffer pPointer, @GLenum int preserve); @StripPostfix("params") - public void glGetObjectBufferfvATI(@GLuint int buffer, @GLenum int pname, @Check FloatBuffer params); + void glGetObjectBufferfvATI(@GLuint int buffer, @GLenum int pname, @Check FloatBuffer params); @StripPostfix("params") - public void glGetObjectBufferivATI(@GLuint int buffer, @GLenum int pname, @Check IntBuffer params); + void glGetObjectBufferivATI(@GLuint int buffer, @GLenum int pname, @Check IntBuffer params); - public void glFreeObjectBufferATI(@GLuint int buffer); + void glFreeObjectBufferATI(@GLuint int buffer); - public void glArrayObjectATI(@GLenum int array, int size, @GLenum int type, @GLsizei int stride, @GLuint int buffer, @GLuint int offset); + void glArrayObjectATI(@GLenum int array, int size, @GLenum int type, @GLsizei int stride, @GLuint int buffer, @GLuint int offset); @StripPostfix("params") - public void glGetArrayObjectfvATI(@GLenum int array, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetArrayObjectfvATI(@GLenum int array, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetArrayObjectivATI(@GLenum int array, @GLenum int pname, @Check("4") IntBuffer params); + void glGetArrayObjectivATI(@GLenum int array, @GLenum int pname, @Check("4") IntBuffer params); - public void glVariantArrayObjectATI(@GLuint int id, @GLenum int type, @GLsizei int stride, @GLuint int buffer, @GLuint int offset); + void glVariantArrayObjectATI(@GLuint int id, @GLenum int type, @GLsizei int stride, @GLuint int buffer, @GLuint int offset); @StripPostfix("params") - public void glGetVariantArrayObjectfvATI(@GLuint int id, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetVariantArrayObjectfvATI(@GLuint int id, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetVariantArrayObjectivATI(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params); + void glGetVariantArrayObjectivATI(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java b/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java index 456dc82c..e40ca75f 100644 --- a/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java +++ b/src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java @@ -37,10 +37,10 @@ import java.nio.IntBuffer; import org.lwjgl.generator.*; public interface ATI_vertex_attrib_array_object { - public void glVertexAttribArrayObjectATI(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride, @GLuint int buffer, @GLuint int offset); + void glVertexAttribArrayObjectATI(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride, @GLuint int buffer, @GLuint int offset); @StripPostfix("params") - public void glGetVertexAttribArrayObjectfvATI(@GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetVertexAttribArrayObjectfvATI(@GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetVertexAttribArrayObjectivATI(@GLuint int index, @GLenum int pname, @Check("4") IntBuffer params); + void glGetVertexAttribArrayObjectivATI(@GLuint int index, @GLenum int pname, @Check("4") IntBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java b/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java index 9823a486..06a2658c 100644 --- a/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java +++ b/src/templates/org/lwjgl/opengl/ATI_vertex_streams.java @@ -34,46 +34,46 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; public interface ATI_vertex_streams { - 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; + int GL_MAX_VERTEX_STREAMS_ATI = 0x876B; + int GL_VERTEX_SOURCE_ATI = 0x876C; + int GL_VERTEX_STREAM0_ATI = 0x876D; + int GL_VERTEX_STREAM1_ATI = 0x876E; + int GL_VERTEX_STREAM2_ATI = 0x876F; + int GL_VERTEX_STREAM3_ATI = 0x8770; + int GL_VERTEX_STREAM4_ATI = 0x8771; + int GL_VERTEX_STREAM5_ATI = 0x8772; + int GL_VERTEX_STREAM6_ATI = 0x8773; + int GL_VERTEX_STREAM7_ATI = 0x8774; - public void glVertexStream2fATI(@GLenum int stream, float x, float y); + void glVertexStream2fATI(@GLenum int stream, float x, float y); - public void glVertexStream2iATI(@GLenum int stream, int x, int y); + void glVertexStream2iATI(@GLenum int stream, int x, int y); - public void glVertexStream2sATI(@GLenum int stream, short x, short y); + void glVertexStream2sATI(@GLenum int stream, short x, short y); - public void glVertexStream3fATI(@GLenum int stream, float x, float y, float z); + void glVertexStream3fATI(@GLenum int stream, float x, float y, float z); - public void glVertexStream3iATI(@GLenum int stream, int x, int y, int z); + void glVertexStream3iATI(@GLenum int stream, int x, int y, int z); - public void glVertexStream3sATI(@GLenum int stream, short x, short y, short z); + void glVertexStream3sATI(@GLenum int stream, short x, short y, short z); - public void glVertexStream4fATI(@GLenum int stream, float x, float y, float z, float w); + void glVertexStream4fATI(@GLenum int stream, float x, float y, float z, float w); - public void glVertexStream4iATI(@GLenum int stream, int x, int y, int z, int w); + void glVertexStream4iATI(@GLenum int stream, int x, int y, int z, int w); - public void glVertexStream4sATI(@GLenum int stream, short x, short y, short z, short w); + void glVertexStream4sATI(@GLenum int stream, short x, short y, short z, short w); - public void glNormalStream3bATI(@GLenum int stream, byte x, byte y, byte z); + void glNormalStream3bATI(@GLenum int stream, byte x, byte y, byte z); - public void glNormalStream3fATI(@GLenum int stream, float x, float y, float z); + void glNormalStream3fATI(@GLenum int stream, float x, float y, float z); - public void glNormalStream3iATI(@GLenum int stream, int x, int y, int z); + void glNormalStream3iATI(@GLenum int stream, int x, int y, int z); - public void glNormalStream3sATI(@GLenum int stream, short x, short y, short z); + void glNormalStream3sATI(@GLenum int stream, short x, short y, short z); - public void glClientActiveVertexStreamATI(@GLenum int stream); + void glClientActiveVertexStreamATI(@GLenum int stream); - public void glVertexBlendEnvfATI(@GLenum int pname, float param); + void glVertexBlendEnvfATI(@GLenum int pname, float param); - public void glVertexBlendEnviATI(@GLenum int pname, int param); + void glVertexBlendEnviATI(@GLenum int pname, int param); } diff --git a/src/templates/org/lwjgl/opengl/EXT_abgr.java b/src/templates/org/lwjgl/opengl/EXT_abgr.java index e21f56ad..6014022b 100644 --- a/src/templates/org/lwjgl/opengl/EXT_abgr.java +++ b/src/templates/org/lwjgl/opengl/EXT_abgr.java @@ -32,5 +32,5 @@ package org.lwjgl.opengl; public interface EXT_abgr { - public static final int GL_ABGR_EXT = 0x8000; + int GL_ABGR_EXT = 0x8000; } diff --git a/src/templates/org/lwjgl/opengl/EXT_bgra.java b/src/templates/org/lwjgl/opengl/EXT_bgra.java index a9faf6ee..b5ee54fe 100644 --- a/src/templates/org/lwjgl/opengl/EXT_bgra.java +++ b/src/templates/org/lwjgl/opengl/EXT_bgra.java @@ -37,6 +37,6 @@ package org.lwjgl.opengl; * @author cas */ public interface EXT_bgra { - public static final int GL_BGR_EXT = 0x80E0; - public static final int GL_BGRA_EXT = 0x80E1; + int GL_BGR_EXT = 0x80E0; + int GL_BGRA_EXT = 0x80E1; } diff --git a/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java b/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java index edcde9fa..ed701776 100644 --- a/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java +++ b/src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java @@ -38,8 +38,8 @@ public interface EXT_blend_equation_separate { * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_BLEND_EQUATION_RGB_EXT = 0x8009; - public static final int GL_BLEND_EQUATION_ALPHA_EXT = 0x883D; + int GL_BLEND_EQUATION_RGB_EXT = 0x8009; + int GL_BLEND_EQUATION_ALPHA_EXT = 0x883D; - public void glBlendEquationSeparateEXT(@GLenum int modeRGB, @GLenum int modeAlpha); + void glBlendEquationSeparateEXT(@GLenum int modeRGB, @GLenum int modeAlpha); } diff --git a/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java b/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java index d692b3e9..3996361a 100644 --- a/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java +++ b/src/templates/org/lwjgl/opengl/EXT_blend_func_separate.java @@ -34,10 +34,10 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; public interface EXT_blend_func_separate { - 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; + int GL_BLEND_DST_RGB_EXT = 0x80C8; + int GL_BLEND_SRC_RGB_EXT = 0x80C9; + int GL_BLEND_DST_ALPHA_EXT = 0x80CA; + int GL_BLEND_SRC_ALPHA_EXT = 0x80CB; - public void glBlendFuncSeparateEXT(@GLenum int sfactorRGB, @GLenum int dfactorRGB, @GLenum int sfactorAlpha, @GLenum int dfactorAlpha); + void glBlendFuncSeparateEXT(@GLenum int sfactorRGB, @GLenum int dfactorRGB, @GLenum int sfactorAlpha, @GLenum int dfactorAlpha); } diff --git a/src/templates/org/lwjgl/opengl/EXT_blend_subtract.java b/src/templates/org/lwjgl/opengl/EXT_blend_subtract.java index 00036889..720f7a9a 100644 --- a/src/templates/org/lwjgl/opengl/EXT_blend_subtract.java +++ b/src/templates/org/lwjgl/opengl/EXT_blend_subtract.java @@ -37,6 +37,6 @@ package org.lwjgl.opengl; * @author cas */ public interface EXT_blend_subtract { - public static final int GL_FUNC_SUBTRACT_EXT = 0x800A; - public static final int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B; + int GL_FUNC_SUBTRACT_EXT = 0x800A; + int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B; } diff --git a/src/templates/org/lwjgl/opengl/EXT_cg_shader.java b/src/templates/org/lwjgl/opengl/EXT_cg_shader.java index c1e10597..76406732 100644 --- a/src/templates/org/lwjgl/opengl/EXT_cg_shader.java +++ b/src/templates/org/lwjgl/opengl/EXT_cg_shader.java @@ -38,6 +38,6 @@ public interface EXT_cg_shader { * can pass GL_CG_FRAGMENT_SHADER_EXT to glCreateShaderARB instead of GL_FRAGMENT_SHADER_ARB to create a fragment shader object * that will parse and compile its shader source with the Cg front-end rather than the GLSL front-end. */ - public static final int GL_CG_VERTEX_SHADER_EXT = 0x890E; - public static final int GL_CG_FRAGMENT_SHADER_EXT = 0x890F; + int GL_CG_VERTEX_SHADER_EXT = 0x890E; + int GL_CG_FRAGMENT_SHADER_EXT = 0x890F; } diff --git a/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java b/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java index 44fa09c5..2090d502 100644 --- a/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java +++ b/src/templates/org/lwjgl/opengl/EXT_compiled_vertex_array.java @@ -34,10 +34,10 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; public interface EXT_compiled_vertex_array { - public static final int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8; - public static final int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9; + int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT = 0x81A8; + int GL_ARRAY_ELEMENT_LOCK_COUNT_EXT = 0x81A9; - public void glLockArraysEXT(int first, @GLsizei int count); + void glLockArraysEXT(int first, @GLsizei int count); - public void glUnlockArraysEXT(); + void glUnlockArraysEXT(); } diff --git a/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java b/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java index 92c1dab1..73b0f0bf 100644 --- a/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java +++ b/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java @@ -39,13 +39,13 @@ public interface EXT_depth_bounds_test { and by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int DEPTH_BOUNDS_TEST_EXT = 0x8890; + int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890; /* Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int DEPTH_BOUNDS_EXT = 0x8891; + int GL_DEPTH_BOUNDS_EXT = 0x8891; - public void glDepthBoundsEXT(@GLclampd double zmin, @GLclampd double zmax); + void glDepthBoundsEXT(@GLclampd double zmin, @GLclampd double zmax); } diff --git a/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java b/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java index 15db5c0e..c97cd3db 100644 --- a/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java +++ b/src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java @@ -32,17 +32,14 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.IntBuffer; -import java.nio.ShortBuffer; import org.lwjgl.generator.*; public interface EXT_draw_range_elements { - public static final int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8; - public static final int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9; + int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8; + int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9; - public void glDrawRangeElementsEXT(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("pIndices") @GLsizei int count, @AutoType("pIndices") @GLenum int type, + void glDrawRangeElementsEXT(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("pIndices") @GLsizei int count, @AutoType("pIndices") @GLenum int type, @BufferObject(BufferKind.ElementVBO) @Const @GLubyte diff --git a/src/templates/org/lwjgl/opengl/EXT_fog_coord.java b/src/templates/org/lwjgl/opengl/EXT_fog_coord.java index dc249b99..dd17d7bf 100644 --- a/src/templates/org/lwjgl/opengl/EXT_fog_coord.java +++ b/src/templates/org/lwjgl/opengl/EXT_fog_coord.java @@ -32,23 +32,22 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.FloatBuffer; import org.lwjgl.generator.*; public interface EXT_fog_coord { - 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; + int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450; + int GL_FOG_COORDINATE_EXT = 0x8451; + int GL_FRAGMENT_DEPTH_EXT = 0x8452; + int GL_CURRENT_FOG_COORDINATE_EXT = 0x8453; + int GL_FOG_COORDINATE_ARRAY_TYPE_EXT = 0x8454; + int GL_FOG_COORDINATE_ARRAY_STRIDE_EXT = 0x8455; + int GL_FOG_COORDINATE_ARRAY_POINTER_EXT = 0x8456; + int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457; - public void glFogCoordfEXT(float coord); + void glFogCoordfEXT(float coord); - public void glFogCoordPointerEXT(@AutoType("data") @GLenum int type, @GLsizei int stride, + void glFogCoordPointerEXT(@AutoType("data") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const diff --git a/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java b/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java index 2fe36a52..51fa71be 100644 --- a/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java +++ b/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java @@ -41,124 +41,124 @@ public interface EXT_framebuffer_object { * CheckFramebufferStatusEXT, FramebufferTexture{1D|2D|3D}EXT, and * FramebufferRenderbufferEXT: */ - public static final int GL_FRAMEBUFFER_EXT = 0x8D40; + int GL_FRAMEBUFFER_EXT = 0x8D40; /* * Accepted by the <target> parameter of BindRenderbufferEXT, * RenderbufferStorageEXT, and GetRenderbufferParameterivEXT, and * returned by GetFramebufferAttachmentParameterivEXT: */ - public static final int GL_RENDERBUFFER_EXT = 0x8D41; + int GL_RENDERBUFFER_EXT = 0x8D41; /* * Accepted by the <internalformat> parameter of * RenderbufferStorageEXT: */ - public static final int GL_STENCIL_INDEX_EXT = 0x8D45; - public static final int GL_STENCIL_INDEX1_EXT = 0x8D46; - public static final int GL_STENCIL_INDEX4_EXT = 0x8D47; - public static final int GL_STENCIL_INDEX8_EXT = 0x8D48; - public static final int GL_STENCIL_INDEX16_EXT = 0x8D49; + int GL_STENCIL_INDEX_EXT = 0x8D45; + int GL_STENCIL_INDEX1_EXT = 0x8D46; + int GL_STENCIL_INDEX4_EXT = 0x8D47; + int GL_STENCIL_INDEX8_EXT = 0x8D48; + int GL_STENCIL_INDEX16_EXT = 0x8D49; /* * Accepted by the <pname> parameter of GetRenderbufferParameterivEXT: */ - public static final int GL_RENDERBUFFER_WIDTH_EXT = 0x8D42; - public static final int GL_RENDERBUFFER_HEIGHT_EXT = 0x8D43; - public static final int GL_RENDERBUFFER_INTERNAL_FORMAT_EXT = 0x8D44; + int GL_RENDERBUFFER_WIDTH_EXT = 0x8D42; + int GL_RENDERBUFFER_HEIGHT_EXT = 0x8D43; + int GL_RENDERBUFFER_INTERNAL_FORMAT_EXT = 0x8D44; /* * Accepted by the <pname> parameter of * GetFramebufferAttachmentParameterivEXT: */ - public static final int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT = 0x8CD0; - public static final int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT = 0x8CD1; - public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT = 0x8CD2; - public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT = 0x8CD3; - public static final int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT = 0x8CD4; + int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT = 0x8CD0; + int GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT = 0x8CD1; + int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT = 0x8CD2; + int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT = 0x8CD3; + int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT = 0x8CD4; /* * Accepted by the <attachment> parameter of * FramebufferTexture{1D|2D|3D}EXT, FramebufferRenderbufferEXT, and * GetFramebufferAttachmentParameterivEXT */ - public static final int GL_COLOR_ATTACHMENT0_EXT = 0x8CE0; - public static final int GL_COLOR_ATTACHMENT1_EXT = 0x8CE1; - public static final int GL_COLOR_ATTACHMENT2_EXT = 0x8CE2; - public static final int GL_COLOR_ATTACHMENT3_EXT = 0x8CE3; - public static final int GL_COLOR_ATTACHMENT4_EXT = 0x8CE4; - public static final int GL_COLOR_ATTACHMENT5_EXT = 0x8CE5; - public static final int GL_COLOR_ATTACHMENT6_EXT = 0x8CE6; - public static final int GL_COLOR_ATTACHMENT7_EXT = 0x8CE7; - public static final int GL_COLOR_ATTACHMENT8_EXT = 0x8CE8; - public static final int GL_COLOR_ATTACHMENT9_EXT = 0x8CE9; - public static final int GL_COLOR_ATTACHMENT10_EXT = 0x8CEA; - public static final int GL_COLOR_ATTACHMENT11_EXT = 0x8CEB; - public static final int GL_COLOR_ATTACHMENT12_EXT = 0x8CEC; - public static final int GL_COLOR_ATTACHMENT13_EXT = 0x8CED; - public static final int GL_COLOR_ATTACHMENT14_EXT = 0x8CEE; - public static final int GL_COLOR_ATTACHMENT15_EXT = 0x8CEF; - public static final int GL_DEPTH_ATTACHMENT_EXT = 0x8D00; - public static final int GL_STENCIL_ATTACHMENT_EXT = 0x8D20; + int GL_COLOR_ATTACHMENT0_EXT = 0x8CE0; + int GL_COLOR_ATTACHMENT1_EXT = 0x8CE1; + int GL_COLOR_ATTACHMENT2_EXT = 0x8CE2; + int GL_COLOR_ATTACHMENT3_EXT = 0x8CE3; + int GL_COLOR_ATTACHMENT4_EXT = 0x8CE4; + int GL_COLOR_ATTACHMENT5_EXT = 0x8CE5; + int GL_COLOR_ATTACHMENT6_EXT = 0x8CE6; + int GL_COLOR_ATTACHMENT7_EXT = 0x8CE7; + int GL_COLOR_ATTACHMENT8_EXT = 0x8CE8; + int GL_COLOR_ATTACHMENT9_EXT = 0x8CE9; + int GL_COLOR_ATTACHMENT10_EXT = 0x8CEA; + int GL_COLOR_ATTACHMENT11_EXT = 0x8CEB; + int GL_COLOR_ATTACHMENT12_EXT = 0x8CEC; + int GL_COLOR_ATTACHMENT13_EXT = 0x8CED; + int GL_COLOR_ATTACHMENT14_EXT = 0x8CEE; + int GL_COLOR_ATTACHMENT15_EXT = 0x8CEF; + int GL_DEPTH_ATTACHMENT_EXT = 0x8D00; + int GL_STENCIL_ATTACHMENT_EXT = 0x8D20; /** * Returned by CheckFramebufferStatusEXT(): */ - public static final int GL_FRAMEBUFFER_COMPLETE_EXT = 0x8CD5; - public static final int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT = 0x8CD6; - public static final int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT = 0x8CD7; - public static final int GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT = 0x8CD8; - public static final int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT = 0x8CD9; - public static final int GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT = 0x8CDA; - public static final int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT = 0x8CDB; - public static final int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT = 0x8CDC; - public static final int GL_FRAMEBUFFER_UNSUPPORTED_EXT = 0x8CDD; - public static final int GL_FRAMEBUFFER_STATUS_ERROR_EXT = 0x8CDE; + int GL_FRAMEBUFFER_COMPLETE_EXT = 0x8CD5; + int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT = 0x8CD6; + int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT = 0x8CD7; + int GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT = 0x8CD8; + int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT = 0x8CD9; + int GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT = 0x8CDA; + int GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT = 0x8CDB; + int GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT = 0x8CDC; + int GL_FRAMEBUFFER_UNSUPPORTED_EXT = 0x8CDD; + int GL_FRAMEBUFFER_STATUS_ERROR_EXT = 0x8CDE; /** * Accepted by GetIntegerv(): */ - public static final int GL_FRAMEBUFFER_BINDING_EXT = 0x8CA6; - public static final int GL_RENDERBUFFER_BINDING_EXT = 0x8CA7; - public static final int GL_MAX_COLOR_ATTACHMENTS_EXT = 0x8CDF; - public static final int GL_MAX_RENDERBUFFER_SIZE_EXT = 0x84E8; + int GL_FRAMEBUFFER_BINDING_EXT = 0x8CA6; + int GL_RENDERBUFFER_BINDING_EXT = 0x8CA7; + int GL_MAX_COLOR_ATTACHMENTS_EXT = 0x8CDF; + int GL_MAX_RENDERBUFFER_SIZE_EXT = 0x84E8; /** * Returned by GetError(): */ - public static final int GL_INVALID_FRAMEBUFFER_OPERATION_EXT = 0x0506; + int GL_INVALID_FRAMEBUFFER_OPERATION_EXT = 0x0506; - public boolean glIsRenderbufferEXT(@GLuint int renderbuffer); + boolean glIsRenderbufferEXT(@GLuint int renderbuffer); - public void glBindRenderbufferEXT(@GLenum int target, @GLuint int renderbuffer); + void glBindRenderbufferEXT(@GLenum int target, @GLuint int renderbuffer); - public void glDeleteRenderbuffersEXT(@AutoSize("renderbuffers") int n, @Const @GLuint IntBuffer renderbuffers); - public void glGenRenderbuffersEXT(@AutoSize("renderbuffers") int n, @GLuint IntBuffer renderbuffers); + void glDeleteRenderbuffersEXT(@AutoSize("renderbuffers") int n, @Const @GLuint IntBuffer renderbuffers); + void glGenRenderbuffersEXT(@AutoSize("renderbuffers") int n, @GLuint IntBuffer renderbuffers); - public void glRenderbufferStorageEXT(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height); + void glRenderbufferStorageEXT(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height); @StripPostfix("params") - public void glGetRenderbufferParameterivEXT(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetRenderbufferParameterivEXT(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); - public boolean glIsFramebufferEXT(@GLuint int framebuffer); + boolean glIsFramebufferEXT(@GLuint int framebuffer); - public void glBindFramebufferEXT(@GLenum int target, @GLuint int framebuffer); + void glBindFramebufferEXT(@GLenum int target, @GLuint int framebuffer); - public void glDeleteFramebuffersEXT(@AutoSize("framebuffers") int n, @Const @GLuint IntBuffer framebuffers); - public void glGenFramebuffersEXT(@AutoSize("framebuffers") int n, @Const @GLuint IntBuffer framebuffers); + void glDeleteFramebuffersEXT(@AutoSize("framebuffers") int n, @Const @GLuint IntBuffer framebuffers); + void glGenFramebuffersEXT(@AutoSize("framebuffers") int n, @Const @GLuint IntBuffer framebuffers); - public @GLenum int glCheckFramebufferStatusEXT(@GLenum int target); + @GLenum int glCheckFramebufferStatusEXT(@GLenum int target); - public void glFramebufferTexture1DEXT(@GLenum int target, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level); + void glFramebufferTexture1DEXT(@GLenum int target, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level); - public void glFramebufferTexture2DEXT(@GLenum int target, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level); + void glFramebufferTexture2DEXT(@GLenum int target, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level); - public void glFramebufferTexture3DEXT(@GLenum int target, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level, int zoffset); + void glFramebufferTexture3DEXT(@GLenum int target, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level, int zoffset); - public void glFramebufferRenderbufferEXT(@GLenum int target, @GLenum int attachment, @GLenum int renderbuffertarget, @GLuint int renderbuffer); + void glFramebufferRenderbufferEXT(@GLenum int target, @GLenum int attachment, @GLenum int renderbuffertarget, @GLuint int renderbuffer); @StripPostfix("params") - public void glGetFramebufferAttachmentParameterivEXT(@GLenum int target, @GLenum int attachment, @GLenum int pname, @Check("4") IntBuffer params); + void glGetFramebufferAttachmentParameterivEXT(@GLenum int target, @GLenum int attachment, @GLenum int pname, @Check("4") IntBuffer params); - public void glGenerateMipmapEXT(@GLenum int target); + void glGenerateMipmapEXT(@GLenum int target); } diff --git a/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java b/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java index 6d93330b..fe38923c 100644 --- a/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java +++ b/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java @@ -39,5 +39,5 @@ public interface EXT_multi_draw_arrays { @Code( " if (piFirst.remaining() != piCount.remaining()) {\n" + " throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" + " }") - public void glMultiDrawArraysEXT(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") int primcount); + void glMultiDrawArraysEXT(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") int primcount); } diff --git a/src/templates/org/lwjgl/opengl/EXT_packed_pixels.java b/src/templates/org/lwjgl/opengl/EXT_packed_pixels.java index 0ec0e50a..64405ec7 100644 --- a/src/templates/org/lwjgl/opengl/EXT_packed_pixels.java +++ b/src/templates/org/lwjgl/opengl/EXT_packed_pixels.java @@ -32,9 +32,9 @@ package org.lwjgl.opengl; public interface EXT_packed_pixels { - 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; + int GL_UNSIGNED_BYTE_3_3_2_EXT = 0x8032; + int GL_UNSIGNED_SHORT_4_4_4_4_EXT = 0x8033; + int GL_UNSIGNED_SHORT_5_5_5_1_EXT = 0x8034; + int GL_UNSIGNED_INT_8_8_8_8_EXT = 0x8035; + int GL_UNSIGNED_INT_10_10_10_2_EXT = 0x8036; } diff --git a/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java b/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java index def7f8e0..af8fada9 100644 --- a/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java +++ b/src/templates/org/lwjgl/opengl/EXT_paletted_texture.java @@ -40,32 +40,32 @@ public interface EXT_paletted_texture { * Accepted by the internalformat parameter of TexImage1D, TexImage2D and * TexImage3DEXT: */ - public static final int GL_COLOR_INDEX1_EXT = 0x80E2; - public static final int GL_COLOR_INDEX2_EXT = 0x80E3; - public static final int GL_COLOR_INDEX4_EXT = 0x80E4; - public static final int GL_COLOR_INDEX8_EXT = 0x80E5; - public static final int GL_COLOR_INDEX12_EXT = 0x80E6; - public static final int GL_COLOR_INDEX16_EXT = 0x80E7; + int GL_COLOR_INDEX1_EXT = 0x80E2; + int GL_COLOR_INDEX2_EXT = 0x80E3; + int GL_COLOR_INDEX4_EXT = 0x80E4; + int GL_COLOR_INDEX8_EXT = 0x80E5; + int GL_COLOR_INDEX12_EXT = 0x80E6; + int GL_COLOR_INDEX16_EXT = 0x80E7; /* * Accepted by the pname parameter of GetColorTableParameterivEXT and * GetColorTableParameterfvEXT: */ - public static final int GL_COLOR_TABLE_FORMAT_EXT = 0x80D8; - public static final int GL_COLOR_TABLE_WIDTH_EXT = 0x80D9; - public static final int GL_COLOR_TABLE_RED_SIZE_EXT = 0x80DA; - public static final int GL_COLOR_TABLE_GREEN_SIZE_EXT = 0x80DB; - public static final int GL_COLOR_TABLE_BLUE_SIZE_EXT = 0x80DC; - public static final int GL_COLOR_TABLE_ALPHA_SIZE_EXT = 0x80DD; - public static final int GL_COLOR_TABLE_LUMINANCE_SIZE_EXT = 0x80DE; - public static final int GL_COLOR_TABLE_INTENSITY_SIZE_EXT = 0x80DF; + int GL_COLOR_TABLE_FORMAT_EXT = 0x80D8; + int GL_COLOR_TABLE_WIDTH_EXT = 0x80D9; + int GL_COLOR_TABLE_RED_SIZE_EXT = 0x80DA; + int GL_COLOR_TABLE_GREEN_SIZE_EXT = 0x80DB; + int GL_COLOR_TABLE_BLUE_SIZE_EXT = 0x80DC; + int GL_COLOR_TABLE_ALPHA_SIZE_EXT = 0x80DD; + int GL_COLOR_TABLE_LUMINANCE_SIZE_EXT = 0x80DE; + int GL_COLOR_TABLE_INTENSITY_SIZE_EXT = 0x80DF; /* * Accepted by the value parameter of GetTexLevelParameter{if}v: */ - public static final int GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED; + int GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED; - public void glColorTableEXT(@GLenum int target, @GLenum int internalFormat, @GLsizei int width, @GLenum int format, @GLenum int type, + void glColorTableEXT(@GLenum int target, @GLenum int internalFormat, @GLsizei int width, @GLenum int format, @GLenum int type, @Check("GLBufferChecks.calculateImageStorage(data, format, type, width, 1, 1)") @Const @GLbyte @@ -74,7 +74,7 @@ public interface EXT_paletted_texture { @GLfloat Buffer data); - public void glColorSubTableEXT(@GLenum int target, @GLsizei int start, @GLsizei int count, @GLenum int format, @GLenum int type, + void glColorSubTableEXT(@GLenum int target, @GLsizei int start, @GLsizei int count, @GLenum int format, @GLenum int type, @Check("GLBufferChecks.calculateImageStorage(data, format, type, count, 1, 1)") @Const @GLbyte @@ -83,7 +83,7 @@ public interface EXT_paletted_texture { @GLfloat Buffer data); - public void glGetColorTableEXT(@GLenum int target, @GLenum int format, @GLenum int type, + void glGetColorTableEXT(@GLenum int target, @GLenum int format, @GLenum int type, @Check @GLbyte @GLshort @@ -92,7 +92,7 @@ public interface EXT_paletted_texture { Buffer data); @StripPostfix("params") - public void glGetColorTableParameterivEXT(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetColorTableParameterivEXT(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetColorTableParameterfvEXT(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetColorTableParameterfvEXT(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/EXT_pixel_buffer_object.java b/src/templates/org/lwjgl/opengl/EXT_pixel_buffer_object.java index acad8a7f..dc56c6b9 100644 --- a/src/templates/org/lwjgl/opengl/EXT_pixel_buffer_object.java +++ b/src/templates/org/lwjgl/opengl/EXT_pixel_buffer_object.java @@ -37,13 +37,13 @@ public interface EXT_pixel_buffer_object extends ARB_buffer_object { * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, * GetBufferParameteriv, and GetBufferPointerv: */ - public static final int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB; - public static final int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC; + int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB; + int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED; - public static final int PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF; + int PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED; + int PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF; } diff --git a/src/templates/org/lwjgl/opengl/EXT_point_parameters.java b/src/templates/org/lwjgl/opengl/EXT_point_parameters.java index 873920dd..47c99d5e 100644 --- a/src/templates/org/lwjgl/opengl/EXT_point_parameters.java +++ b/src/templates/org/lwjgl/opengl/EXT_point_parameters.java @@ -36,13 +36,13 @@ import java.nio.FloatBuffer; import org.lwjgl.generator.*; public interface EXT_point_parameters { - 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; + int GL_POINT_SIZE_MIN_EXT = 0x8126; + int GL_POINT_SIZE_MAX_EXT = 0x8127; + int GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128; + int GL_DISTANCE_ATTENUATION_EXT = 0x8129; - public void glPointParameterfEXT(@GLenum int pname, float param); + void glPointParameterfEXT(@GLenum int pname, float param); @StripPostfix("pfParams") - public void glPointParameterfvEXT(@GLenum int pname, @Check("4") @Const FloatBuffer pfParams); + void glPointParameterfvEXT(@GLenum int pname, @Check("4") @Const FloatBuffer pfParams); } diff --git a/src/templates/org/lwjgl/opengl/EXT_rescale_normal.java b/src/templates/org/lwjgl/opengl/EXT_rescale_normal.java index e67cd47e..8b982121 100644 --- a/src/templates/org/lwjgl/opengl/EXT_rescale_normal.java +++ b/src/templates/org/lwjgl/opengl/EXT_rescale_normal.java @@ -32,5 +32,5 @@ package org.lwjgl.opengl; public interface EXT_rescale_normal { - public static final int GL_RESCALE_NORMAL_EXT = 0x803A; + int GL_RESCALE_NORMAL_EXT = 0x803A; } diff --git a/src/templates/org/lwjgl/opengl/EXT_secondary_color.java b/src/templates/org/lwjgl/opengl/EXT_secondary_color.java index 0420d285..f82fb217 100644 --- a/src/templates/org/lwjgl/opengl/EXT_secondary_color.java +++ b/src/templates/org/lwjgl/opengl/EXT_secondary_color.java @@ -32,27 +32,25 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.FloatBuffer; import org.lwjgl.generator.*; public interface EXT_secondary_color { - 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; + int GL_COLOR_SUM_EXT = 0x8458; + int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459; + int GL_SECONDARY_COLOR_ARRAY_SIZE_EXT = 0x845A; + int GL_SECONDARY_COLOR_ARRAY_TYPE_EXT = 0x845B; + int GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT = 0x845C; + int GL_SECONDARY_COLOR_ARRAY_POINTER_EXT = 0x845D; + int GL_SECONDARY_COLOR_ARRAY_EXT = 0x845E; - public void glSecondaryColor3bEXT(byte red, byte green, byte blue); + void glSecondaryColor3bEXT(byte red, byte green, byte blue); - public void glSecondaryColor3fEXT(float red, float green, float blue); + void glSecondaryColor3fEXT(float red, float green, float blue); - public void glSecondaryColor3ubEXT(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); + void glSecondaryColor3ubEXT(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); - public void glSecondaryColorPointerEXT(int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, + void glSecondaryColorPointerEXT(int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @GLbyte diff --git a/src/templates/org/lwjgl/opengl/EXT_separate_specular_color.java b/src/templates/org/lwjgl/opengl/EXT_separate_specular_color.java index 28c0e95d..03525db5 100644 --- a/src/templates/org/lwjgl/opengl/EXT_separate_specular_color.java +++ b/src/templates/org/lwjgl/opengl/EXT_separate_specular_color.java @@ -32,7 +32,7 @@ package org.lwjgl.opengl; public interface EXT_separate_specular_color { - 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; + int GL_SINGLE_COLOR_EXT = 0x81F9; + int GL_SEPARATE_SPECULAR_COLOR_EXT = 0x81FA; + int GL_LIGHT_MODEL_COLOR_CONTROL_EXT = 0x81F8; } diff --git a/src/templates/org/lwjgl/opengl/EXT_shared_texture_palette.java b/src/templates/org/lwjgl/opengl/EXT_shared_texture_palette.java index 904b88ac..db21a369 100644 --- a/src/templates/org/lwjgl/opengl/EXT_shared_texture_palette.java +++ b/src/templates/org/lwjgl/opengl/EXT_shared_texture_palette.java @@ -32,5 +32,5 @@ package org.lwjgl.opengl; public interface EXT_shared_texture_palette { - public static final int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB; + int GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB; } diff --git a/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java b/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java index c3da79f1..8fe897a7 100644 --- a/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java +++ b/src/templates/org/lwjgl/opengl/EXT_stencil_two_side.java @@ -34,8 +34,8 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; public interface EXT_stencil_two_side { - public static final int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910; - public static final int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911; + int GL_STENCIL_TEST_TWO_SIDE_EXT = 0x8910; + int GL_ACTIVE_STENCIL_FACE_EXT = 0x8911; - public void glActiveStencilFaceEXT(@GLenum int face); + void glActiveStencilFaceEXT(@GLenum int face); } diff --git a/src/templates/org/lwjgl/opengl/EXT_stencil_wrap.java b/src/templates/org/lwjgl/opengl/EXT_stencil_wrap.java index ca9973f3..c798264e 100644 --- a/src/templates/org/lwjgl/opengl/EXT_stencil_wrap.java +++ b/src/templates/org/lwjgl/opengl/EXT_stencil_wrap.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface EXT_stencil_wrap { - public static final int GL_INCR_WRAP_EXT = 0x8507; - public static final int GL_DECR_WRAP_EXT = 0x8508; + int GL_INCR_WRAP_EXT = 0x8507; + int GL_DECR_WRAP_EXT = 0x8508; } diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java b/src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java index cd85a49b..dda253c7 100644 --- a/src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java +++ b/src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java @@ -35,8 +35,8 @@ import org.lwjgl.generator.*; @Extension(postfix="EXT", className="EXTTextureCompressionS3TC") public interface EXT_texture_compression_s3tc { - 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; + int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0; + int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1; + int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2; + int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3; } diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_env_combine.java b/src/templates/org/lwjgl/opengl/EXT_texture_env_combine.java index 625928a4..8c815125 100644 --- a/src/templates/org/lwjgl/opengl/EXT_texture_env_combine.java +++ b/src/templates/org/lwjgl/opengl/EXT_texture_env_combine.java @@ -33,25 +33,25 @@ package org.lwjgl.opengl; /** Insert the type's description here. Creation date: (22/02/00 01:26:05) */ public interface EXT_texture_env_combine { - 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; + int GL_COMBINE_EXT = 0x8570; + int GL_COMBINE_RGB_EXT = 0x8571; + int GL_COMBINE_ALPHA_EXT = 0x8572; + int GL_SOURCE0_RGB_EXT = 0x8580; + int GL_SOURCE1_RGB_EXT = 0x8581; + int GL_SOURCE2_RGB_EXT = 0x8582; + int GL_SOURCE0_ALPHA_EXT = 0x8588; + int GL_SOURCE1_ALPHA_EXT = 0x8589; + int GL_SOURCE2_ALPHA_EXT = 0x858A; + int GL_OPERAND0_RGB_EXT = 0x8590; + int GL_OPERAND1_RGB_EXT = 0x8591; + int GL_OPERAND2_RGB_EXT = 0x8592; + int GL_OPERAND0_ALPHA_EXT = 0x8598; + int GL_OPERAND1_ALPHA_EXT = 0x8599; + int GL_OPERAND2_ALPHA_EXT = 0x859A; + int GL_RGB_SCALE_EXT = 0x8573; + int GL_ADD_SIGNED_EXT = 0x8574; + int GL_INTERPOLATE_EXT = 0x8575; + int GL_CONSTANT_EXT = 0x8576; + int GL_PRIMARY_COLOR_EXT = 0x8577; + int GL_PREVIOUS_EXT = 0x8578; } diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_env_dot3.java b/src/templates/org/lwjgl/opengl/EXT_texture_env_dot3.java index f4e61dd3..b2386f72 100644 --- a/src/templates/org/lwjgl/opengl/EXT_texture_env_dot3.java +++ b/src/templates/org/lwjgl/opengl/EXT_texture_env_dot3.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface EXT_texture_env_dot3 { - public static final int GL_DOT3_RGB_EXT = 0x8740; - public static final int GL_DOT3_RGBA_EXT = 0x8741; + int GL_DOT3_RGB_EXT = 0x8740; + int GL_DOT3_RGBA_EXT = 0x8741; } diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_filter_anisotropic.java b/src/templates/org/lwjgl/opengl/EXT_texture_filter_anisotropic.java index 0585538d..6f992cd4 100644 --- a/src/templates/org/lwjgl/opengl/EXT_texture_filter_anisotropic.java +++ b/src/templates/org/lwjgl/opengl/EXT_texture_filter_anisotropic.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface EXT_texture_filter_anisotropic { - public static final int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE; - public static final int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF; + int GL_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FE; + int GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT = 0x84FF; } diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java b/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java index 12317aa8..4606b41a 100644 --- a/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java +++ b/src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java @@ -35,7 +35,7 @@ import org.lwjgl.generator.*; @Extension(postfix="EXT", className="EXTTextureLODBias") public interface EXT_texture_lod_bias { - 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; + int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500; + int GL_TEXTURE_LOD_BIAS_EXT = 0x8501; + int GL_MAX_TEXTURE_LOD_BIAS_EXT = 0x84FD; } diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_mirror_clamp.java b/src/templates/org/lwjgl/opengl/EXT_texture_mirror_clamp.java index 95984c9c..6e056213 100644 --- a/src/templates/org/lwjgl/opengl/EXT_texture_mirror_clamp.java +++ b/src/templates/org/lwjgl/opengl/EXT_texture_mirror_clamp.java @@ -38,7 +38,7 @@ public interface EXT_texture_mirror_clamp { * when their parameter is TEXTURE_WRAP_S, TEXTURE_WRAP_T, * or TEXTURE_WRAP_R: */ - public static final int GL_MIRROR_CLAMP_EXT = 0x8742; - public static final int GL_MIRROR_CLAMP_TO_EDGE_EXT = 0x8743; - public static final int GL_MIRROR_CLAMP_TO_BORDER_EXT = 0x8912; + int GL_MIRROR_CLAMP_EXT = 0x8742; + int GL_MIRROR_CLAMP_TO_EDGE_EXT = 0x8743; + int GL_MIRROR_CLAMP_TO_BORDER_EXT = 0x8912; } diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_rectangle.java b/src/templates/org/lwjgl/opengl/EXT_texture_rectangle.java index aa7e2f4f..bfe71b46 100644 --- a/src/templates/org/lwjgl/opengl/EXT_texture_rectangle.java +++ b/src/templates/org/lwjgl/opengl/EXT_texture_rectangle.java @@ -32,8 +32,8 @@ package org.lwjgl.opengl; public interface EXT_texture_rectangle { - 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; + int GL_TEXTURE_RECTANGLE_EXT = 0x84F5; + int GL_TEXTURE_BINDING_RECTANGLE_EXT = 0x84F6; + int GL_PROXY_TEXTURE_RECTANGLE_EXT = 0x84F7; + int GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT = 0x84F8; } diff --git a/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java b/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java index bbdd8b6a..f5989452 100644 --- a/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java +++ b/src/templates/org/lwjgl/opengl/EXT_vertex_shader.java @@ -40,144 +40,144 @@ import java.nio.ShortBuffer; import org.lwjgl.generator.*; public interface EXT_vertex_shader { - 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; + int GL_VERTEX_SHADER_EXT = 0x8780; + int GL_VERTEX_SHADER_BINDING_EXT = 0x8781; + int GL_OP_INDEX_EXT = 0x8782; + int GL_OP_NEGATE_EXT = 0x8783; + int GL_OP_DOT3_EXT = 0x8784; + int GL_OP_DOT4_EXT = 0x8785; + int GL_OP_MUL_EXT = 0x8786; + int GL_OP_ADD_EXT = 0x8787; + int GL_OP_MADD_EXT = 0x8788; + int GL_OP_FRAC_EXT = 0x8789; + int GL_OP_MAX_EXT = 0x878A; + int GL_OP_MIN_EXT = 0x878B; + int GL_OP_SET_GE_EXT = 0x878C; + int GL_OP_SET_LT_EXT = 0x878D; + int GL_OP_CLAMP_EXT = 0x878E; + int GL_OP_FLOOR_EXT = 0x878F; + int GL_OP_ROUND_EXT = 0x8790; + int GL_OP_EXP_BASE_2_EXT = 0x8791; + int GL_OP_LOG_BASE_2_EXT = 0x8792; + int GL_OP_POWER_EXT = 0x8793; + int GL_OP_RECIP_EXT = 0x8794; + int GL_OP_RECIP_SQRT_EXT = 0x8795; + int GL_OP_SUB_EXT = 0x8796; + int GL_OP_CROSS_PRODUCT_EXT = 0x8797; + int GL_OP_MULTIPLY_MATRIX_EXT = 0x8798; + int GL_OP_MOV_EXT = 0x8799; + int GL_OUTPUT_VERTEX_EXT = 0x879A; + int GL_OUTPUT_COLOR0_EXT = 0x879B; + int GL_OUTPUT_COLOR1_EXT = 0x879C; + int GL_OUTPUT_TEXTURE_COORD0_EXT = 0x879D; + int GL_OUTPUT_TEXTURE_COORD1_EXT = 0x879E; + int GL_OUTPUT_TEXTURE_COORD2_EXT = 0x879F; + int GL_OUTPUT_TEXTURE_COORD3_EXT = 0x87A0; + int GL_OUTPUT_TEXTURE_COORD4_EXT = 0x87A1; + int GL_OUTPUT_TEXTURE_COORD5_EXT = 0x87A2; + int GL_OUTPUT_TEXTURE_COORD6_EXT = 0x87A3; + int GL_OUTPUT_TEXTURE_COORD7_EXT = 0x87A4; + int GL_OUTPUT_TEXTURE_COORD8_EXT = 0x87A5; + int GL_OUTPUT_TEXTURE_COORD9_EXT = 0x87A6; + int GL_OUTPUT_TEXTURE_COORD10_EXT = 0x87A7; + int GL_OUTPUT_TEXTURE_COORD11_EXT = 0x87A8; + int GL_OUTPUT_TEXTURE_COORD12_EXT = 0x87A9; + int GL_OUTPUT_TEXTURE_COORD13_EXT = 0x87AA; + int GL_OUTPUT_TEXTURE_COORD14_EXT = 0x87AB; + int GL_OUTPUT_TEXTURE_COORD15_EXT = 0x87AC; + int GL_OUTPUT_TEXTURE_COORD16_EXT = 0x87AD; + int GL_OUTPUT_TEXTURE_COORD17_EXT = 0x87AE; + int GL_OUTPUT_TEXTURE_COORD18_EXT = 0x87AF; + int GL_OUTPUT_TEXTURE_COORD19_EXT = 0x87B0; + int GL_OUTPUT_TEXTURE_COORD20_EXT = 0x87B1; + int GL_OUTPUT_TEXTURE_COORD21_EXT = 0x87B2; + int GL_OUTPUT_TEXTURE_COORD22_EXT = 0x87B3; + int GL_OUTPUT_TEXTURE_COORD23_EXT = 0x87B4; + int GL_OUTPUT_TEXTURE_COORD24_EXT = 0x87B5; + int GL_OUTPUT_TEXTURE_COORD25_EXT = 0x87B6; + int GL_OUTPUT_TEXTURE_COORD26_EXT = 0x87B7; + int GL_OUTPUT_TEXTURE_COORD27_EXT = 0x87B8; + int GL_OUTPUT_TEXTURE_COORD28_EXT = 0x87B9; + int GL_OUTPUT_TEXTURE_COORD29_EXT = 0x87BA; + int GL_OUTPUT_TEXTURE_COORD30_EXT = 0x87BB; + int GL_OUTPUT_TEXTURE_COORD31_EXT = 0x87BC; + int GL_OUTPUT_FOG_EXT = 0x87BD; + int GL_SCALAR_EXT = 0x87BE; + int GL_VECTOR_EXT = 0x87BF; + int GL_MATRIX_EXT = 0x87C0; + int GL_VARIANT_EXT = 0x87C1; + int GL_INVARIANT_EXT = 0x87C2; + int GL_LOCAL_CONSTANT_EXT = 0x87C3; + int GL_LOCAL_EXT = 0x87C4; + int GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87C5; + int GL_MAX_VERTEX_SHADER_VARIANTS_EXT = 0x87C6; + int GL_MAX_VERTEX_SHADER_INVARIANTS_EXT = 0x87C7; + int GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87C8; + int GL_MAX_VERTEX_SHADER_LOCALS_EXT = 0x87C9; + int GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CA; + int GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT = 0x87CB; + int GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT = 0x87CC; + int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87CD; + int GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT = 0x87CE; + int GL_VERTEX_SHADER_INSTRUCTIONS_EXT = 0x87CF; + int GL_VERTEX_SHADER_VARIANTS_EXT = 0x87D0; + int GL_VERTEX_SHADER_INVARIANTS_EXT = 0x87D1; + int GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT = 0x87D2; + int GL_VERTEX_SHADER_LOCALS_EXT = 0x87D3; + int GL_VERTEX_SHADER_OPTIMIZED_EXT = 0x87D4; + int GL_X_EXT = 0x87D5; + int GL_Y_EXT = 0x87D6; + int GL_Z_EXT = 0x87D7; + int GL_W_EXT = 0x87D8; + int GL_NEGATIVE_X_EXT = 0x87D9; + int GL_NEGATIVE_Y_EXT = 0x87DA; + int GL_NEGATIVE_Z_EXT = 0x87DB; + int GL_NEGATIVE_W_EXT = 0x87DC; + int GL_ZERO_EXT = 0x87DD; + int GL_ONE_EXT = 0x87DE; + int GL_NEGATIVE_ONE_EXT = 0x87DF; + int GL_NORMALIZED_RANGE_EXT = 0x87E0; + int GL_FULL_RANGE_EXT = 0x87E1; + int GL_CURRENT_VERTEX_EXT = 0x87E2; + int GL_MVP_MATRIX_EXT = 0x87E3; + int GL_VARIANT_VALUE_EXT = 0x87E4; + int GL_VARIANT_DATATYPE_EXT = 0x87E5; + int GL_VARIANT_ARRAY_STRIDE_EXT = 0x87E6; + int GL_VARIANT_ARRAY_TYPE_EXT = 0x87E7; + int GL_VARIANT_ARRAY_EXT = 0x87E8; + int GL_VARIANT_ARRAY_POINTER_EXT = 0x87E9; + int GL_INVARIANT_VALUE_EXT = 0x87EA; + int GL_INVARIANT_DATATYPE_EXT = 0x87EB; + int GL_LOCAL_CONSTANT_VALUE_EXT = 0x87EC; + int GL_LOCAL_CONSTANT_DATATYPE_EXT = 0x87ED; - public void glBeginVertexShaderEXT(); + void glBeginVertexShaderEXT(); - public void glEndVertexShaderEXT(); + void glEndVertexShaderEXT(); - public void glBindVertexShaderEXT(@GLuint int id); + void glBindVertexShaderEXT(@GLuint int id); - public @GLuint int glGenVertexShadersEXT(@GLuint int range); + @GLuint int glGenVertexShadersEXT(@GLuint int range); - public void glDeleteVertexShaderEXT(@GLuint int id); + void glDeleteVertexShaderEXT(@GLuint int id); - public void glShaderOp1EXT(@GLenum int op, @GLuint int res, @GLuint int arg1); + void glShaderOp1EXT(@GLenum int op, @GLuint int res, @GLuint int arg1); - public void glShaderOp2EXT(@GLenum int op, @GLuint int res, @GLuint int arg1, @GLuint int arg2); + void glShaderOp2EXT(@GLenum int op, @GLuint int res, @GLuint int arg1, @GLuint int arg2); - public void glShaderOp3EXT(@GLenum int op, @GLuint int res, @GLuint int arg1, @GLuint int arg2, @GLuint int arg3); + void glShaderOp3EXT(@GLenum int op, @GLuint int res, @GLuint int arg1, @GLuint int arg2, @GLuint int arg3); - public void glSwizzleEXT(@GLuint int res, @GLuint int in, @GLenum int outX, @GLenum int outY, @GLenum int outZ, @GLenum int outW); + void glSwizzleEXT(@GLuint int res, @GLuint int in, @GLenum int outX, @GLenum int outY, @GLenum int outZ, @GLenum int outW); - public void glWriteMaskEXT(@GLuint int res, @GLuint int in, @GLenum int outX, @GLenum int outY, @GLenum int outZ, @GLenum int outW); + void glWriteMaskEXT(@GLuint int res, @GLuint int in, @GLenum int outX, @GLenum int outY, @GLenum int outZ, @GLenum int outW); - public void glInsertComponentEXT(@GLuint int res, @GLuint int src, @GLuint int num); + void glInsertComponentEXT(@GLuint int res, @GLuint int src, @GLuint int num); - public void glExtractComponentEXT(@GLuint int res, @GLuint int src, @GLuint int num); + void glExtractComponentEXT(@GLuint int res, @GLuint int src, @GLuint int num); - public @GLuint int glGenSymbolsEXT(@GLenum int dataType, @GLenum int storageType, @GLenum int range, @GLuint int components); + @GLuint int glGenSymbolsEXT(@GLenum int dataType, @GLenum int storageType, @GLenum int range, @GLuint int components); - public void glSetInvariantEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type, + void glSetInvariantEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type, @Check("4") @GLbyte @GLubyte @@ -188,7 +188,7 @@ public interface EXT_vertex_shader { @GLfloat Buffer pAddr); - public void glSetLocalConstantEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type, + void glSetLocalConstantEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type, @Check("4") @GLbyte @GLubyte @@ -200,22 +200,22 @@ public interface EXT_vertex_shader { Buffer pAddr); @StripPostfix("pAddr") - public void glVariantbvEXT(@GLuint int id, @Check("4") ByteBuffer pAddr); + void glVariantbvEXT(@GLuint int id, @Check("4") ByteBuffer pAddr); @StripPostfix("pAddr") - public void glVariantsvEXT(@GLuint int id, @Check("4") ShortBuffer pAddr); + void glVariantsvEXT(@GLuint int id, @Check("4") ShortBuffer pAddr); @StripPostfix("pAddr") - public void glVariantivEXT(@GLuint int id, @Check("4") IntBuffer pAddr); + void glVariantivEXT(@GLuint int id, @Check("4") IntBuffer pAddr); @StripPostfix("pAddr") - public void glVariantfvEXT(@GLuint int id, @Check("4") FloatBuffer pAddr); + void glVariantfvEXT(@GLuint int id, @Check("4") FloatBuffer pAddr); @StripPostfix("pAddr") - public void glVariantubvEXT(@GLuint int id, @Check("4") @GLubyte ByteBuffer pAddr); + void glVariantubvEXT(@GLuint int id, @Check("4") @GLubyte ByteBuffer pAddr); @StripPostfix("pAddr") - public void glVariantusvEXT(@GLuint int id, @Check("4") @GLushort ShortBuffer pAddr); + void glVariantusvEXT(@GLuint int id, @Check("4") @GLushort ShortBuffer pAddr); @StripPostfix("pAddr") - public void glVariantuivEXT(@GLuint int id, @Check("4") @GLuint IntBuffer pAddr); + void glVariantuivEXT(@GLuint int id, @Check("4") @GLuint IntBuffer pAddr); - public void glVariantPointerEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type, @GLuint int stride, + void glVariantPointerEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type, @GLuint int stride, @BufferObject(BufferKind.ArrayVBO) @Check @GLbyte @@ -227,42 +227,42 @@ public interface EXT_vertex_shader { @GLfloat Buffer pAddr); - public void glEnableVariantClientStateEXT(@GLuint int id); + void glEnableVariantClientStateEXT(@GLuint int id); - public void glDisableVariantClientStateEXT(@GLuint int id); + void glDisableVariantClientStateEXT(@GLuint int id); - public @GLuint int glBindLightParameterEXT(@GLenum int light, @GLenum int value); + @GLuint int glBindLightParameterEXT(@GLenum int light, @GLenum int value); - public @GLuint int glBindMaterialParameterEXT(@GLenum int face, @GLenum int value); + @GLuint int glBindMaterialParameterEXT(@GLenum int face, @GLenum int value); - public @GLuint int glBindTexGenParameterEXT(@GLenum int unit, @GLenum int coord, @GLenum int value); + @GLuint int glBindTexGenParameterEXT(@GLenum int unit, @GLenum int coord, @GLenum int value); - public @GLuint int glBindTextureUnitParameterEXT(@GLenum int unit, @GLenum int value); + @GLuint int glBindTextureUnitParameterEXT(@GLenum int unit, @GLenum int value); - public @GLuint int glBindParameterEXT(@GLenum int value); + @GLuint int glBindParameterEXT(@GLenum int value); - public boolean glIsVariantEnabledEXT(@GLuint int id, @GLenum int cap); + boolean glIsVariantEnabledEXT(@GLuint int id, @GLenum int cap); @StripPostfix("pbData") - public void glGetVariantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData); + void glGetVariantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData); @StripPostfix("pbData") - public void glGetVariantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData); + void glGetVariantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData); @StripPostfix("pbData") - public void glGetVariantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData); + void glGetVariantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData); @StripPostfix("pbData") - public void glGetVariantPointervEXT(@GLuint int id, @GLenum int value, @Result @GLvoid ByteBuffer pbData); + void glGetVariantPointervEXT(@GLuint int id, @GLenum int value, @Result @GLvoid ByteBuffer pbData); @StripPostfix("pbData") - public void glGetInvariantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData); + void glGetInvariantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData); @StripPostfix("pbData") - public void glGetInvariantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData); + void glGetInvariantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData); @StripPostfix("pbData") - public void glGetInvariantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData); + void glGetInvariantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData); @StripPostfix("pbData") - public void glGetLocalConstantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData); + void glGetLocalConstantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData); @StripPostfix("pbData") - public void glGetLocalConstantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData); + void glGetLocalConstantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData); @StripPostfix("pbData") - public void glGetLocalConstantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData); + void glGetLocalConstantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData); } diff --git a/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java b/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java index 7e7f3fd4..b95422fa 100644 --- a/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java +++ b/src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java @@ -32,28 +32,27 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.FloatBuffer; import org.lwjgl.generator.*; public interface EXT_vertex_weighting { - 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; + int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3; + int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502; + int GL_MODELVIEW0_MATRIX_EXT = 0x0BA6; + int GL_MODELVIEW1_MATRIX_EXT = 0x8506; + int GL_VERTEX_WEIGHTING_EXT = 0x8509; + int GL_MODELVIEW0_EXT = 0x1700; + int GL_MODELVIEW1_EXT = 0x850A; + int GL_CURRENT_VERTEX_WEIGHT_EXT = 0x850B; + int GL_VERTEX_WEIGHT_ARRAY_EXT = 0x850C; + int GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT = 0x850D; + int GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT = 0x850E; + int GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT = 0x850F; + int GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT = 0x8510; - public void glVertexWeightfEXT(float weight); + void glVertexWeightfEXT(float weight); - public void glVertexWeightPointerEXT(@GLsizei int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, + void glVertexWeightPointerEXT(@GLsizei int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const diff --git a/src/templates/org/lwjgl/opengl/GL11.java b/src/templates/org/lwjgl/opengl/GL11.java index 333a2da9..afc878fd 100644 --- a/src/templates/org/lwjgl/opengl/GL11.java +++ b/src/templates/org/lwjgl/opengl/GL11.java @@ -46,380 +46,380 @@ import org.lwjgl.generator.*; public interface GL11 { /* AccumOp */ - public static final int GL_ACCUM = 0x0100; - public static final int GL_LOAD = 0x0101; - public static final int GL_RETURN = 0x0102; - public static final int GL_MULT = 0x0103; - public static final int GL_ADD = 0x0104; + int GL_ACCUM = 0x0100; + int GL_LOAD = 0x0101; + int GL_RETURN = 0x0102; + int GL_MULT = 0x0103; + int GL_ADD = 0x0104; /* AlphaFunction */ - public static final int GL_NEVER = 0x0200; - public static final int GL_LESS = 0x0201; - public static final int GL_EQUAL = 0x0202; - public static final int GL_LEQUAL = 0x0203; - public static final int GL_GREATER = 0x0204; - public static final int GL_NOTEQUAL = 0x0205; - public static final int GL_GEQUAL = 0x0206; - public static final int GL_ALWAYS = 0x0207; + int GL_NEVER = 0x0200; + int GL_LESS = 0x0201; + int GL_EQUAL = 0x0202; + int GL_LEQUAL = 0x0203; + int GL_GREATER = 0x0204; + int GL_NOTEQUAL = 0x0205; + int GL_GEQUAL = 0x0206; + int GL_ALWAYS = 0x0207; /* AttribMask */ - public static final int GL_CURRENT_BIT = 0x00000001; - public static final int GL_POINT_BIT = 0x00000002; - public static final int GL_LINE_BIT = 0x00000004; - public static final int GL_POLYGON_BIT = 0x00000008; - public static final int GL_POLYGON_STIPPLE_BIT = 0x00000010; - public static final int GL_PIXEL_MODE_BIT = 0x00000020; - public static final int GL_LIGHTING_BIT = 0x00000040; - public static final int GL_FOG_BIT = 0x00000080; - public static final int GL_DEPTH_BUFFER_BIT = 0x00000100; - public static final int GL_ACCUM_BUFFER_BIT = 0x00000200; - public static final int GL_STENCIL_BUFFER_BIT = 0x00000400; - public static final int GL_VIEWPORT_BIT = 0x00000800; - public static final int GL_TRANSFORM_BIT = 0x00001000; - public static final int GL_ENABLE_BIT = 0x00002000; - public static final int GL_COLOR_BUFFER_BIT = 0x00004000; - public static final int GL_HINT_BIT = 0x00008000; - public static final int GL_EVAL_BIT = 0x00010000; - public static final int GL_LIST_BIT = 0x00020000; - public static final int GL_TEXTURE_BIT = 0x00040000; - public static final int GL_SCISSOR_BIT = 0x00080000; - public static final int GL_ALL_ATTRIB_BITS = 0x000fffff; + int GL_CURRENT_BIT = 0x00000001; + int GL_POINT_BIT = 0x00000002; + int GL_LINE_BIT = 0x00000004; + int GL_POLYGON_BIT = 0x00000008; + int GL_POLYGON_STIPPLE_BIT = 0x00000010; + int GL_PIXEL_MODE_BIT = 0x00000020; + int GL_LIGHTING_BIT = 0x00000040; + int GL_FOG_BIT = 0x00000080; + int GL_DEPTH_BUFFER_BIT = 0x00000100; + int GL_ACCUM_BUFFER_BIT = 0x00000200; + int GL_STENCIL_BUFFER_BIT = 0x00000400; + int GL_VIEWPORT_BIT = 0x00000800; + int GL_TRANSFORM_BIT = 0x00001000; + int GL_ENABLE_BIT = 0x00002000; + int GL_COLOR_BUFFER_BIT = 0x00004000; + int GL_HINT_BIT = 0x00008000; + int GL_EVAL_BIT = 0x00010000; + int GL_LIST_BIT = 0x00020000; + int GL_TEXTURE_BIT = 0x00040000; + int GL_SCISSOR_BIT = 0x00080000; + int GL_ALL_ATTRIB_BITS = 0x000fffff; /* BeginMode */ - public static final int GL_POINTS = 0x0000; - public static final int GL_LINES = 0x0001; - public static final int GL_LINE_LOOP = 0x0002; - public static final int GL_LINE_STRIP = 0x0003; - public static final int GL_TRIANGLES = 0x0004; - public static final int GL_TRIANGLE_STRIP = 0x0005; - public static final int GL_TRIANGLE_FAN = 0x0006; - public static final int GL_QUADS = 0x0007; - public static final int GL_QUAD_STRIP = 0x0008; - public static final int GL_POLYGON = 0x0009; + int GL_POINTS = 0x0000; + int GL_LINES = 0x0001; + int GL_LINE_LOOP = 0x0002; + int GL_LINE_STRIP = 0x0003; + int GL_TRIANGLES = 0x0004; + int GL_TRIANGLE_STRIP = 0x0005; + int GL_TRIANGLE_FAN = 0x0006; + int GL_QUADS = 0x0007; + int GL_QUAD_STRIP = 0x0008; + int GL_POLYGON = 0x0009; /* BlendingFactorDest */ - public static final int GL_ZERO = 0; - public static final int GL_ONE = 1; - public static final int GL_SRC_COLOR = 0x0300; - public static final int GL_ONE_MINUS_SRC_COLOR = 0x0301; - public static final int GL_SRC_ALPHA = 0x0302; - public static final int GL_ONE_MINUS_SRC_ALPHA = 0x0303; - public static final int GL_DST_ALPHA = 0x0304; - public static final int GL_ONE_MINUS_DST_ALPHA = 0x0305; + int GL_ZERO = 0; + int GL_ONE = 1; + int GL_SRC_COLOR = 0x0300; + int GL_ONE_MINUS_SRC_COLOR = 0x0301; + int GL_SRC_ALPHA = 0x0302; + int GL_ONE_MINUS_SRC_ALPHA = 0x0303; + int GL_DST_ALPHA = 0x0304; + int GL_ONE_MINUS_DST_ALPHA = 0x0305; /* BlendingFactorSrc */ /* GL_ZERO */ /* GL_ONE */ - public static final int GL_DST_COLOR = 0x0306; - public static final int GL_ONE_MINUS_DST_COLOR = 0x0307; - public static final int GL_SRC_ALPHA_SATURATE = 0x0308; - 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; + int GL_DST_COLOR = 0x0306; + int GL_ONE_MINUS_DST_COLOR = 0x0307; + int GL_SRC_ALPHA_SATURATE = 0x0308; + int GL_CONSTANT_COLOR = 0x8001; + int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002; + int GL_CONSTANT_ALPHA = 0x8003; + int GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004; /* Boolean */ - public static final int GL_TRUE = 1; - public static final int GL_FALSE = 0; + int GL_TRUE = 1; + int GL_FALSE = 0; /* ClipPlaneName */ - public static final int GL_CLIP_PLANE0 = 0x3000; - public static final int GL_CLIP_PLANE1 = 0x3001; - public static final int GL_CLIP_PLANE2 = 0x3002; - public static final int GL_CLIP_PLANE3 = 0x3003; - public static final int GL_CLIP_PLANE4 = 0x3004; - public static final int GL_CLIP_PLANE5 = 0x3005; + int GL_CLIP_PLANE0 = 0x3000; + int GL_CLIP_PLANE1 = 0x3001; + int GL_CLIP_PLANE2 = 0x3002; + int GL_CLIP_PLANE3 = 0x3003; + int GL_CLIP_PLANE4 = 0x3004; + int GL_CLIP_PLANE5 = 0x3005; /* DataType */ - public static final int GL_BYTE = 0x1400; - public static final int GL_UNSIGNED_BYTE = 0x1401; - public static final int GL_SHORT = 0x1402; - public static final int GL_UNSIGNED_SHORT = 0x1403; - public static final int GL_INT = 0x1404; - public static final int GL_UNSIGNED_INT = 0x1405; - public static final int GL_FLOAT = 0x1406; - public static final int GL_2_BYTES = 0x1407; - public static final int GL_3_BYTES = 0x1408; - public static final int GL_4_BYTES = 0x1409; - public static final int GL_DOUBLE = 0x140A; + int GL_BYTE = 0x1400; + int GL_UNSIGNED_BYTE = 0x1401; + int GL_SHORT = 0x1402; + int GL_UNSIGNED_SHORT = 0x1403; + int GL_INT = 0x1404; + int GL_UNSIGNED_INT = 0x1405; + int GL_FLOAT = 0x1406; + int GL_2_BYTES = 0x1407; + int GL_3_BYTES = 0x1408; + int GL_4_BYTES = 0x1409; + int GL_DOUBLE = 0x140A; /* DrawBufferMode */ - public static final int GL_NONE = 0; - public static final int GL_FRONT_LEFT = 0x0400; - public static final int GL_FRONT_RIGHT = 0x0401; - public static final int GL_BACK_LEFT = 0x0402; - public static final int GL_BACK_RIGHT = 0x0403; - public static final int GL_FRONT = 0x0404; - public static final int GL_BACK = 0x0405; - public static final int GL_LEFT = 0x0406; - public static final int GL_RIGHT = 0x0407; - public static final int GL_FRONT_AND_BACK = 0x0408; - public static final int GL_AUX0 = 0x0409; - public static final int GL_AUX1 = 0x040A; - public static final int GL_AUX2 = 0x040B; - public static final int GL_AUX3 = 0x040C; + int GL_NONE = 0; + int GL_FRONT_LEFT = 0x0400; + int GL_FRONT_RIGHT = 0x0401; + int GL_BACK_LEFT = 0x0402; + int GL_BACK_RIGHT = 0x0403; + int GL_FRONT = 0x0404; + int GL_BACK = 0x0405; + int GL_LEFT = 0x0406; + int GL_RIGHT = 0x0407; + int GL_FRONT_AND_BACK = 0x0408; + int GL_AUX0 = 0x0409; + int GL_AUX1 = 0x040A; + int GL_AUX2 = 0x040B; + int GL_AUX3 = 0x040C; /* ErrorCode */ - public static final int GL_NO_ERROR = 0; - public static final int GL_INVALID_ENUM = 0x0500; - public static final int GL_INVALID_VALUE = 0x0501; - public static final int GL_INVALID_OPERATION = 0x0502; - public static final int GL_STACK_OVERFLOW = 0x0503; - public static final int GL_STACK_UNDERFLOW = 0x0504; - public static final int GL_OUT_OF_MEMORY = 0x0505; + int GL_NO_ERROR = 0; + int GL_INVALID_ENUM = 0x0500; + int GL_INVALID_VALUE = 0x0501; + int GL_INVALID_OPERATION = 0x0502; + int GL_STACK_OVERFLOW = 0x0503; + int GL_STACK_UNDERFLOW = 0x0504; + int GL_OUT_OF_MEMORY = 0x0505; /* FeedBackMode */ - public static final int GL_2D = 0x0600; - public static final int GL_3D = 0x0601; - public static final int GL_3D_COLOR = 0x0602; - public static final int GL_3D_COLOR_TEXTURE = 0x0603; - public static final int GL_4D_COLOR_TEXTURE = 0x0604; + int GL_2D = 0x0600; + int GL_3D = 0x0601; + int GL_3D_COLOR = 0x0602; + int GL_3D_COLOR_TEXTURE = 0x0603; + int GL_4D_COLOR_TEXTURE = 0x0604; /* FeedBackToken */ - public static final int GL_PASS_THROUGH_TOKEN = 0x0700; - public static final int GL_POINT_TOKEN = 0x0701; - public static final int GL_LINE_TOKEN = 0x0702; - public static final int GL_POLYGON_TOKEN = 0x0703; - public static final int GL_BITMAP_TOKEN = 0x0704; - public static final int GL_DRAW_PIXEL_TOKEN = 0x0705; - public static final int GL_COPY_PIXEL_TOKEN = 0x0706; - public static final int GL_LINE_RESET_TOKEN = 0x0707; + int GL_PASS_THROUGH_TOKEN = 0x0700; + int GL_POINT_TOKEN = 0x0701; + int GL_LINE_TOKEN = 0x0702; + int GL_POLYGON_TOKEN = 0x0703; + int GL_BITMAP_TOKEN = 0x0704; + int GL_DRAW_PIXEL_TOKEN = 0x0705; + int GL_COPY_PIXEL_TOKEN = 0x0706; + int GL_LINE_RESET_TOKEN = 0x0707; /* FogMode */ /* GL_LINEAR */ - public static final int GL_EXP = 0x0800; - public static final int GL_EXP2 = 0x0801; + int GL_EXP = 0x0800; + int GL_EXP2 = 0x0801; /* FrontFaceDirection */ - public static final int GL_CW = 0x0900; - public static final int GL_CCW = 0x0901; + int GL_CW = 0x0900; + int GL_CCW = 0x0901; /* GetMapTarget */ - public static final int GL_COEFF = 0x0A00; - public static final int GL_ORDER = 0x0A01; - public static final int GL_DOMAIN = 0x0A02; + int GL_COEFF = 0x0A00; + int GL_ORDER = 0x0A01; + int GL_DOMAIN = 0x0A02; /* GetTarget */ - public static final int GL_CURRENT_COLOR = 0x0B00; - public static final int GL_CURRENT_INDEX = 0x0B01; - public static final int GL_CURRENT_NORMAL = 0x0B02; - public static final int GL_CURRENT_TEXTURE_COORDS = 0x0B03; - public static final int GL_CURRENT_RASTER_COLOR = 0x0B04; - public static final int GL_CURRENT_RASTER_INDEX = 0x0B05; - public static final int GL_CURRENT_RASTER_TEXTURE_COORDS = 0x0B06; - public static final int GL_CURRENT_RASTER_POSITION = 0x0B07; - public static final int GL_CURRENT_RASTER_POSITION_VALID = 0x0B08; - public static final int GL_CURRENT_RASTER_DISTANCE = 0x0B09; - public static final int GL_POINT_SMOOTH = 0x0B10; - public static final int GL_POINT_SIZE = 0x0B11; - public static final int GL_POINT_SIZE_RANGE = 0x0B12; - public static final int GL_POINT_SIZE_GRANULARITY = 0x0B13; - public static final int GL_LINE_SMOOTH = 0x0B20; - public static final int GL_LINE_WIDTH = 0x0B21; - public static final int GL_LINE_WIDTH_RANGE = 0x0B22; - public static final int GL_LINE_WIDTH_GRANULARITY = 0x0B23; - public static final int GL_LINE_STIPPLE = 0x0B24; - public static final int GL_LINE_STIPPLE_PATTERN = 0x0B25; - public static final int GL_LINE_STIPPLE_REPEAT = 0x0B26; - public static final int GL_LIST_MODE = 0x0B30; - public static final int GL_MAX_LIST_NESTING = 0x0B31; - public static final int GL_LIST_BASE = 0x0B32; - public static final int GL_LIST_INDEX = 0x0B33; - public static final int GL_POLYGON_MODE = 0x0B40; - public static final int GL_POLYGON_SMOOTH = 0x0B41; - public static final int GL_POLYGON_STIPPLE = 0x0B42; - public static final int GL_EDGE_FLAG = 0x0B43; - public static final int GL_CULL_FACE = 0x0B44; - public static final int GL_CULL_FACE_MODE = 0x0B45; - public static final int GL_FRONT_FACE = 0x0B46; - public static final int GL_LIGHTING = 0x0B50; - public static final int GL_LIGHT_MODEL_LOCAL_VIEWER = 0x0B51; - public static final int GL_LIGHT_MODEL_TWO_SIDE = 0x0B52; - public static final int GL_LIGHT_MODEL_AMBIENT = 0x0B53; - public static final int GL_SHADE_MODEL = 0x0B54; - public static final int GL_COLOR_MATERIAL_FACE = 0x0B55; - public static final int GL_COLOR_MATERIAL_PARAMETER = 0x0B56; - public static final int GL_COLOR_MATERIAL = 0x0B57; - public static final int GL_FOG = 0x0B60; - public static final int GL_FOG_INDEX = 0x0B61; - public static final int GL_FOG_DENSITY = 0x0B62; - public static final int GL_FOG_START = 0x0B63; - public static final int GL_FOG_END = 0x0B64; - public static final int GL_FOG_MODE = 0x0B65; - public static final int GL_FOG_COLOR = 0x0B66; - public static final int GL_DEPTH_RANGE = 0x0B70; - public static final int GL_DEPTH_TEST = 0x0B71; - public static final int GL_DEPTH_WRITEMASK = 0x0B72; - public static final int GL_DEPTH_CLEAR_VALUE = 0x0B73; - public static final int GL_DEPTH_FUNC = 0x0B74; - public static final int GL_ACCUM_CLEAR_VALUE = 0x0B80; - public static final int GL_STENCIL_TEST = 0x0B90; - public static final int GL_STENCIL_CLEAR_VALUE = 0x0B91; - public static final int GL_STENCIL_FUNC = 0x0B92; - public static final int GL_STENCIL_VALUE_MASK = 0x0B93; - public static final int GL_STENCIL_FAIL = 0x0B94; - public static final int GL_STENCIL_PASS_DEPTH_FAIL = 0x0B95; - public static final int GL_STENCIL_PASS_DEPTH_PASS = 0x0B96; - public static final int GL_STENCIL_REF = 0x0B97; - public static final int GL_STENCIL_WRITEMASK = 0x0B98; - public static final int GL_MATRIX_MODE = 0x0BA0; - public static final int GL_NORMALIZE = 0x0BA1; - public static final int GL_VIEWPORT = 0x0BA2; - public static final int GL_MODELVIEW_STACK_DEPTH = 0x0BA3; - public static final int GL_PROJECTION_STACK_DEPTH = 0x0BA4; - public static final int GL_TEXTURE_STACK_DEPTH = 0x0BA5; - public static final int GL_MODELVIEW_MATRIX = 0x0BA6; - public static final int GL_PROJECTION_MATRIX = 0x0BA7; - public static final int GL_TEXTURE_MATRIX = 0x0BA8; - public static final int GL_ATTRIB_STACK_DEPTH = 0x0BB0; - public static final int GL_CLIENT_ATTRIB_STACK_DEPTH = 0x0BB1; - public static final int GL_ALPHA_TEST = 0x0BC0; - public static final int GL_ALPHA_TEST_FUNC = 0x0BC1; - public static final int GL_ALPHA_TEST_REF = 0x0BC2; - public static final int GL_DITHER = 0x0BD0; - public static final int GL_BLEND_DST = 0x0BE0; - public static final int GL_BLEND_SRC = 0x0BE1; - public static final int GL_BLEND = 0x0BE2; - public static final int GL_LOGIC_OP_MODE = 0x0BF0; - public static final int GL_INDEX_LOGIC_OP = 0x0BF1; - public static final int GL_COLOR_LOGIC_OP = 0x0BF2; - public static final int GL_AUX_BUFFERS = 0x0C00; - public static final int GL_DRAW_BUFFER = 0x0C01; - public static final int GL_READ_BUFFER = 0x0C02; - public static final int GL_SCISSOR_BOX = 0x0C10; - public static final int GL_SCISSOR_TEST = 0x0C11; - public static final int GL_INDEX_CLEAR_VALUE = 0x0C20; - public static final int GL_INDEX_WRITEMASK = 0x0C21; - public static final int GL_COLOR_CLEAR_VALUE = 0x0C22; - public static final int GL_COLOR_WRITEMASK = 0x0C23; - public static final int GL_INDEX_MODE = 0x0C30; - public static final int GL_RGBA_MODE = 0x0C31; - public static final int GL_DOUBLEBUFFER = 0x0C32; - public static final int GL_STEREO = 0x0C33; - public static final int GL_RENDER_MODE = 0x0C40; - public static final int GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50; - public static final int GL_POINT_SMOOTH_HINT = 0x0C51; - public static final int GL_LINE_SMOOTH_HINT = 0x0C52; - public static final int GL_POLYGON_SMOOTH_HINT = 0x0C53; - public static final int GL_FOG_HINT = 0x0C54; - public static final int GL_TEXTURE_GEN_S = 0x0C60; - public static final int GL_TEXTURE_GEN_T = 0x0C61; - public static final int GL_TEXTURE_GEN_R = 0x0C62; - public static final int GL_TEXTURE_GEN_Q = 0x0C63; - public static final int GL_PIXEL_MAP_I_TO_I = 0x0C70; - public static final int GL_PIXEL_MAP_S_TO_S = 0x0C71; - public static final int GL_PIXEL_MAP_I_TO_R = 0x0C72; - public static final int GL_PIXEL_MAP_I_TO_G = 0x0C73; - public static final int GL_PIXEL_MAP_I_TO_B = 0x0C74; - public static final int GL_PIXEL_MAP_I_TO_A = 0x0C75; - public static final int GL_PIXEL_MAP_R_TO_R = 0x0C76; - public static final int GL_PIXEL_MAP_G_TO_G = 0x0C77; - public static final int GL_PIXEL_MAP_B_TO_B = 0x0C78; - public static final int GL_PIXEL_MAP_A_TO_A = 0x0C79; - public static final int GL_PIXEL_MAP_I_TO_I_SIZE = 0x0CB0; - public static final int GL_PIXEL_MAP_S_TO_S_SIZE = 0x0CB1; - public static final int GL_PIXEL_MAP_I_TO_R_SIZE = 0x0CB2; - public static final int GL_PIXEL_MAP_I_TO_G_SIZE = 0x0CB3; - public static final int GL_PIXEL_MAP_I_TO_B_SIZE = 0x0CB4; - public static final int GL_PIXEL_MAP_I_TO_A_SIZE = 0x0CB5; - public static final int GL_PIXEL_MAP_R_TO_R_SIZE = 0x0CB6; - public static final int GL_PIXEL_MAP_G_TO_G_SIZE = 0x0CB7; - public static final int GL_PIXEL_MAP_B_TO_B_SIZE = 0x0CB8; - public static final int GL_PIXEL_MAP_A_TO_A_SIZE = 0x0CB9; - public static final int GL_UNPACK_SWAP_BYTES = 0x0CF0; - public static final int GL_UNPACK_LSB_FIRST = 0x0CF1; - public static final int GL_UNPACK_ROW_LENGTH = 0x0CF2; - public static final int GL_UNPACK_SKIP_ROWS = 0x0CF3; - public static final int GL_UNPACK_SKIP_PIXELS = 0x0CF4; - public static final int GL_UNPACK_ALIGNMENT = 0x0CF5; - public static final int GL_PACK_SWAP_BYTES = 0x0D00; - public static final int GL_PACK_LSB_FIRST = 0x0D01; - public static final int GL_PACK_ROW_LENGTH = 0x0D02; - public static final int GL_PACK_SKIP_ROWS = 0x0D03; - public static final int GL_PACK_SKIP_PIXELS = 0x0D04; - public static final int GL_PACK_ALIGNMENT = 0x0D05; - public static final int GL_MAP_COLOR = 0x0D10; - public static final int GL_MAP_STENCIL = 0x0D11; - public static final int GL_INDEX_SHIFT = 0x0D12; - public static final int GL_INDEX_OFFSET = 0x0D13; - public static final int GL_RED_SCALE = 0x0D14; - public static final int GL_RED_BIAS = 0x0D15; - public static final int GL_ZOOM_X = 0x0D16; - public static final int GL_ZOOM_Y = 0x0D17; - public static final int GL_GREEN_SCALE = 0x0D18; - public static final int GL_GREEN_BIAS = 0x0D19; - public static final int GL_BLUE_SCALE = 0x0D1A; - public static final int GL_BLUE_BIAS = 0x0D1B; - public static final int GL_ALPHA_SCALE = 0x0D1C; - public static final int GL_ALPHA_BIAS = 0x0D1D; - public static final int GL_DEPTH_SCALE = 0x0D1E; - public static final int GL_DEPTH_BIAS = 0x0D1F; - public static final int GL_MAX_EVAL_ORDER = 0x0D30; - public static final int GL_MAX_LIGHTS = 0x0D31; - public static final int GL_MAX_CLIP_PLANES = 0x0D32; - public static final int GL_MAX_TEXTURE_SIZE = 0x0D33; - public static final int GL_MAX_PIXEL_MAP_TABLE = 0x0D34; - public static final int GL_MAX_ATTRIB_STACK_DEPTH = 0x0D35; - public static final int GL_MAX_MODELVIEW_STACK_DEPTH = 0x0D36; - public static final int GL_MAX_NAME_STACK_DEPTH = 0x0D37; - public static final int GL_MAX_PROJECTION_STACK_DEPTH = 0x0D38; - public static final int GL_MAX_TEXTURE_STACK_DEPTH = 0x0D39; - public static final int GL_MAX_VIEWPORT_DIMS = 0x0D3A; - public static final int GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = 0x0D3B; - public static final int GL_SUBPIXEL_BITS = 0x0D50; - public static final int GL_INDEX_BITS = 0x0D51; - public static final int GL_RED_BITS = 0x0D52; - public static final int GL_GREEN_BITS = 0x0D53; - public static final int GL_BLUE_BITS = 0x0D54; - public static final int GL_ALPHA_BITS = 0x0D55; - public static final int GL_DEPTH_BITS = 0x0D56; - public static final int GL_STENCIL_BITS = 0x0D57; - public static final int GL_ACCUM_RED_BITS = 0x0D58; - public static final int GL_ACCUM_GREEN_BITS = 0x0D59; - public static final int GL_ACCUM_BLUE_BITS = 0x0D5A; - public static final int GL_ACCUM_ALPHA_BITS = 0x0D5B; - public static final int GL_NAME_STACK_DEPTH = 0x0D70; - public static final int GL_AUTO_NORMAL = 0x0D80; - public static final int GL_MAP1_COLOR_4 = 0x0D90; - public static final int GL_MAP1_INDEX = 0x0D91; - public static final int GL_MAP1_NORMAL = 0x0D92; - public static final int GL_MAP1_TEXTURE_COORD_1 = 0x0D93; - public static final int GL_MAP1_TEXTURE_COORD_2 = 0x0D94; - public static final int GL_MAP1_TEXTURE_COORD_3 = 0x0D95; - public static final int GL_MAP1_TEXTURE_COORD_4 = 0x0D96; - public static final int GL_MAP1_VERTEX_3 = 0x0D97; - public static final int GL_MAP1_VERTEX_4 = 0x0D98; - public static final int GL_MAP2_COLOR_4 = 0x0DB0; - public static final int GL_MAP2_INDEX = 0x0DB1; - public static final int GL_MAP2_NORMAL = 0x0DB2; - public static final int GL_MAP2_TEXTURE_COORD_1 = 0x0DB3; - public static final int GL_MAP2_TEXTURE_COORD_2 = 0x0DB4; - public static final int GL_MAP2_TEXTURE_COORD_3 = 0x0DB5; - public static final int GL_MAP2_TEXTURE_COORD_4 = 0x0DB6; - public static final int GL_MAP2_VERTEX_3 = 0x0DB7; - public static final int GL_MAP2_VERTEX_4 = 0x0DB8; - public static final int GL_MAP1_GRID_DOMAIN = 0x0DD0; - public static final int GL_MAP1_GRID_SEGMENTS = 0x0DD1; - public static final int GL_MAP2_GRID_DOMAIN = 0x0DD2; - public static final int GL_MAP2_GRID_SEGMENTS = 0x0DD3; - public static final int GL_TEXTURE_1D = 0x0DE0; - public static final int GL_TEXTURE_2D = 0x0DE1; - public static final int GL_FEEDBACK_BUFFER_POINTER = 0x0DF0; - public static final int GL_FEEDBACK_BUFFER_SIZE = 0x0DF1; - public static final int GL_FEEDBACK_BUFFER_TYPE = 0x0DF2; - public static final int GL_SELECTION_BUFFER_POINTER = 0x0DF3; - public static final int GL_SELECTION_BUFFER_SIZE = 0x0DF4; + int GL_CURRENT_COLOR = 0x0B00; + int GL_CURRENT_INDEX = 0x0B01; + int GL_CURRENT_NORMAL = 0x0B02; + int GL_CURRENT_TEXTURE_COORDS = 0x0B03; + int GL_CURRENT_RASTER_COLOR = 0x0B04; + int GL_CURRENT_RASTER_INDEX = 0x0B05; + int GL_CURRENT_RASTER_TEXTURE_COORDS = 0x0B06; + int GL_CURRENT_RASTER_POSITION = 0x0B07; + int GL_CURRENT_RASTER_POSITION_VALID = 0x0B08; + int GL_CURRENT_RASTER_DISTANCE = 0x0B09; + int GL_POINT_SMOOTH = 0x0B10; + int GL_POINT_SIZE = 0x0B11; + int GL_POINT_SIZE_RANGE = 0x0B12; + int GL_POINT_SIZE_GRANULARITY = 0x0B13; + int GL_LINE_SMOOTH = 0x0B20; + int GL_LINE_WIDTH = 0x0B21; + int GL_LINE_WIDTH_RANGE = 0x0B22; + int GL_LINE_WIDTH_GRANULARITY = 0x0B23; + int GL_LINE_STIPPLE = 0x0B24; + int GL_LINE_STIPPLE_PATTERN = 0x0B25; + int GL_LINE_STIPPLE_REPEAT = 0x0B26; + int GL_LIST_MODE = 0x0B30; + int GL_MAX_LIST_NESTING = 0x0B31; + int GL_LIST_BASE = 0x0B32; + int GL_LIST_INDEX = 0x0B33; + int GL_POLYGON_MODE = 0x0B40; + int GL_POLYGON_SMOOTH = 0x0B41; + int GL_POLYGON_STIPPLE = 0x0B42; + int GL_EDGE_FLAG = 0x0B43; + int GL_CULL_FACE = 0x0B44; + int GL_CULL_FACE_MODE = 0x0B45; + int GL_FRONT_FACE = 0x0B46; + int GL_LIGHTING = 0x0B50; + int GL_LIGHT_MODEL_LOCAL_VIEWER = 0x0B51; + int GL_LIGHT_MODEL_TWO_SIDE = 0x0B52; + int GL_LIGHT_MODEL_AMBIENT = 0x0B53; + int GL_SHADE_MODEL = 0x0B54; + int GL_COLOR_MATERIAL_FACE = 0x0B55; + int GL_COLOR_MATERIAL_PARAMETER = 0x0B56; + int GL_COLOR_MATERIAL = 0x0B57; + int GL_FOG = 0x0B60; + int GL_FOG_INDEX = 0x0B61; + int GL_FOG_DENSITY = 0x0B62; + int GL_FOG_START = 0x0B63; + int GL_FOG_END = 0x0B64; + int GL_FOG_MODE = 0x0B65; + int GL_FOG_COLOR = 0x0B66; + int GL_DEPTH_RANGE = 0x0B70; + int GL_DEPTH_TEST = 0x0B71; + int GL_DEPTH_WRITEMASK = 0x0B72; + int GL_DEPTH_CLEAR_VALUE = 0x0B73; + int GL_DEPTH_FUNC = 0x0B74; + int GL_ACCUM_CLEAR_VALUE = 0x0B80; + int GL_STENCIL_TEST = 0x0B90; + int GL_STENCIL_CLEAR_VALUE = 0x0B91; + int GL_STENCIL_FUNC = 0x0B92; + int GL_STENCIL_VALUE_MASK = 0x0B93; + int GL_STENCIL_FAIL = 0x0B94; + int GL_STENCIL_PASS_DEPTH_FAIL = 0x0B95; + int GL_STENCIL_PASS_DEPTH_PASS = 0x0B96; + int GL_STENCIL_REF = 0x0B97; + int GL_STENCIL_WRITEMASK = 0x0B98; + int GL_MATRIX_MODE = 0x0BA0; + int GL_NORMALIZE = 0x0BA1; + int GL_VIEWPORT = 0x0BA2; + int GL_MODELVIEW_STACK_DEPTH = 0x0BA3; + int GL_PROJECTION_STACK_DEPTH = 0x0BA4; + int GL_TEXTURE_STACK_DEPTH = 0x0BA5; + int GL_MODELVIEW_MATRIX = 0x0BA6; + int GL_PROJECTION_MATRIX = 0x0BA7; + int GL_TEXTURE_MATRIX = 0x0BA8; + int GL_ATTRIB_STACK_DEPTH = 0x0BB0; + int GL_CLIENT_ATTRIB_STACK_DEPTH = 0x0BB1; + int GL_ALPHA_TEST = 0x0BC0; + int GL_ALPHA_TEST_FUNC = 0x0BC1; + int GL_ALPHA_TEST_REF = 0x0BC2; + int GL_DITHER = 0x0BD0; + int GL_BLEND_DST = 0x0BE0; + int GL_BLEND_SRC = 0x0BE1; + int GL_BLEND = 0x0BE2; + int GL_LOGIC_OP_MODE = 0x0BF0; + int GL_INDEX_LOGIC_OP = 0x0BF1; + int GL_COLOR_LOGIC_OP = 0x0BF2; + int GL_AUX_BUFFERS = 0x0C00; + int GL_DRAW_BUFFER = 0x0C01; + int GL_READ_BUFFER = 0x0C02; + int GL_SCISSOR_BOX = 0x0C10; + int GL_SCISSOR_TEST = 0x0C11; + int GL_INDEX_CLEAR_VALUE = 0x0C20; + int GL_INDEX_WRITEMASK = 0x0C21; + int GL_COLOR_CLEAR_VALUE = 0x0C22; + int GL_COLOR_WRITEMASK = 0x0C23; + int GL_INDEX_MODE = 0x0C30; + int GL_RGBA_MODE = 0x0C31; + int GL_DOUBLEBUFFER = 0x0C32; + int GL_STEREO = 0x0C33; + int GL_RENDER_MODE = 0x0C40; + int GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50; + int GL_POINT_SMOOTH_HINT = 0x0C51; + int GL_LINE_SMOOTH_HINT = 0x0C52; + int GL_POLYGON_SMOOTH_HINT = 0x0C53; + int GL_FOG_HINT = 0x0C54; + int GL_TEXTURE_GEN_S = 0x0C60; + int GL_TEXTURE_GEN_T = 0x0C61; + int GL_TEXTURE_GEN_R = 0x0C62; + int GL_TEXTURE_GEN_Q = 0x0C63; + int GL_PIXEL_MAP_I_TO_I = 0x0C70; + int GL_PIXEL_MAP_S_TO_S = 0x0C71; + int GL_PIXEL_MAP_I_TO_R = 0x0C72; + int GL_PIXEL_MAP_I_TO_G = 0x0C73; + int GL_PIXEL_MAP_I_TO_B = 0x0C74; + int GL_PIXEL_MAP_I_TO_A = 0x0C75; + int GL_PIXEL_MAP_R_TO_R = 0x0C76; + int GL_PIXEL_MAP_G_TO_G = 0x0C77; + int GL_PIXEL_MAP_B_TO_B = 0x0C78; + int GL_PIXEL_MAP_A_TO_A = 0x0C79; + int GL_PIXEL_MAP_I_TO_I_SIZE = 0x0CB0; + int GL_PIXEL_MAP_S_TO_S_SIZE = 0x0CB1; + int GL_PIXEL_MAP_I_TO_R_SIZE = 0x0CB2; + int GL_PIXEL_MAP_I_TO_G_SIZE = 0x0CB3; + int GL_PIXEL_MAP_I_TO_B_SIZE = 0x0CB4; + int GL_PIXEL_MAP_I_TO_A_SIZE = 0x0CB5; + int GL_PIXEL_MAP_R_TO_R_SIZE = 0x0CB6; + int GL_PIXEL_MAP_G_TO_G_SIZE = 0x0CB7; + int GL_PIXEL_MAP_B_TO_B_SIZE = 0x0CB8; + int GL_PIXEL_MAP_A_TO_A_SIZE = 0x0CB9; + int GL_UNPACK_SWAP_BYTES = 0x0CF0; + int GL_UNPACK_LSB_FIRST = 0x0CF1; + int GL_UNPACK_ROW_LENGTH = 0x0CF2; + int GL_UNPACK_SKIP_ROWS = 0x0CF3; + int GL_UNPACK_SKIP_PIXELS = 0x0CF4; + int GL_UNPACK_ALIGNMENT = 0x0CF5; + int GL_PACK_SWAP_BYTES = 0x0D00; + int GL_PACK_LSB_FIRST = 0x0D01; + int GL_PACK_ROW_LENGTH = 0x0D02; + int GL_PACK_SKIP_ROWS = 0x0D03; + int GL_PACK_SKIP_PIXELS = 0x0D04; + int GL_PACK_ALIGNMENT = 0x0D05; + int GL_MAP_COLOR = 0x0D10; + int GL_MAP_STENCIL = 0x0D11; + int GL_INDEX_SHIFT = 0x0D12; + int GL_INDEX_OFFSET = 0x0D13; + int GL_RED_SCALE = 0x0D14; + int GL_RED_BIAS = 0x0D15; + int GL_ZOOM_X = 0x0D16; + int GL_ZOOM_Y = 0x0D17; + int GL_GREEN_SCALE = 0x0D18; + int GL_GREEN_BIAS = 0x0D19; + int GL_BLUE_SCALE = 0x0D1A; + int GL_BLUE_BIAS = 0x0D1B; + int GL_ALPHA_SCALE = 0x0D1C; + int GL_ALPHA_BIAS = 0x0D1D; + int GL_DEPTH_SCALE = 0x0D1E; + int GL_DEPTH_BIAS = 0x0D1F; + int GL_MAX_EVAL_ORDER = 0x0D30; + int GL_MAX_LIGHTS = 0x0D31; + int GL_MAX_CLIP_PLANES = 0x0D32; + int GL_MAX_TEXTURE_SIZE = 0x0D33; + int GL_MAX_PIXEL_MAP_TABLE = 0x0D34; + int GL_MAX_ATTRIB_STACK_DEPTH = 0x0D35; + int GL_MAX_MODELVIEW_STACK_DEPTH = 0x0D36; + int GL_MAX_NAME_STACK_DEPTH = 0x0D37; + int GL_MAX_PROJECTION_STACK_DEPTH = 0x0D38; + int GL_MAX_TEXTURE_STACK_DEPTH = 0x0D39; + int GL_MAX_VIEWPORT_DIMS = 0x0D3A; + int GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = 0x0D3B; + int GL_SUBPIXEL_BITS = 0x0D50; + int GL_INDEX_BITS = 0x0D51; + int GL_RED_BITS = 0x0D52; + int GL_GREEN_BITS = 0x0D53; + int GL_BLUE_BITS = 0x0D54; + int GL_ALPHA_BITS = 0x0D55; + int GL_DEPTH_BITS = 0x0D56; + int GL_STENCIL_BITS = 0x0D57; + int GL_ACCUM_RED_BITS = 0x0D58; + int GL_ACCUM_GREEN_BITS = 0x0D59; + int GL_ACCUM_BLUE_BITS = 0x0D5A; + int GL_ACCUM_ALPHA_BITS = 0x0D5B; + int GL_NAME_STACK_DEPTH = 0x0D70; + int GL_AUTO_NORMAL = 0x0D80; + int GL_MAP1_COLOR_4 = 0x0D90; + int GL_MAP1_INDEX = 0x0D91; + int GL_MAP1_NORMAL = 0x0D92; + int GL_MAP1_TEXTURE_COORD_1 = 0x0D93; + int GL_MAP1_TEXTURE_COORD_2 = 0x0D94; + int GL_MAP1_TEXTURE_COORD_3 = 0x0D95; + int GL_MAP1_TEXTURE_COORD_4 = 0x0D96; + int GL_MAP1_VERTEX_3 = 0x0D97; + int GL_MAP1_VERTEX_4 = 0x0D98; + int GL_MAP2_COLOR_4 = 0x0DB0; + int GL_MAP2_INDEX = 0x0DB1; + int GL_MAP2_NORMAL = 0x0DB2; + int GL_MAP2_TEXTURE_COORD_1 = 0x0DB3; + int GL_MAP2_TEXTURE_COORD_2 = 0x0DB4; + int GL_MAP2_TEXTURE_COORD_3 = 0x0DB5; + int GL_MAP2_TEXTURE_COORD_4 = 0x0DB6; + int GL_MAP2_VERTEX_3 = 0x0DB7; + int GL_MAP2_VERTEX_4 = 0x0DB8; + int GL_MAP1_GRID_DOMAIN = 0x0DD0; + int GL_MAP1_GRID_SEGMENTS = 0x0DD1; + int GL_MAP2_GRID_DOMAIN = 0x0DD2; + int GL_MAP2_GRID_SEGMENTS = 0x0DD3; + int GL_TEXTURE_1D = 0x0DE0; + int GL_TEXTURE_2D = 0x0DE1; + int GL_FEEDBACK_BUFFER_POINTER = 0x0DF0; + int GL_FEEDBACK_BUFFER_SIZE = 0x0DF1; + int GL_FEEDBACK_BUFFER_TYPE = 0x0DF2; + int GL_SELECTION_BUFFER_POINTER = 0x0DF3; + int GL_SELECTION_BUFFER_SIZE = 0x0DF4; /* GetTextureParameter */ /* GL_TEXTURE_MAG_FILTER */ /* GL_TEXTURE_MIN_FILTER */ /* GL_TEXTURE_WRAP_S */ /* GL_TEXTURE_WRAP_T */ - public static final int GL_TEXTURE_WIDTH = 0x1000; - public static final int GL_TEXTURE_HEIGHT = 0x1001; - public static final int GL_TEXTURE_INTERNAL_FORMAT = 0x1003; - public static final int GL_TEXTURE_BORDER_COLOR = 0x1004; - public static final int GL_TEXTURE_BORDER = 0x1005; + int GL_TEXTURE_WIDTH = 0x1000; + int GL_TEXTURE_HEIGHT = 0x1001; + int GL_TEXTURE_INTERNAL_FORMAT = 0x1003; + int GL_TEXTURE_BORDER_COLOR = 0x1004; + int GL_TEXTURE_BORDER = 0x1005; /* GL_TEXTURE_RED_SIZE */ /* GL_TEXTURE_GREEN_SIZE */ /* GL_TEXTURE_BLUE_SIZE */ @@ -430,88 +430,88 @@ public interface GL11 { /* GL_TEXTURE_RESIDENT */ /* HintMode */ - public static final int GL_DONT_CARE = 0x1100; - public static final int GL_FASTEST = 0x1101; - public static final int GL_NICEST = 0x1102; + int GL_DONT_CARE = 0x1100; + int GL_FASTEST = 0x1101; + int GL_NICEST = 0x1102; /* LightName */ - public static final int GL_LIGHT0 = 0x4000; - public static final int GL_LIGHT1 = 0x4001; - public static final int GL_LIGHT2 = 0x4002; - public static final int GL_LIGHT3 = 0x4003; - public static final int GL_LIGHT4 = 0x4004; - public static final int GL_LIGHT5 = 0x4005; - public static final int GL_LIGHT6 = 0x4006; - public static final int GL_LIGHT7 = 0x4007; + int GL_LIGHT0 = 0x4000; + int GL_LIGHT1 = 0x4001; + int GL_LIGHT2 = 0x4002; + int GL_LIGHT3 = 0x4003; + int GL_LIGHT4 = 0x4004; + int GL_LIGHT5 = 0x4005; + int GL_LIGHT6 = 0x4006; + int GL_LIGHT7 = 0x4007; /* LightParameter */ - public static final int GL_AMBIENT = 0x1200; - public static final int GL_DIFFUSE = 0x1201; - public static final int GL_SPECULAR = 0x1202; - public static final int GL_POSITION = 0x1203; - public static final int GL_SPOT_DIRECTION = 0x1204; - public static final int GL_SPOT_EXPONENT = 0x1205; - public static final int GL_SPOT_CUTOFF = 0x1206; - public static final int GL_CONSTANT_ATTENUATION = 0x1207; - public static final int GL_LINEAR_ATTENUATION = 0x1208; - public static final int GL_QUADRATIC_ATTENUATION = 0x1209; + int GL_AMBIENT = 0x1200; + int GL_DIFFUSE = 0x1201; + int GL_SPECULAR = 0x1202; + int GL_POSITION = 0x1203; + int GL_SPOT_DIRECTION = 0x1204; + int GL_SPOT_EXPONENT = 0x1205; + int GL_SPOT_CUTOFF = 0x1206; + int GL_CONSTANT_ATTENUATION = 0x1207; + int GL_LINEAR_ATTENUATION = 0x1208; + int GL_QUADRATIC_ATTENUATION = 0x1209; /* ListMode */ - public static final int GL_COMPILE = 0x1300; - public static final int GL_COMPILE_AND_EXECUTE = 0x1301; + int GL_COMPILE = 0x1300; + int GL_COMPILE_AND_EXECUTE = 0x1301; /* LogicOp */ - public static final int GL_CLEAR = 0x1500; - public static final int GL_AND = 0x1501; - public static final int GL_AND_REVERSE = 0x1502; - public static final int GL_COPY = 0x1503; - public static final int GL_AND_INVERTED = 0x1504; - public static final int GL_NOOP = 0x1505; - public static final int GL_XOR = 0x1506; - public static final int GL_OR = 0x1507; - public static final int GL_NOR = 0x1508; - public static final int GL_EQUIV = 0x1509; - public static final int GL_INVERT = 0x150A; - public static final int GL_OR_REVERSE = 0x150B; - public static final int GL_COPY_INVERTED = 0x150C; - public static final int GL_OR_INVERTED = 0x150D; - public static final int GL_NAND = 0x150E; - public static final int GL_SET = 0x150F; + int GL_CLEAR = 0x1500; + int GL_AND = 0x1501; + int GL_AND_REVERSE = 0x1502; + int GL_COPY = 0x1503; + int GL_AND_INVERTED = 0x1504; + int GL_NOOP = 0x1505; + int GL_XOR = 0x1506; + int GL_OR = 0x1507; + int GL_NOR = 0x1508; + int GL_EQUIV = 0x1509; + int GL_INVERT = 0x150A; + int GL_OR_REVERSE = 0x150B; + int GL_COPY_INVERTED = 0x150C; + int GL_OR_INVERTED = 0x150D; + int GL_NAND = 0x150E; + int GL_SET = 0x150F; /* MaterialParameter */ - public static final int GL_EMISSION = 0x1600; - public static final int GL_SHININESS = 0x1601; - public static final int GL_AMBIENT_AND_DIFFUSE = 0x1602; - public static final int GL_COLOR_INDEXES = 0x1603; + int GL_EMISSION = 0x1600; + int GL_SHININESS = 0x1601; + int GL_AMBIENT_AND_DIFFUSE = 0x1602; + int GL_COLOR_INDEXES = 0x1603; /* GL_AMBIENT */ /* GL_DIFFUSE */ /* GL_SPECULAR */ /* MatrixMode */ - public static final int GL_MODELVIEW = 0x1700; - public static final int GL_PROJECTION = 0x1701; - public static final int GL_TEXTURE = 0x1702; + int GL_MODELVIEW = 0x1700; + int GL_PROJECTION = 0x1701; + int GL_TEXTURE = 0x1702; /* PixelCopyType */ - public static final int GL_COLOR = 0x1800; - public static final int GL_DEPTH = 0x1801; - public static final int GL_STENCIL = 0x1802; + int GL_COLOR = 0x1800; + int GL_DEPTH = 0x1801; + int GL_STENCIL = 0x1802; /* PixelFormat */ - public static final int GL_COLOR_INDEX = 0x1900; - public static final int GL_STENCIL_INDEX = 0x1901; - public static final int GL_DEPTH_COMPONENT = 0x1902; - public static final int GL_RED = 0x1903; - public static final int GL_GREEN = 0x1904; - public static final int GL_BLUE = 0x1905; - public static final int GL_ALPHA = 0x1906; - public static final int GL_RGB = 0x1907; - public static final int GL_RGBA = 0x1908; - public static final int GL_LUMINANCE = 0x1909; - public static final int GL_LUMINANCE_ALPHA = 0x190A; + int GL_COLOR_INDEX = 0x1900; + int GL_STENCIL_INDEX = 0x1901; + int GL_DEPTH_COMPONENT = 0x1902; + int GL_RED = 0x1903; + int GL_GREEN = 0x1904; + int GL_BLUE = 0x1905; + int GL_ALPHA = 0x1906; + int GL_RGB = 0x1907; + int GL_RGBA = 0x1908; + int GL_LUMINANCE = 0x1909; + int GL_LUMINANCE_ALPHA = 0x190A; /* PixelType */ - public static final int GL_BITMAP = 0x1A00; + int GL_BITMAP = 0x1A00; /* GL_BYTE */ /* GL_UNSIGNED_BYTE */ /* GL_SHORT */ @@ -521,38 +521,38 @@ public interface GL11 { /* GL_FLOAT */ /* PolygonMode */ - public static final int GL_POINT = 0x1B00; - public static final int GL_LINE = 0x1B01; - public static final int GL_FILL = 0x1B02; + int GL_POINT = 0x1B00; + int GL_LINE = 0x1B01; + int GL_FILL = 0x1B02; /* RenderingMode */ - public static final int GL_RENDER = 0x1C00; - public static final int GL_FEEDBACK = 0x1C01; - public static final int GL_SELECT = 0x1C02; + int GL_RENDER = 0x1C00; + int GL_FEEDBACK = 0x1C01; + int GL_SELECT = 0x1C02; /* ShadingModel */ - public static final int GL_FLAT = 0x1D00; - public static final int GL_SMOOTH = 0x1D01; + int GL_FLAT = 0x1D00; + int GL_SMOOTH = 0x1D01; /* StencilOp */ /* GL_ZERO */ - public static final int GL_KEEP = 0x1E00; - public static final int GL_REPLACE = 0x1E01; - public static final int GL_INCR = 0x1E02; - public static final int GL_DECR = 0x1E03; + int GL_KEEP = 0x1E00; + int GL_REPLACE = 0x1E01; + int GL_INCR = 0x1E02; + int GL_DECR = 0x1E03; /* GL_INVERT */ /* StringName */ - public static final int GL_VENDOR = 0x1F00; - public static final int GL_RENDERER = 0x1F01; - public static final int GL_VERSION = 0x1F02; - public static final int GL_EXTENSIONS = 0x1F03; + int GL_VENDOR = 0x1F00; + int GL_RENDERER = 0x1F01; + int GL_VERSION = 0x1F02; + int GL_EXTENSIONS = 0x1F03; /* TextureCoordName */ - public static final int GL_S = 0x2000; - public static final int GL_T = 0x2001; - public static final int GL_R = 0x2002; - public static final int GL_Q = 0x2003; + int GL_S = 0x2000; + int GL_T = 0x2001; + int GL_R = 0x2002; + int GL_Q = 0x2003; /* TexCoordPointerType */ /* GL_SHORT */ @@ -561,199 +561,199 @@ public interface GL11 { /* GL_DOUBLE */ /* TextureEnvMode */ - public static final int GL_MODULATE = 0x2100; - public static final int GL_DECAL = 0x2101; + int GL_MODULATE = 0x2100; + int GL_DECAL = 0x2101; /* GL_BLEND */ /* GL_REPLACE */ /* TextureEnvParameter */ - public static final int GL_TEXTURE_ENV_MODE = 0x2200; - public static final int GL_TEXTURE_ENV_COLOR = 0x2201; + int GL_TEXTURE_ENV_MODE = 0x2200; + int GL_TEXTURE_ENV_COLOR = 0x2201; /* TextureEnvTarget */ - public static final int GL_TEXTURE_ENV = 0x2300; + int GL_TEXTURE_ENV = 0x2300; /* TextureGenMode */ - public static final int GL_EYE_LINEAR = 0x2400; - public static final int GL_OBJECT_LINEAR = 0x2401; - public static final int GL_SPHERE_MAP = 0x2402; + int GL_EYE_LINEAR = 0x2400; + int GL_OBJECT_LINEAR = 0x2401; + int GL_SPHERE_MAP = 0x2402; /* TextureGenParameter */ - public static final int GL_TEXTURE_GEN_MODE = 0x2500; - public static final int GL_OBJECT_PLANE = 0x2501; - public static final int GL_EYE_PLANE = 0x2502; + int GL_TEXTURE_GEN_MODE = 0x2500; + int GL_OBJECT_PLANE = 0x2501; + int GL_EYE_PLANE = 0x2502; /* TextureMagFilter */ - public static final int GL_NEAREST = 0x2600; - public static final int GL_LINEAR = 0x2601; + int GL_NEAREST = 0x2600; + int GL_LINEAR = 0x2601; /* TextureMinFilter */ /* GL_NEAREST */ /* GL_LINEAR */ - public static final int GL_NEAREST_MIPMAP_NEAREST = 0x2700; - public static final int GL_LINEAR_MIPMAP_NEAREST = 0x2701; - public static final int GL_NEAREST_MIPMAP_LINEAR = 0x2702; - public static final int GL_LINEAR_MIPMAP_LINEAR = 0x2703; + int GL_NEAREST_MIPMAP_NEAREST = 0x2700; + int GL_LINEAR_MIPMAP_NEAREST = 0x2701; + int GL_NEAREST_MIPMAP_LINEAR = 0x2702; + int GL_LINEAR_MIPMAP_LINEAR = 0x2703; /* TextureParameterName */ - public static final int GL_TEXTURE_MAG_FILTER = 0x2800; - public static final int GL_TEXTURE_MIN_FILTER = 0x2801; - public static final int GL_TEXTURE_WRAP_S = 0x2802; - public static final int GL_TEXTURE_WRAP_T = 0x2803; + int GL_TEXTURE_MAG_FILTER = 0x2800; + int GL_TEXTURE_MIN_FILTER = 0x2801; + int GL_TEXTURE_WRAP_S = 0x2802; + int GL_TEXTURE_WRAP_T = 0x2803; /* GL_TEXTURE_BORDER_COLOR */ /* GL_TEXTURE_PRIORITY */ /* TextureWrapMode */ - public static final int GL_CLAMP = 0x2900; - public static final int GL_REPEAT = 0x2901; + int GL_CLAMP = 0x2900; + int GL_REPEAT = 0x2901; /* ClientAttribMask */ - public static final int GL_CLIENT_PIXEL_STORE_BIT = 0x00000001; - public static final int GL_CLIENT_VERTEX_ARRAY_BIT = 0x00000002; - public static final int GL_ALL_CLIENT_ATTRIB_BITS = 0xffffffff; + int GL_CLIENT_PIXEL_STORE_BIT = 0x00000001; + int GL_CLIENT_VERTEX_ARRAY_BIT = 0x00000002; + int GL_ALL_CLIENT_ATTRIB_BITS = 0xffffffff; /* polygon_offset */ - public static final int GL_POLYGON_OFFSET_FACTOR = 0x8038; - public static final int GL_POLYGON_OFFSET_UNITS = 0x2A00; - public static final int GL_POLYGON_OFFSET_POINT = 0x2A01; - public static final int GL_POLYGON_OFFSET_LINE = 0x2A02; - public static final int GL_POLYGON_OFFSET_FILL = 0x8037; + int GL_POLYGON_OFFSET_FACTOR = 0x8038; + int GL_POLYGON_OFFSET_UNITS = 0x2A00; + int GL_POLYGON_OFFSET_POINT = 0x2A01; + int GL_POLYGON_OFFSET_LINE = 0x2A02; + int GL_POLYGON_OFFSET_FILL = 0x8037; /* texture */ - public static final int GL_ALPHA4 = 0x803B; - public static final int GL_ALPHA8 = 0x803C; - public static final int GL_ALPHA12 = 0x803D; - public static final int GL_ALPHA16 = 0x803E; - public static final int GL_LUMINANCE4 = 0x803F; - public static final int GL_LUMINANCE8 = 0x8040; - public static final int GL_LUMINANCE12 = 0x8041; - public static final int GL_LUMINANCE16 = 0x8042; - public static final int GL_LUMINANCE4_ALPHA4 = 0x8043; - public static final int GL_LUMINANCE6_ALPHA2 = 0x8044; - public static final int GL_LUMINANCE8_ALPHA8 = 0x8045; - public static final int GL_LUMINANCE12_ALPHA4 = 0x8046; - public static final int GL_LUMINANCE12_ALPHA12 = 0x8047; - public static final int GL_LUMINANCE16_ALPHA16 = 0x8048; - public static final int GL_INTENSITY = 0x8049; - public static final int GL_INTENSITY4 = 0x804A; - public static final int GL_INTENSITY8 = 0x804B; - public static final int GL_INTENSITY12 = 0x804C; - public static final int GL_INTENSITY16 = 0x804D; - public static final int GL_R3_G3_B2 = 0x2A10; - public static final int GL_RGB4 = 0x804F; - public static final int GL_RGB5 = 0x8050; - public static final int GL_RGB8 = 0x8051; - public static final int GL_RGB10 = 0x8052; - public static final int GL_RGB12 = 0x8053; - public static final int GL_RGB16 = 0x8054; - public static final int GL_RGBA2 = 0x8055; - public static final int GL_RGBA4 = 0x8056; - public static final int GL_RGB5_A1 = 0x8057; - public static final int GL_RGBA8 = 0x8058; - public static final int GL_RGB10_A2 = 0x8059; - public static final int GL_RGBA12 = 0x805A; - public static final int GL_RGBA16 = 0x805B; - public static final int GL_TEXTURE_RED_SIZE = 0x805C; - public static final int GL_TEXTURE_GREEN_SIZE = 0x805D; - public static final int GL_TEXTURE_BLUE_SIZE = 0x805E; - public static final int GL_TEXTURE_ALPHA_SIZE = 0x805F; - public static final int GL_TEXTURE_LUMINANCE_SIZE = 0x8060; - public static final int GL_TEXTURE_INTENSITY_SIZE = 0x8061; - public static final int GL_PROXY_TEXTURE_1D = 0x8063; - public static final int GL_PROXY_TEXTURE_2D = 0x8064; + int GL_ALPHA4 = 0x803B; + int GL_ALPHA8 = 0x803C; + int GL_ALPHA12 = 0x803D; + int GL_ALPHA16 = 0x803E; + int GL_LUMINANCE4 = 0x803F; + int GL_LUMINANCE8 = 0x8040; + int GL_LUMINANCE12 = 0x8041; + int GL_LUMINANCE16 = 0x8042; + int GL_LUMINANCE4_ALPHA4 = 0x8043; + int GL_LUMINANCE6_ALPHA2 = 0x8044; + int GL_LUMINANCE8_ALPHA8 = 0x8045; + int GL_LUMINANCE12_ALPHA4 = 0x8046; + int GL_LUMINANCE12_ALPHA12 = 0x8047; + int GL_LUMINANCE16_ALPHA16 = 0x8048; + int GL_INTENSITY = 0x8049; + int GL_INTENSITY4 = 0x804A; + int GL_INTENSITY8 = 0x804B; + int GL_INTENSITY12 = 0x804C; + int GL_INTENSITY16 = 0x804D; + int GL_R3_G3_B2 = 0x2A10; + int GL_RGB4 = 0x804F; + int GL_RGB5 = 0x8050; + int GL_RGB8 = 0x8051; + int GL_RGB10 = 0x8052; + int GL_RGB12 = 0x8053; + int GL_RGB16 = 0x8054; + int GL_RGBA2 = 0x8055; + int GL_RGBA4 = 0x8056; + int GL_RGB5_A1 = 0x8057; + int GL_RGBA8 = 0x8058; + int GL_RGB10_A2 = 0x8059; + int GL_RGBA12 = 0x805A; + int GL_RGBA16 = 0x805B; + int GL_TEXTURE_RED_SIZE = 0x805C; + int GL_TEXTURE_GREEN_SIZE = 0x805D; + int GL_TEXTURE_BLUE_SIZE = 0x805E; + int GL_TEXTURE_ALPHA_SIZE = 0x805F; + int GL_TEXTURE_LUMINANCE_SIZE = 0x8060; + int GL_TEXTURE_INTENSITY_SIZE = 0x8061; + int GL_PROXY_TEXTURE_1D = 0x8063; + int GL_PROXY_TEXTURE_2D = 0x8064; /* texture_object */ - public static final int GL_TEXTURE_PRIORITY = 0x8066; - public static final int GL_TEXTURE_RESIDENT = 0x8067; - public static final int GL_TEXTURE_BINDING_1D = 0x8068; - public static final int GL_TEXTURE_BINDING_2D = 0x8069; + int GL_TEXTURE_PRIORITY = 0x8066; + int GL_TEXTURE_RESIDENT = 0x8067; + int GL_TEXTURE_BINDING_1D = 0x8068; + int GL_TEXTURE_BINDING_2D = 0x8069; /* vertex_array */ - public static final int GL_VERTEX_ARRAY = 0x8074; - public static final int GL_NORMAL_ARRAY = 0x8075; - public static final int GL_COLOR_ARRAY = 0x8076; - public static final int GL_INDEX_ARRAY = 0x8077; - public static final int GL_TEXTURE_COORD_ARRAY = 0x8078; - public static final int GL_EDGE_FLAG_ARRAY = 0x8079; - public static final int GL_VERTEX_ARRAY_SIZE = 0x807A; - public static final int GL_VERTEX_ARRAY_TYPE = 0x807B; - public static final int GL_VERTEX_ARRAY_STRIDE = 0x807C; - public static final int GL_NORMAL_ARRAY_TYPE = 0x807E; - public static final int GL_NORMAL_ARRAY_STRIDE = 0x807F; - public static final int GL_COLOR_ARRAY_SIZE = 0x8081; - public static final int GL_COLOR_ARRAY_TYPE = 0x8082; - public static final int GL_COLOR_ARRAY_STRIDE = 0x8083; - public static final int GL_INDEX_ARRAY_TYPE = 0x8085; - public static final int GL_INDEX_ARRAY_STRIDE = 0x8086; - public static final int GL_TEXTURE_COORD_ARRAY_SIZE = 0x8088; - public static final int GL_TEXTURE_COORD_ARRAY_TYPE = 0x8089; - public static final int GL_TEXTURE_COORD_ARRAY_STRIDE = 0x808A; - public static final int GL_EDGE_FLAG_ARRAY_STRIDE = 0x808C; - public static final int GL_VERTEX_ARRAY_POINTER = 0x808E; - public static final int GL_NORMAL_ARRAY_POINTER = 0x808F; - public static final int GL_COLOR_ARRAY_POINTER = 0x8090; - public static final int GL_INDEX_ARRAY_POINTER = 0x8091; - public static final int GL_TEXTURE_COORD_ARRAY_POINTER = 0x8092; - public static final int GL_EDGE_FLAG_ARRAY_POINTER = 0x8093; - public static final int GL_V2F = 0x2A20; - public static final int GL_V3F = 0x2A21; - public static final int GL_C4UB_V2F = 0x2A22; - public static final int GL_C4UB_V3F = 0x2A23; - public static final int GL_C3F_V3F = 0x2A24; - public static final int GL_N3F_V3F = 0x2A25; - public static final int GL_C4F_N3F_V3F = 0x2A26; - public static final int GL_T2F_V3F = 0x2A27; - public static final int GL_T4F_V4F = 0x2A28; - public static final int GL_T2F_C4UB_V3F = 0x2A29; - public static final int GL_T2F_C3F_V3F = 0x2A2A; - public static final int GL_T2F_N3F_V3F = 0x2A2B; - public static final int GL_T2F_C4F_N3F_V3F = 0x2A2C; - public static final int GL_T4F_C4F_N3F_V4F = 0x2A2D; + int GL_VERTEX_ARRAY = 0x8074; + int GL_NORMAL_ARRAY = 0x8075; + int GL_COLOR_ARRAY = 0x8076; + int GL_INDEX_ARRAY = 0x8077; + int GL_TEXTURE_COORD_ARRAY = 0x8078; + int GL_EDGE_FLAG_ARRAY = 0x8079; + int GL_VERTEX_ARRAY_SIZE = 0x807A; + int GL_VERTEX_ARRAY_TYPE = 0x807B; + int GL_VERTEX_ARRAY_STRIDE = 0x807C; + int GL_NORMAL_ARRAY_TYPE = 0x807E; + int GL_NORMAL_ARRAY_STRIDE = 0x807F; + int GL_COLOR_ARRAY_SIZE = 0x8081; + int GL_COLOR_ARRAY_TYPE = 0x8082; + int GL_COLOR_ARRAY_STRIDE = 0x8083; + int GL_INDEX_ARRAY_TYPE = 0x8085; + int GL_INDEX_ARRAY_STRIDE = 0x8086; + int GL_TEXTURE_COORD_ARRAY_SIZE = 0x8088; + int GL_TEXTURE_COORD_ARRAY_TYPE = 0x8089; + int GL_TEXTURE_COORD_ARRAY_STRIDE = 0x808A; + int GL_EDGE_FLAG_ARRAY_STRIDE = 0x808C; + int GL_VERTEX_ARRAY_POINTER = 0x808E; + int GL_NORMAL_ARRAY_POINTER = 0x808F; + int GL_COLOR_ARRAY_POINTER = 0x8090; + int GL_INDEX_ARRAY_POINTER = 0x8091; + int GL_TEXTURE_COORD_ARRAY_POINTER = 0x8092; + int GL_EDGE_FLAG_ARRAY_POINTER = 0x8093; + int GL_V2F = 0x2A20; + int GL_V3F = 0x2A21; + int GL_C4UB_V2F = 0x2A22; + int GL_C4UB_V3F = 0x2A23; + int GL_C3F_V3F = 0x2A24; + int GL_N3F_V3F = 0x2A25; + int GL_C4F_N3F_V3F = 0x2A26; + int GL_T2F_V3F = 0x2A27; + int GL_T4F_V4F = 0x2A28; + int GL_T2F_C4UB_V3F = 0x2A29; + int GL_T2F_C3F_V3F = 0x2A2A; + int GL_T2F_N3F_V3F = 0x2A2B; + int GL_T2F_C4F_N3F_V3F = 0x2A2C; + int GL_T4F_C4F_N3F_V4F = 0x2A2D; /* For compatibility with OpenGL v1.0 */ - public static final int GL_LOGIC_OP = GL_INDEX_LOGIC_OP; - public static final int GL_TEXTURE_COMPONENTS = GL_TEXTURE_INTERNAL_FORMAT; + int GL_LOGIC_OP = GL_INDEX_LOGIC_OP; + int GL_TEXTURE_COMPONENTS = GL_TEXTURE_INTERNAL_FORMAT; - public void glAccum(@GLenum int op, float value); - public void glAlphaFunc(@GLenum int func, @GLclampf float ref); - public void glClearColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); - public void glClearAccum(float red, float green, float blue, float alpha); - public void glClear(@GLbitfield int mask); + void glAccum(@GLenum int op, float value); + void glAlphaFunc(@GLenum int func, @GLclampf float ref); + void glClearColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); + void glClearAccum(float red, float green, float blue, float alpha); + void glClear(@GLbitfield int mask); - public void glCallLists(@AutoSize("lists") @GLsizei int n, @AutoType("lists") @GLenum int type, - @Const + void glCallLists(@AutoSize("lists") @GLsizei int n, @AutoType("lists") @GLenum int type, + @Const @GLubyte @GLushort @GLuint Buffer lists); - public void glCallList(@GLuint int list); - public void glBlendFunc(@GLenum int sfactor, @GLenum int dfactor); + void glCallList(@GLuint int list); + void glBlendFunc(@GLenum int sfactor, @GLenum int dfactor); - public void glBitmap(@GLsizei int width, @GLsizei int height, float xorig, float yorig, float xmove, float ymove, + void glBitmap(@GLsizei int width, @GLsizei int height, float xorig, float yorig, float xmove, float ymove, @BufferObject(BufferKind.UnpackPBO) @Check("(((width + 7)/8)*height)") @Const @GLubyte ByteBuffer bitmap); - public void glBindTexture(@GLenum int target, @GLuint int texture); - public void glBegin(@GLenum int mode); - public void glEnd(); - public void glArrayElement(int i); - public void glClearDepth(@GLclampd double depth); - public void glDeleteLists(@GLuint int list, @GLsizei int range); + void glBindTexture(@GLenum int target, @GLuint int texture); + void glBegin(@GLenum int mode); + void glEnd(); + void glArrayElement(int i); + void glClearDepth(@GLclampd double depth); + void glDeleteLists(@GLuint int list, @GLsizei int range); - public void glDeleteTextures(@AutoSize("textures") @GLsizei int n, @Const @GLuint IntBuffer textures); + void glDeleteTextures(@AutoSize("textures") @GLsizei int n, @Const @GLuint IntBuffer textures); - public void glCullFace(@GLenum int mode); - public void glCopyTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, int x, int y, @GLsizei int width, @GLsizei int height); - public void glCopyTexSubImage1D(@GLenum int target, int level, int xoffset, int x, int y, @GLsizei int width); - public void glCopyTexImage2D(@GLenum int target, int level, int internalFormat, int x, int y, @GLsizei int width, @GLsizei int height, int border); - public void glCopyTexImage1D(@GLenum int target, int level, int internalFormat, int x, int y, @GLsizei int width, int border); - public void glCopyPixels(int x, int y, int width, int height, int type); + void glCullFace(@GLenum int mode); + void glCopyTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, int x, int y, @GLsizei int width, @GLsizei int height); + void glCopyTexSubImage1D(@GLenum int target, int level, int xoffset, int x, int y, @GLsizei int width); + void glCopyTexImage2D(@GLenum int target, int level, int internalFormat, int x, int y, @GLsizei int width, @GLsizei int height, int border); + void glCopyTexImage1D(@GLenum int target, int level, int internalFormat, int x, int y, @GLsizei int width, int border); + void glCopyPixels(int x, int y, int width, int height, int type); - public void glColorPointer(int size, @AutoType("pointer") @GLenum int type, @GLsizei int stride, + void glColorPointer(int size, @AutoType("pointer") @GLenum int type, @GLsizei int stride, @Check @BufferObject(BufferKind.ArrayVBO) @Const @@ -762,33 +762,33 @@ public interface GL11 { @GLbyte Buffer pointer); - public void glColorMaterial(@GLenum int face, @GLenum int mode); - public void glColorMask(boolean red, boolean green, boolean blue, boolean alpha); - public void glColor3b(byte red, byte green, byte blue); - public void glColor3f(float red, float green, float blue); - public void glColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); - public void glColor4b(byte red, byte green, byte blue, byte alpha); - public void glColor4f(float red, float green, float blue, float alpha); - public void glColor4ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue, @GLubyte byte alpha); + void glColorMaterial(@GLenum int face, @GLenum int mode); + void glColorMask(boolean red, boolean green, boolean blue, boolean alpha); + void glColor3b(byte red, byte green, byte blue); + void glColor3f(float red, float green, float blue); + void glColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); + void glColor4b(byte red, byte green, byte blue, byte alpha); + void glColor4f(float red, float green, float blue, float alpha); + void glColor4ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue, @GLubyte byte alpha); - public void glClipPlane(@GLenum int plane, @Check("4") @Const DoubleBuffer equation); + void glClipPlane(@GLenum int plane, @Check("4") @Const DoubleBuffer equation); - public void glClearStencil(int s); - public void glClearIndex(float c); - public void glEvalPoint1(int i); - public void glEvalPoint2(int i, int j); - public void glEvalMesh1(@GLenum int mode, int i1, int i2); - public void glEvalMesh2(@GLenum int mode, int i1, int i2, int j1, int j2); - public void glEvalCoord1f(float u); - public void glEvalCoord2f(float u, float v); - public void glEnableClientState(@GLenum int cap); - public void glDisableClientState(@GLenum int cap); - public void glEnable(@GLenum int cap); - public void glDisable(@GLenum int cap); - public void glEdgeFlagPointer(int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @GLbyte Buffer pointer); + void glClearStencil(int s); + void glClearIndex(float c); + void glEvalPoint1(int i); + void glEvalPoint2(int i, int j); + void glEvalMesh1(@GLenum int mode, int i1, int i2); + void glEvalMesh2(@GLenum int mode, int i1, int i2, int j1, int j2); + void glEvalCoord1f(float u); + void glEvalCoord2f(float u, float v); + void glEnableClientState(@GLenum int cap); + void glDisableClientState(@GLenum int cap); + void glEnable(@GLenum int cap); + void glDisable(@GLenum int cap); + void glEdgeFlagPointer(int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @GLbyte Buffer pointer); - public void glEdgeFlag(boolean flag); - public void glDrawPixels(@GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, + void glEdgeFlag(boolean flag); + void glDrawPixels(@GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, @Check("GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)") @BufferObject(BufferKind.UnpackPBO) @Const @@ -797,7 +797,7 @@ public interface GL11 { @GLint Buffer pixels); - public void glDrawElements(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type, + void glDrawElements(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type, @BufferObject(BufferKind.ElementVBO) @Const @GLubyte @@ -805,73 +805,73 @@ public interface GL11 { @GLuint Buffer indices); - public void glDrawBuffer(@GLenum int mode); - public void glDrawArrays(@GLenum int mode, int first, @GLsizei int count); - public void glDepthRange(@GLclampd double zNear, @GLclampd double zFar); - public void glDepthMask(boolean flag); - public void glDepthFunc(@GLenum int func); - - public void glFeedbackBuffer(@AutoSize("buffer") @GLsizei int size, @GLenum int type, FloatBuffer buffer); + void glDrawBuffer(@GLenum int mode); + void glDrawArrays(@GLenum int mode, int first, @GLsizei int count); + void glDepthRange(@GLclampd double zNear, @GLclampd double zFar); + void glDepthMask(boolean flag); + void glDepthFunc(@GLenum int func); + + void glFeedbackBuffer(@AutoSize("buffer") @GLsizei int size, @GLenum int type, FloatBuffer buffer); @StripPostfix("values") - public void glGetPixelMapfv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) FloatBuffer values); + void glGetPixelMapfv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) FloatBuffer values); @StripPostfix("values") - public void glGetPixelMapuiv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) @GLuint IntBuffer values); + void glGetPixelMapuiv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) @GLuint IntBuffer values); @StripPostfix("values") - public void glGetPixelMapusv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) @GLushort ShortBuffer values); + void glGetPixelMapusv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) @GLushort ShortBuffer values); @StripPostfix("params") - public void glGetMaterialfv(@GLenum int face, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetMaterialfv(@GLenum int face, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetMaterialiv(@GLenum int face, @GLenum int pname, @Check("4") IntBuffer params); + void glGetMaterialiv(@GLenum int face, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("v") - public void glGetMapfv(@GLenum int target, @GLenum int query, @Check("256") FloatBuffer v); + void glGetMapfv(@GLenum int target, @GLenum int query, @Check("256") FloatBuffer v); @StripPostfix("v") - public void glGetMapiv(@GLenum int target, @GLenum int query, @Check("256") IntBuffer v); + void glGetMapiv(@GLenum int target, @GLenum int query, @Check("256") IntBuffer v); @StripPostfix("params") - public void glGetLightfv(@GLenum int light, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetLightfv(@GLenum int light, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetLightiv(@GLenum int light, @GLenum int pname, @Check("4") IntBuffer params); + void glGetLightiv(@GLenum int light, @GLenum int pname, @Check("4") IntBuffer params); - public int glGetError(); + int glGetError(); - public void glGetClipPlane(@GLenum int plane, @Check("4") DoubleBuffer equation); + void glGetClipPlane(@GLenum int plane, @Check("4") DoubleBuffer equation); @StripPostfix("params") - public void glGetBooleanv(@GLenum int pname, @Check("16") @GLboolean ByteBuffer params); + void glGetBooleanv(@GLenum int pname, @Check("16") @GLboolean ByteBuffer params); @StripPostfix("params") - public void glGetDoublev(@GLenum int pname, @Check("16") DoubleBuffer params); - - @StripPostfix("params") - public void glGetFloatv(@GLenum int pname, @Check("16") FloatBuffer params); + void glGetDoublev(@GLenum int pname, @Check("16") DoubleBuffer params); @StripPostfix("params") - public void glGetIntegerv(@GLenum int pname, @Check("16") IntBuffer params); - - public void glGenTextures(@AutoSize("textures") @GLsizei int n, @GLuint IntBuffer textures); - - public @GLuint int glGenLists(@GLsizei int range); - public void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar); - public void glFrontFace(@GLenum int mode); - public void glFogf(@GLenum int pname, float param); - public void glFogi(@GLenum int pname, int param); + void glGetFloatv(@GLenum int pname, @Check("16") FloatBuffer params); @StripPostfix("params") - public void glFogfv(@GLenum int pname, @Check("4") @Const FloatBuffer params); + void glGetIntegerv(@GLenum int pname, @Check("16") IntBuffer params); + + void glGenTextures(@AutoSize("textures") @GLsizei int n, @GLuint IntBuffer textures); + + @GLuint int glGenLists(@GLsizei int range); + void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar); + void glFrontFace(@GLenum int mode); + void glFogf(@GLenum int pname, float param); + void glFogi(@GLenum int pname, int param); @StripPostfix("params") - public void glFogiv(@GLenum int pname, @Check("4") @Const IntBuffer params); + void glFogfv(@GLenum int pname, @Check("4") @Const FloatBuffer params); - public void glFlush(); - public void glFinish(); + @StripPostfix("params") + void glFogiv(@GLenum int pname, @Check("4") @Const IntBuffer params); + + void glFlush(); + void glFinish(); @StripPostfix("result") - public void glGetPointerv(@GLenum int pname, @Result @GLvoid ByteBuffer result); - public boolean glIsEnabled(@GLenum int cap); + void glGetPointerv(@GLenum int pname, @Result @GLvoid ByteBuffer result); + boolean glIsEnabled(@GLenum int cap); - public void glInterleavedArrays(@GLenum int format, @GLsizei int stride, + void glInterleavedArrays(@GLenum int format, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -881,22 +881,22 @@ public interface GL11 { @GLfloat Buffer pointer); - public void glInitNames(); - public void glHint(@GLenum int target, @GLenum int mode); + void glInitNames(); + void glHint(@GLenum int target, @GLenum int mode); @StripPostfix("params") - public void glGetTexParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetTexParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetTexParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetTexParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetTexLevelParameterfv(@GLenum int target, int level, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetTexLevelParameterfv(@GLenum int target, int level, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetTexLevelParameteriv(@GLenum int target, int level, @GLenum int pname, @Check("4") IntBuffer params); + void glGetTexLevelParameteriv(@GLenum int target, int level, @GLenum int pname, @Check("4") IntBuffer params); - public void glGetTexImage(@GLenum int target, int level, @GLenum int format, @GLenum int type, + void glGetTexImage(@GLenum int target, int level, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.PackPBO) @Check("GLBufferChecks.calculateImageStorage(pixels, format, type, 1, 1, 1)") @GLbyte @@ -905,89 +905,89 @@ public interface GL11 { Buffer pixels); @StripPostfix("params") - public void glGetTexGeniv(@GLenum int coord, @GLenum int pname, @Check("4") IntBuffer params); + void glGetTexGeniv(@GLenum int coord, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetTexGenfv(@GLenum int coord, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetTexGenfv(@GLenum int coord, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetTexEnviv(@GLenum int coord, @GLenum int pname, @Check("4") IntBuffer params); + void glGetTexEnviv(@GLenum int coord, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetTexEnvfv(@GLenum int coord, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetTexEnvfv(@GLenum int coord, @GLenum int pname, @Check("4") FloatBuffer params); @Const - public String glGetString(int name); + String glGetString(int name); - public void glGetPolygonStipple(@BufferObject(BufferKind.PackPBO) @Check("1024") @GLubyte ByteBuffer mask); + void glGetPolygonStipple(@BufferObject(BufferKind.PackPBO) @Check("1024") @GLubyte ByteBuffer mask); - public boolean glIsList(@GLuint int list); - public void glMaterialf(@GLenum int face, @GLenum int pname, float param); - public void glMateriali(@GLenum int face, @GLenum int pname, int param); + boolean glIsList(@GLuint int list); + void glMaterialf(@GLenum int face, @GLenum int pname, float param); + void glMateriali(@GLenum int face, @GLenum int pname, int param); @StripPostfix("params") - public void glMaterialfv(@GLenum int face, @GLenum int pname, @Check("4") @Const FloatBuffer params); + void glMaterialfv(@GLenum int face, @GLenum int pname, @Check("4") @Const FloatBuffer params); @StripPostfix("params") - public void glMaterialiv(@GLenum int face, @GLenum int pname, @Check("4") @Const IntBuffer params); + void glMaterialiv(@GLenum int face, @GLenum int pname, @Check("4") @Const IntBuffer params); - public void glMapGrid1f(int un, float u1, float u2); - public void glMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2); + void glMapGrid1f(int un, float u1, float u2); + void glMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2); // TODO: check buffer size valid - public void glMap2f(@GLenum int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, @Check @Const FloatBuffer points); + void glMap2f(@GLenum int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, @Check @Const FloatBuffer points); // TODO: check buffer size valid - public void glMap1f(@GLenum int target, float u1, float u2, int stride, int order, @Check @Const FloatBuffer points); + void glMap1f(@GLenum int target, float u1, float u2, int stride, int order, @Check @Const FloatBuffer points); - public void glLogicOp(@GLenum int opcode); - public void glLoadName(@GLuint int name); + void glLogicOp(@GLenum int opcode); + void glLoadName(@GLuint int name); @StripPostfix("m") - public void glLoadMatrixf(@Check("16") @Const FloatBuffer m); + void glLoadMatrixf(@Check("16") @Const FloatBuffer m); - public void glLoadIdentity(); - public void glListBase(@GLuint int base); - public void glLineWidth(float width); - public void glLineStipple(int factor, @GLushort short pattern); - public void glLightModelf(@GLenum int pname, float param); - public void glLightModeli(@GLenum int pname, int param); + void glLoadIdentity(); + void glListBase(@GLuint int base); + void glLineWidth(float width); + void glLineStipple(int factor, @GLushort short pattern); + void glLightModelf(@GLenum int pname, float param); + void glLightModeli(@GLenum int pname, int param); @StripPostfix("params") - public void glLightModelfv(@GLenum int pname, @Check("4") @Const FloatBuffer params); + void glLightModelfv(@GLenum int pname, @Check("4") @Const FloatBuffer params); @StripPostfix("params") - public void glLightModeliv(@GLenum int pname, @Check("4") @Const IntBuffer params); - public void glLightf(@GLenum int light, @GLenum int pname, float param); - public void glLighti(@GLenum int light, @GLenum int pname, int param); + void glLightModeliv(@GLenum int pname, @Check("4") @Const IntBuffer params); + void glLightf(@GLenum int light, @GLenum int pname, float param); + void glLighti(@GLenum int light, @GLenum int pname, int param); @StripPostfix("params") - public void glLightfv(@GLenum int light, @GLenum int pname, @Check("4") @Const FloatBuffer params); + void glLightfv(@GLenum int light, @GLenum int pname, @Check("4") @Const FloatBuffer params); @StripPostfix("params") - public void glLightiv(@GLenum int light, @GLenum int pname, @Check("4") @Const IntBuffer params); + void glLightiv(@GLenum int light, @GLenum int pname, @Check("4") @Const IntBuffer params); - public boolean glIsTexture(@GLuint int texture); - public void glMatrixMode(@GLenum int mode); - public void glPolygonStipple(@BufferObject(BufferKind.UnpackPBO) @Check("1024") @Const @GLubyte ByteBuffer mask); + boolean glIsTexture(@GLuint int texture); + void glMatrixMode(@GLenum int mode); + void glPolygonStipple(@BufferObject(BufferKind.UnpackPBO) @Check("1024") @Const @GLubyte ByteBuffer mask); - public void glPolygonOffset(float factor, float units); - public void glPolygonMode(@GLenum int face, @GLenum int mode); - public void glPointSize(float size); - public void glPixelZoom(float xfactor, float yfactor); - public void glPixelTransferf(@GLenum int pname, float param); - public void glPixelTransferi(@GLenum int pname, int param); - public void glPixelStoref(@GLenum int pname, float param); - public void glPixelStorei(@GLenum int pname, int param); + void glPolygonOffset(float factor, float units); + void glPolygonMode(@GLenum int face, @GLenum int mode); + void glPointSize(float size); + void glPixelZoom(float xfactor, float yfactor); + void glPixelTransferf(@GLenum int pname, float param); + void glPixelTransferi(@GLenum int pname, int param); + void glPixelStoref(@GLenum int pname, float param); + void glPixelStorei(@GLenum int pname, int param); @StripPostfix("values") - public void glPixelMapfv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const FloatBuffer values); + void glPixelMapfv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const FloatBuffer values); @StripPostfix("values") - public void glPixelMapuiv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const @GLuint IntBuffer values); + void glPixelMapuiv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const @GLuint IntBuffer values); @StripPostfix("values") - public void glPixelMapusv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const @GLushort ShortBuffer values); + void glPixelMapusv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const @GLushort ShortBuffer values); - public void glPassThrough(float token); - public void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar); + void glPassThrough(float token); + void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar); - public void glNormalPointer(@AutoType("pointer") @GLenum int type, @GLsizei int stride, + void glNormalPointer(@AutoType("pointer") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -996,27 +996,27 @@ public interface GL11 { @GLfloat Buffer pointer); - public void glNormal3b(byte nx, byte ny, byte nz); - public void glNormal3f(float nx, float ny, float nz); - public void glNormal3i(int nx, int ny, int nz); - public void glNewList(@GLuint int list, @GLenum int mode); - public void glEndList(); + void glNormal3b(byte nx, byte ny, byte nz); + void glNormal3f(float nx, float ny, float nz); + void glNormal3i(int nx, int ny, int nz); + void glNewList(@GLuint int list, @GLenum int mode); + void glEndList(); @StripPostfix("m") - public void glMultMatrixf(@Check("16") @Const FloatBuffer m); + void glMultMatrixf(@Check("16") @Const FloatBuffer m); - public void glShadeModel(@GLenum int mode); + void glShadeModel(@GLenum int mode); - public void glSelectBuffer(@AutoSize("buffer") @GLsizei int size, @GLuint IntBuffer buffer); + void glSelectBuffer(@AutoSize("buffer") @GLsizei int size, @GLuint IntBuffer buffer); - public void glScissor(int x, int y, @GLsizei int width, @GLsizei int height); - public void glScalef(float x, float y, float z); - public void glRotatef(float angle, float x, float y, float z); - public int glRenderMode(@GLenum int mode); - public void glRectf(float x1, float y1, float x2, float y2); - public void glRecti(int x1, int y1, int x2, int y2); + void glScissor(int x, int y, @GLsizei int width, @GLsizei int height); + void glScalef(float x, float y, float z); + void glRotatef(float angle, float x, float y, float z); + int glRenderMode(@GLenum int mode); + void glRectf(float x1, float y1, float x2, float y2); + void glRecti(int x1, int y1, int x2, int y2); - public void glReadPixels(int x, int y, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, + void glReadPixels(int x, int y, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.PackPBO) @Check("GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)") @GLbyte @@ -1024,29 +1024,29 @@ public interface GL11 { @GLint Buffer pixels); - public void glReadBuffer(@GLenum int mode); - public void glRasterPos2f(float x, float y); - public void glRasterPos2i(int x, int y); - public void glRasterPos3f(float x, float y, float z); - public void glRasterPos3i(int x, int y, int z); - public void glRasterPos4f(float x, float y, float z, float w); - public void glRasterPos4i(int x, int y, int z, int w); - public void glPushName(@GLuint int name); - public void glPopName(); - public void glPushMatrix(); - public void glPopMatrix(); + void glReadBuffer(@GLenum int mode); + void glRasterPos2f(float x, float y); + void glRasterPos2i(int x, int y); + void glRasterPos3f(float x, float y, float z); + void glRasterPos3i(int x, int y, int z); + void glRasterPos4f(float x, float y, float z, float w); + void glRasterPos4i(int x, int y, int z, int w); + void glPushName(@GLuint int name); + void glPopName(); + void glPushMatrix(); + void glPopMatrix(); @Code( " BufferObjectTracker.pushAttrib(mask);") - public void glPushClientAttrib(@GLbitfield int mask); + void glPushClientAttrib(@GLbitfield int mask); @Code( " BufferObjectTracker.popAttrib();") - public void glPopClientAttrib(); + void glPopClientAttrib(); - public void glPushAttrib(@GLbitfield int mask); - public void glPopAttrib(); - public void glStencilFunc(@GLenum int func, int ref, @GLuint int mask); + void glPushAttrib(@GLbitfield int mask); + void glPopAttrib(); + void glStencilFunc(@GLenum int func, int ref, @GLuint int mask); - public void glVertexPointer(int size, @AutoType("pointer") @GLenum int type, @GLsizei int stride, + void glVertexPointer(int size, @AutoType("pointer") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -1054,15 +1054,15 @@ public interface GL11 { @GLfloat Buffer pointer); - public void glVertex2f(float x, float y); - public void glVertex2i(int x, int y); - public void glVertex3f(float x, float y, float z); - public void glVertex3i(int x, int y, int z); - public void glVertex4f(float x, float y, float z, float w); - public void glVertex4i(int x, int y, int z, int w); - public void glTranslatef(float x, float y, float z); + void glVertex2f(float x, float y); + void glVertex2i(int x, int y); + void glVertex3f(float x, float y, float z); + void glVertex3i(int x, int y, int z); + void glVertex4f(float x, float y, float z, float w); + void glVertex4i(int x, int y, int z, int w); + void glTranslatef(float x, float y, float z); - public void glTexImage1D(@GLenum int target, int level, int internalformat, @GLsizei int width, int border, @GLenum int format, @GLenum int type, + void glTexImage1D(@GLenum int target, int level, int internalformat, @GLsizei int width, int border, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check(value="GLBufferChecks.calculateTexImage1DStorage(pixels, format, type, width, border)", canBeNull=true) @Const @@ -1072,7 +1072,7 @@ public interface GL11 { @GLfloat Buffer pixels); - public void glTexImage2D(@GLenum int target, int level, int internalformat, int width, int height, int border, @GLenum int format, @GLenum int type, + void glTexImage2D(@GLenum int target, int level, int internalformat, int width, int height, int border, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check(value="GLBufferChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border)", canBeNull=true) @Const @@ -1081,7 +1081,7 @@ public interface GL11 { @GLint @GLfloat Buffer pixels); - public void glTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLenum int type, + void glTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check("GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1)") @Const @@ -1090,7 +1090,7 @@ public interface GL11 { @GLint @GLfloat Buffer pixels); - public void glTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, + void glTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check("GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)") @Const @@ -1100,41 +1100,41 @@ public interface GL11 { @GLfloat Buffer pixels); - public void glTexParameterf(@GLenum int target, @GLenum int pname, float param); - public void glTexParameteri(@GLenum int target, @GLenum int pname, int param); + void glTexParameterf(@GLenum int target, @GLenum int pname, float param); + void glTexParameteri(@GLenum int target, @GLenum int pname, int param); @StripPostfix("param") - public void glTexParameterfv(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer param); + void glTexParameterfv(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer param); @StripPostfix("param") - public void glTexParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer param); + void glTexParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer param); - public void glTexGenf(@GLenum int coord, @GLenum int pname, float param); + void glTexGenf(@GLenum int coord, @GLenum int pname, float param); @StripPostfix("params") - public void glTexGenfv(@GLenum int coord, @GLenum int pname, @Check("4") @Const FloatBuffer params); + void glTexGenfv(@GLenum int coord, @GLenum int pname, @Check("4") @Const FloatBuffer params); - public void glTexGeni(@GLenum int coord, @GLenum int pname, int param); + void glTexGeni(@GLenum int coord, @GLenum int pname, int param); @StripPostfix("params") - public void glTexGeniv(@GLenum int coord, @GLenum int pname, @Check("4") @Const IntBuffer params); + void glTexGeniv(@GLenum int coord, @GLenum int pname, @Check("4") @Const IntBuffer params); - public void glTexEnvf(@GLenum int target, @GLenum int pname, float param); - public void glTexEnvi(@GLenum int target, @GLenum int pname, int param); + void glTexEnvf(@GLenum int target, @GLenum int pname, float param); + void glTexEnvi(@GLenum int target, @GLenum int pname, int param); @StripPostfix("params") - public void glTexEnvfv(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params); + void glTexEnvfv(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params); @StripPostfix("params") - public void glTexEnviv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params); + void glTexEnviv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params); - public void glTexCoordPointer(int size, @AutoType("pointer") @GLenum int type, @GLsizei int stride, + void glTexCoordPointer(int size, @AutoType("pointer") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @GLfloat Buffer pointer); - public void glTexCoord1f(float s); - public void glTexCoord2f(float s, float t); - public void glTexCoord3f(float s, float t, float r); - public void glTexCoord4f(float s, float t, float r, float q); - public void glStencilOp(@GLenum int fail, @GLenum int zfail, @GLenum int zpass); - public void glStencilMask(@GLuint int mask); - public void glViewport(int x, int y, @GLsizei int width, @GLsizei int height); + void glTexCoord1f(float s); + void glTexCoord2f(float s, float t); + void glTexCoord3f(float s, float t, float r); + void glTexCoord4f(float s, float t, float r, float q); + void glStencilOp(@GLenum int fail, @GLenum int zfail, @GLenum int zpass); + void glStencilMask(@GLuint int mask); + void glViewport(int x, int y, @GLsizei int width, @GLsizei int height); } diff --git a/src/templates/org/lwjgl/opengl/GL12.java b/src/templates/org/lwjgl/opengl/GL12.java index 38964fa5..ddfc2e70 100644 --- a/src/templates/org/lwjgl/opengl/GL12.java +++ b/src/templates/org/lwjgl/opengl/GL12.java @@ -32,16 +32,9 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.ShortBuffer; import org.lwjgl.generator.*; -import org.lwjgl.BufferChecks; -import org.lwjgl.LWJGLException; - /** * $Id$ *

@@ -53,47 +46,47 @@ import org.lwjgl.LWJGLException; public interface GL12 { /* Error codes */ - public static final int GL_TABLE_TOO_LARGE = 0x8031; + int GL_TABLE_TOO_LARGE = 0x8031; /* Enums */ - public static final int GL_PACK_SKIP_IMAGES = 0x806B; - public static final int GL_PACK_IMAGE_HEIGHT = 0x806C; - public static final int GL_UNPACK_SKIP_IMAGES = 0x806D; - public static final int GL_UNPACK_IMAGE_HEIGHT = 0x806E; - public static final int GL_TEXTURE_3D = 0x806F; - public static final int GL_PROXY_TEXTURE_3D = 0x8070; - public static final int GL_TEXTURE_DEPTH = 0x8071; - public static final int GL_TEXTURE_WRAP_R = 0x8072; - public static final int GL_MAX_3D_TEXTURE_SIZE = 0x8073; - public static final int GL_BGR = 0x80E0; - public static final int GL_BGRA = 0x80E1; - public static final int GL_UNSIGNED_BYTE_3_3_2 = 0x8032; - public static final int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362; - public static final int GL_UNSIGNED_SHORT_5_6_5 = 0x8363; - public static final int GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364; - public static final int GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033; - public static final int GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365; - public static final int GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034; - public static final int GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366; - public static final int GL_UNSIGNED_INT_8_8_8_8 = 0x8035; - public static final int GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367; - public static final int GL_UNSIGNED_INT_10_10_10_2 = 0x8036; - public static final int GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368; - public static final int GL_RESCALE_NORMAL = 0x803A; - public static final int GL_LIGHT_MODEL_COLOR_CONTROL = 0x81F8; - public static final int GL_SINGLE_COLOR = 0x81F9; - public static final int GL_SEPARATE_SPECULAR_COLOR = 0x81FA; - public static final int GL_CLAMP_TO_EDGE = 0x812F; - public static final int GL_TEXTURE_MIN_LOD = 0x813A; - public static final int GL_TEXTURE_MAX_LOD = 0x813B; - public static final int GL_TEXTURE_BASE_LEVEL = 0x813C; - public static final int GL_TEXTURE_MAX_LEVEL = 0x813D; - public static final int GL_MAX_ELEMENTS_VERTICES = 0x80E8; - public static final int GL_MAX_ELEMENTS_INDICES = 0x80E9; - public static final int GL_ALIASED_POINT_SIZE_RANGE = 0x846D; - public static final int GL_ALIASED_LINE_WIDTH_RANGE = 0x846E; + int GL_PACK_SKIP_IMAGES = 0x806B; + int GL_PACK_IMAGE_HEIGHT = 0x806C; + int GL_UNPACK_SKIP_IMAGES = 0x806D; + int GL_UNPACK_IMAGE_HEIGHT = 0x806E; + int GL_TEXTURE_3D = 0x806F; + int GL_PROXY_TEXTURE_3D = 0x8070; + int GL_TEXTURE_DEPTH = 0x8071; + int GL_TEXTURE_WRAP_R = 0x8072; + int GL_MAX_3D_TEXTURE_SIZE = 0x8073; + int GL_BGR = 0x80E0; + int GL_BGRA = 0x80E1; + int GL_UNSIGNED_BYTE_3_3_2 = 0x8032; + int GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362; + int GL_UNSIGNED_SHORT_5_6_5 = 0x8363; + int GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364; + int GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033; + int GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365; + int GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034; + int GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366; + int GL_UNSIGNED_INT_8_8_8_8 = 0x8035; + int GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367; + int GL_UNSIGNED_INT_10_10_10_2 = 0x8036; + int GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368; + int GL_RESCALE_NORMAL = 0x803A; + int GL_LIGHT_MODEL_COLOR_CONTROL = 0x81F8; + int GL_SINGLE_COLOR = 0x81F9; + int GL_SEPARATE_SPECULAR_COLOR = 0x81FA; + int GL_CLAMP_TO_EDGE = 0x812F; + int GL_TEXTURE_MIN_LOD = 0x813A; + int GL_TEXTURE_MAX_LOD = 0x813B; + int GL_TEXTURE_BASE_LEVEL = 0x813C; + int GL_TEXTURE_MAX_LEVEL = 0x813D; + int GL_MAX_ELEMENTS_VERTICES = 0x80E8; + int GL_MAX_ELEMENTS_INDICES = 0x80E9; + int GL_ALIASED_POINT_SIZE_RANGE = 0x846D; + int GL_ALIASED_LINE_WIDTH_RANGE = 0x846E; - public void glDrawRangeElements(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("indices") @GLsizei int count, + void glDrawRangeElements(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type, @@ -103,8 +96,8 @@ public interface GL12 { @GLushort @GLuint Buffer indices); - - public void glTexImage3D(@GLenum int target, int level, int internalFormat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLenum int format, @GLenum int type, + + void glTexImage3D(@GLenum int target, int level, int internalFormat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check(value="GLBufferChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border)", canBeNull=true) @Const @@ -114,7 +107,7 @@ public interface GL12 { @GLfloat Buffer pixels); - public void glTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLenum int type, + void glTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLenum int type, @BufferObject(BufferKind.UnpackPBO) @Check("GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth)") @Const @@ -123,6 +116,6 @@ public interface GL12 { @GLint @GLfloat Buffer pixels); - public void glCopyTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, @GLsizei int width, @GLsizei int height); + void glCopyTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, @GLsizei int width, @GLsizei int height); } diff --git a/src/templates/org/lwjgl/opengl/GL13.java b/src/templates/org/lwjgl/opengl/GL13.java index 23194821..22cdc1a7 100644 --- a/src/templates/org/lwjgl/opengl/GL13.java +++ b/src/templates/org/lwjgl/opengl/GL13.java @@ -32,14 +32,9 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.ShortBuffer; import org.lwjgl.generator.*; -import org.lwjgl.LWJGLException; -import org.lwjgl.BufferChecks; /** * $Id$ @@ -50,112 +45,112 @@ import org.lwjgl.BufferChecks; * @version $Revision$ */ public interface 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; + int GL_TEXTURE0 = 0x84C0; + int GL_TEXTURE1 = 0x84C1; + int GL_TEXTURE2 = 0x84C2; + int GL_TEXTURE3 = 0x84C3; + int GL_TEXTURE4 = 0x84C4; + int GL_TEXTURE5 = 0x84C5; + int GL_TEXTURE6 = 0x84C6; + int GL_TEXTURE7 = 0x84C7; + int GL_TEXTURE8 = 0x84C8; + int GL_TEXTURE9 = 0x84C9; + int GL_TEXTURE10 = 0x84CA; + int GL_TEXTURE11 = 0x84CB; + int GL_TEXTURE12 = 0x84CC; + int GL_TEXTURE13 = 0x84CD; + int GL_TEXTURE14 = 0x84CE; + int GL_TEXTURE15 = 0x84CF; + int GL_TEXTURE16 = 0x84D0; + int GL_TEXTURE17 = 0x84D1; + int GL_TEXTURE18 = 0x84D2; + int GL_TEXTURE19 = 0x84D3; + int GL_TEXTURE20 = 0x84D4; + int GL_TEXTURE21 = 0x84D5; + int GL_TEXTURE22 = 0x84D6; + int GL_TEXTURE23 = 0x84D7; + int GL_TEXTURE24 = 0x84D8; + int GL_TEXTURE25 = 0x84D9; + int GL_TEXTURE26 = 0x84DA; + int GL_TEXTURE27 = 0x84DB; + int GL_TEXTURE28 = 0x84DC; + int GL_TEXTURE29 = 0x84DD; + int GL_TEXTURE30 = 0x84DE; + int GL_TEXTURE31 = 0x84DF; + int GL_ACTIVE_TEXTURE = 0x84E0; + int GL_CLIENT_ACTIVE_TEXTURE = 0x84E1; + 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; + int GL_NORMAL_MAP = 0x8511; + int GL_REFLECTION_MAP = 0x8512; + int GL_TEXTURE_CUBE_MAP = 0x8513; + int GL_TEXTURE_BINDING_CUBE_MAP = 0x8514; + int GL_TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515; + int GL_TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516; + int GL_TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517; + int GL_TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518; + int GL_TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519; + int GL_TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A; + int GL_PROXY_TEXTURE_CUBE_MAP = 0x851B; + 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_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_NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2; - public static final int GL_COMPRESSED_TEXTURE_FORMATS = 0x86A3; + int GL_COMPRESSED_ALPHA = 0x84E9; + int GL_COMPRESSED_LUMINANCE = 0x84EA; + int GL_COMPRESSED_LUMINANCE_ALPHA = 0x84EB; + int GL_COMPRESSED_INTENSITY = 0x84EC; + int GL_COMPRESSED_RGB = 0x84ED; + int GL_COMPRESSED_RGBA = 0x84EE; + int GL_TEXTURE_COMPRESSION_HINT = 0x84EF; + int GL_TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0; + int GL_TEXTURE_COMPRESSED = 0x86A1; + int GL_NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2; + int GL_COMPRESSED_TEXTURE_FORMATS = 0x86A3; - 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; + int GL_MULTISAMPLE = 0x809D; + int GL_SAMPLE_ALPHA_TO_COVERAGE = 0x809E; + int GL_SAMPLE_ALPHA_TO_ONE = 0x809F; + int GL_SAMPLE_COVERAGE = 0x80A0; + int GL_SAMPLE_BUFFERS = 0x80A8; + int GL_SAMPLES = 0x80A9; + int GL_SAMPLE_COVERAGE_VALUE = 0x80AA; + int GL_SAMPLE_COVERAGE_INVERT = 0x80AB; + 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; + int GL_TRANSPOSE_MODELVIEW_MATRIX = 0x84E3; + int GL_TRANSPOSE_PROJECTION_MATRIX = 0x84E4; + int GL_TRANSPOSE_TEXTURE_MATRIX = 0x84E5; + 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; + int GL_COMBINE = 0x8570; + int GL_COMBINE_RGB = 0x8571; + int GL_COMBINE_ALPHA = 0x8572; + int GL_SOURCE0_RGB = 0x8580; + int GL_SOURCE1_RGB = 0x8581; + int GL_SOURCE2_RGB = 0x8582; + int GL_SOURCE0_ALPHA = 0x8588; + int GL_SOURCE1_ALPHA = 0x8589; + int GL_SOURCE2_ALPHA = 0x858A; + int GL_OPERAND0_RGB = 0x8590; + int GL_OPERAND1_RGB = 0x8591; + int GL_OPERAND2_RGB = 0x8592; + int GL_OPERAND0_ALPHA = 0x8598; + int GL_OPERAND1_ALPHA = 0x8599; + int GL_OPERAND2_ALPHA = 0x859A; + int GL_RGB_SCALE = 0x8573; + int GL_ADD_SIGNED = 0x8574; + int GL_INTERPOLATE = 0x8575; + int GL_SUBTRACT = 0x84E7; + int GL_CONSTANT = 0x8576; + int GL_PRIMARY_COLOR = 0x8577; + int GL_PREVIOUS = 0x8578; + int GL_DOT3_RGB = 0x86AE; + int GL_DOT3_RGBA = 0x86AF; + int GL_CLAMP_TO_BORDER = 0x812D; - public void glActiveTexture(@GLenum int texture); + void glActiveTexture(@GLenum int texture); - public void glClientActiveTexture(@GLenum int texture); - public void glCompressedTexImage1D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize, + void glClientActiveTexture(@GLenum int texture); + void glCompressedTexImage1D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize, @BufferObject(BufferKind.UnpackPBO) @Check @Const @@ -165,7 +160,7 @@ public interface GL13 { @GLfloat Buffer data); - public void glCompressedTexImage2D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize, + void glCompressedTexImage2D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize, @BufferObject(BufferKind.UnpackPBO) @Check @Const @@ -175,17 +170,7 @@ public interface GL13 { @GLfloat Buffer data); - public void glCompressedTexImage3D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize, - @BufferObject(BufferKind.UnpackPBO) - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - Buffer data); - - public void glCompressedTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize, + void glCompressedTexImage3D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize, @BufferObject(BufferKind.UnpackPBO) @Check @Const @@ -195,7 +180,7 @@ public interface GL13 { @GLfloat Buffer data); - public void glCompressedTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize, + void glCompressedTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize, @BufferObject(BufferKind.UnpackPBO) @Check @Const @@ -205,7 +190,7 @@ public interface GL13 { @GLfloat Buffer data); - public void glCompressedTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize, + void glCompressedTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize, @BufferObject(BufferKind.UnpackPBO) @Check @Const @@ -214,9 +199,19 @@ public interface GL13 { @GLint @GLfloat Buffer data); - + + void glCompressedTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize, + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + Buffer data); + // TODO: check buffer size valid - public void glGetCompressedTexImage(@GLenum int target, int lod, + void glGetCompressedTexImage(@GLenum int target, int lod, @BufferObject(BufferKind.PackPBO) @Check @GLbyte @@ -224,20 +219,20 @@ public interface GL13 { @GLint Buffer img); - public void glMultiTexCoord1f(@GLenum int target, float s); + void glMultiTexCoord1f(@GLenum int target, float s); - public void glMultiTexCoord2f(@GLenum int target, float s, float t); + void glMultiTexCoord2f(@GLenum int target, float s, float t); - public void glMultiTexCoord3f(@GLenum int target, float s, float t, float r); + void glMultiTexCoord3f(@GLenum int target, float s, float t, float r); - public void glMultiTexCoord4f(@GLenum int target, float s, float t, float r, float q); + void glMultiTexCoord4f(@GLenum int target, float s, float t, float r, float q); @StripPostfix("m") - public void glLoadTransposeMatrixf(@Check("16") @Const FloatBuffer m); + void glLoadTransposeMatrixf(@Check("16") @Const FloatBuffer m); @StripPostfix("m") - public void glMultTransposeMatrixf(@Check("16") @Const FloatBuffer m); + void glMultTransposeMatrixf(@Check("16") @Const FloatBuffer m); - public void glSampleCoverage(@GLclampf float value, boolean invert); + void glSampleCoverage(@GLclampf float value, boolean invert); } diff --git a/src/templates/org/lwjgl/opengl/GL14.java b/src/templates/org/lwjgl/opengl/GL14.java index 4eb92a05..310d37ac 100644 --- a/src/templates/org/lwjgl/opengl/GL14.java +++ b/src/templates/org/lwjgl/opengl/GL14.java @@ -32,13 +32,10 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; import org.lwjgl.generator.*; -import org.lwjgl.LWJGLException; -import org.lwjgl.BufferChecks; /** * $Id$ @@ -49,53 +46,53 @@ import org.lwjgl.BufferChecks; * @version $Revision$ */ public interface 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; + int GL_GENERATE_MIPMAP = 0x8191; + int GL_GENERATE_MIPMAP_HINT = 0x8192; + int GL_DEPTH_COMPONENT16 = 0x81A5; + int GL_DEPTH_COMPONENT24 = 0x81A6; + int GL_DEPTH_COMPONENT32 = 0x81A7; + int GL_TEXTURE_DEPTH_SIZE = 0x884A; + int GL_DEPTH_TEXTURE_MODE = 0x884B; + int GL_TEXTURE_COMPARE_MODE = 0x884C; + int GL_TEXTURE_COMPARE_FUNC = 0x884D; + int GL_COMPARE_R_TO_TEXTURE = 0x884E; + int GL_FOG_COORDINATE_SOURCE = 0x8450; + int GL_FOG_COORDINATE = 0x8451; + int GL_FRAGMENT_DEPTH = 0x8452; + int GL_CURRENT_FOG_COORDINATE = 0x8453; + int GL_FOG_COORDINATE_ARRAY_TYPE = 0x8454; + int GL_FOG_COORDINATE_ARRAY_STRIDE = 0x8455; + int GL_FOG_COORDINATE_ARRAY_POINTER = 0x8456; + int GL_FOG_COORDINATE_ARRAY = 0x8457; + int GL_POINT_SIZE_MIN = 0x8126; + int GL_POINT_SIZE_MAX = 0x8127; + int GL_POINT_FADE_THRESHOLD_SIZE = 0x8128; + int GL_POINT_DISTANCE_ATTENUATION = 0x8129; + int GL_COLOR_SUM = 0x8458; + int GL_CURRENT_SECONDARY_COLOR = 0x8459; + int GL_SECONDARY_COLOR_ARRAY_SIZE = 0x845A; + int GL_SECONDARY_COLOR_ARRAY_TYPE = 0x845B; + int GL_SECONDARY_COLOR_ARRAY_STRIDE = 0x845C; + int GL_SECONDARY_COLOR_ARRAY_POINTER = 0x845D; + int GL_SECONDARY_COLOR_ARRAY = 0x845E; + int GL_BLEND_DST_RGB = 0x80C8; + int GL_BLEND_SRC_RGB = 0x80C9; + int GL_BLEND_DST_ALPHA = 0x80CA; + int GL_BLEND_SRC_ALPHA = 0x80CB; + int GL_INCR_WRAP = 0x8507; + int GL_DECR_WRAP = 0x8508; + int GL_TEXTURE_FILTER_CONTROL = 0x8500; + int GL_TEXTURE_LOD_BIAS = 0x8501; + int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD; + int GL_GL_MIRRORED_REPEAT = 0x8370; - public void glBlendEquation(@GLenum int mode); + void glBlendEquation(@GLenum int mode); - public void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); + void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); - public void glFogCoordf(float coord); + void glFogCoordf(float coord); - public void glFogCoordPointer(@AutoType("data") @GLenum int type, @GLsizei int stride, + void glFogCoordPointer(@AutoType("data") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -105,22 +102,22 @@ public interface GL14 { @Code( " if (piFirst.remaining() != piCount.remaining()) {\n" + " throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" + " }") - public void glMultiDrawArrays(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") @GLsizei int primcount); + void glMultiDrawArrays(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") @GLsizei int primcount); - //public static native void glMultiDrawElements(int mode, int piCount, int type, int pIndices, int primcount); + //void glMultiDrawElements(int mode, int piCount, int type, int pIndices, int primcount); - public void glPointParameteri(@GLenum int pname, int param); - public void glPointParameterf(@GLenum int pname, float param); + void glPointParameteri(@GLenum int pname, int param); + void glPointParameterf(@GLenum int pname, float param); @StripPostfix("params") - public void glPointParameteriv(@GLenum int pname, @Check("4") IntBuffer params); + void glPointParameteriv(@GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glPointParameterfv(@GLenum int pname, @Check("4") FloatBuffer params); + void glPointParameterfv(@GLenum int pname, @Check("4") FloatBuffer params); - public void glSecondaryColor3b(byte red, byte green, byte blue); - public void glSecondaryColor3f(float red, float green, float blue); - public void glSecondaryColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); + void glSecondaryColor3b(byte red, byte green, byte blue); + void glSecondaryColor3f(float red, float green, float blue); + void glSecondaryColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); - public void glSecondaryColorPointer(int size, @AutoType("data") @GLenum int type, @GLsizei int stride, + void glSecondaryColorPointer(int size, @AutoType("data") @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -129,10 +126,10 @@ public interface GL14 { @GLfloat Buffer data); - public void glBlendFuncSeparate(@GLenum int sfactorRGB, @GLenum int dfactorRGB, @GLenum int sfactorAlpha, @GLenum int dfactorAlpha); - public void glWindowPos2f(float x, float y); - public void glWindowPos2i(int x, int y); - public void glWindowPos3f(float x, float y, float z); - public void glWindowPos3i(int x, int y, int z); + void glBlendFuncSeparate(@GLenum int sfactorRGB, @GLenum int dfactorRGB, @GLenum int sfactorAlpha, @GLenum int dfactorAlpha); + void glWindowPos2f(float x, float y); + void glWindowPos2i(int x, int y); + void glWindowPos3f(float x, float y, float z); + void glWindowPos3i(int x, int y, int z); } diff --git a/src/templates/org/lwjgl/opengl/GL15.java b/src/templates/org/lwjgl/opengl/GL15.java index 5d5352d1..9ca88269 100644 --- a/src/templates/org/lwjgl/opengl/GL15.java +++ b/src/templates/org/lwjgl/opengl/GL15.java @@ -32,8 +32,6 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; -import org.lwjgl.BufferChecks; -import org.lwjgl.LWJGLException; import java.nio.*; @@ -42,55 +40,55 @@ public interface GL15 { // ---------------------- ARB_vertex_buffer_object ---------------------- // ---------------------------------------------------------------------- - public static final int GL_ARRAY_BUFFER = 0x8892; - public static final int GL_ELEMENT_ARRAY_BUFFER = 0x8893; - public static final int GL_ARRAY_BUFFER_BINDING = 0x8894; - public static final int GL_ELEMENT_ARRAY_BUFFER_BINDING = 0x8895; - public static final int GL_VERTEX_ARRAY_BUFFER_BINDING = 0x8896; - public static final int GL_NORMAL_ARRAY_BUFFER_BINDING = 0x8897; - public static final int GL_COLOR_ARRAY_BUFFER_BINDING = 0x8898; - public static final int GL_INDEX_ARRAY_BUFFER_BINDING = 0x8899; - public static final int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING = 0x889A; - public static final int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING = 0x889B; - public static final int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING = 0x889C; - public static final int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING = 0x889D; - public static final int GL_WEIGHT_ARRAY_BUFFER_BINDING = 0x889E; - public static final int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F; - public static final int GL_STREAM_DRAW = 0x88E0; - public static final int GL_STREAM_READ = 0x88E1; - public static final int GL_STREAM_COPY = 0x88E2; - public static final int GL_STATIC_DRAW = 0x88E4; - public static final int GL_STATIC_READ = 0x88E5; - public static final int GL_STATIC_COPY = 0x88E6; - public static final int GL_DYNAMIC_DRAW = 0x88E8; - public static final int GL_DYNAMIC_READ = 0x88E9; - public static final int GL_DYNAMIC_COPY = 0x88EA; - public static final int GL_READ_ONLY = 0x88B8; - public static final int GL_WRITE_ONLY = 0x88B9; - public static final int GL_READ_WRITE = 0x88BA; - public static final int GL_BUFFER_SIZE = 0x8764; - public static final int GL_BUFFER_USAGE = 0x8765; - public static final int GL_BUFFER_ACCESS = 0x88BB; - public static final int GL_BUFFER_MAPPED = 0x88BC; - public static final int GL_BUFFER_MAP_POINTER = 0x88BD; + int GL_ARRAY_BUFFER = 0x8892; + int GL_ELEMENT_ARRAY_BUFFER = 0x8893; + int GL_ARRAY_BUFFER_BINDING = 0x8894; + int GL_ELEMENT_ARRAY_BUFFER_BINDING = 0x8895; + int GL_VERTEX_ARRAY_BUFFER_BINDING = 0x8896; + int GL_NORMAL_ARRAY_BUFFER_BINDING = 0x8897; + int GL_COLOR_ARRAY_BUFFER_BINDING = 0x8898; + int GL_INDEX_ARRAY_BUFFER_BINDING = 0x8899; + int GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING = 0x889A; + int GL_EDGE_FLAG_ARRAY_BUFFER_BINDING = 0x889B; + int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING = 0x889C; + int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING = 0x889D; + int GL_WEIGHT_ARRAY_BUFFER_BINDING = 0x889E; + int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F; + int GL_STREAM_DRAW = 0x88E0; + int GL_STREAM_READ = 0x88E1; + int GL_STREAM_COPY = 0x88E2; + int GL_STATIC_DRAW = 0x88E4; + int GL_STATIC_READ = 0x88E5; + int GL_STATIC_COPY = 0x88E6; + int GL_DYNAMIC_DRAW = 0x88E8; + int GL_DYNAMIC_READ = 0x88E9; + int GL_DYNAMIC_COPY = 0x88EA; + int GL_READ_ONLY = 0x88B8; + int GL_WRITE_ONLY = 0x88B9; + int GL_READ_WRITE = 0x88BA; + int GL_BUFFER_SIZE = 0x8764; + int GL_BUFFER_USAGE = 0x8765; + int GL_BUFFER_ACCESS = 0x88BB; + int GL_BUFFER_MAPPED = 0x88BC; + int GL_BUFFER_MAP_POINTER = 0x88BD; @Code( " BufferObjectTracker.bindBuffer(target, buffer);") - public void glBindBuffer(@GLenum int target, @GLuint int buffer); + void glBindBuffer(@GLenum int target, @GLuint int buffer); @Code( " BufferObjectTracker.deleteBuffers(buffers);") - public void glDeleteBuffers(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers); + void glDeleteBuffers(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers); + + void glGenBuffers(@AutoSize("buffers") @GLsizei int n, @GLuint IntBuffer buffers); + boolean glIsBuffer(@GLuint int buffer); - public void glGenBuffers(@AutoSize("buffers") @GLsizei int n, @GLuint IntBuffer buffers); - public boolean glIsBuffer(@GLuint int buffer); - @GenerateAutos - public void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr int size, + void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr int size, @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage); - public void glBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, + void glBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, @Check @Const @GLbyte @@ -98,8 +96,8 @@ public interface GL15 { @GLint @GLfloat Buffer data); - - public void glGetBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, + + void glGetBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, @Check @GLbyte @GLshort @@ -123,15 +121,15 @@ public interface GL15 { * @return A ByteBuffer representing the mapped buffer memory. */ @CachedResult - public @GLvoid ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access); + @GLvoid ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access); - public boolean glUnmapBuffer(@GLenum int target); + boolean glUnmapBuffer(@GLenum int target); @StripPostfix("params") - public void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("pointer") - public void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); + void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); // ----------------------------------------------------------------- // ---------------------- ARB_occlusion_query ---------------------- @@ -141,34 +139,34 @@ public interface GL15 { * Accepted by the parameter of BeginQuery, EndQuery, * and GetQueryiv: */ - public static final int GL_SAMPLES_PASSED = 0x8914; + int GL_SAMPLES_PASSED = 0x8914; /* Accepted by the parameter of GetQueryiv: */ - public static final int GL_QUERY_COUNTER_BITS = 0x8864; - public static final int GL_CURRENT_QUERY = 0x8865; + int GL_QUERY_COUNTER_BITS = 0x8864; + int GL_CURRENT_QUERY = 0x8865; /* Accepted by the parameter of GetQueryObjectiv and GetQueryObjectuiv: */ - public static final int GL_QUERY_RESULT = 0x8866; - public static final int GL_QUERY_RESULT_AVAILABLE = 0x8867; + int GL_QUERY_RESULT = 0x8866; + int GL_QUERY_RESULT_AVAILABLE = 0x8867; - public void glGenQueries(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); - public void glDeleteQueries(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); - public boolean glIsQuery(@GLuint int id); + void glGenQueries(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); + void glDeleteQueries(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids); + boolean glIsQuery(@GLuint int id); - public void glBeginQuery(@GLenum int target, @GLuint int id); - public void glEndQuery(@GLenum int target); + void glBeginQuery(@GLenum int target, @GLuint int id); + void glEndQuery(@GLenum int target); @StripPostfix("params") - public void glGetQueryiv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); + void glGetQueryiv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetQueryObjectiv(@GLenum int id, @GLenum int pname, @Check("4") @GLint IntBuffer params); + void glGetQueryObjectiv(@GLenum int id, @GLenum int pname, @Check("4") @GLint IntBuffer params); @StripPostfix("params") - public void glGetQueryObjectuiv(@GLenum int id, @GLenum int pname, @Check("4") @GLuint IntBuffer params); + void glGetQueryObjectuiv(@GLenum int id, @GLenum int pname, @Check("4") @GLuint IntBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/GL20.java b/src/templates/org/lwjgl/opengl/GL20.java index c9ca13ac..70194c48 100644 --- a/src/templates/org/lwjgl/opengl/GL20.java +++ b/src/templates/org/lwjgl/opengl/GL20.java @@ -32,8 +32,6 @@ package org.lwjgl.opengl; import org.lwjgl.generator.*; -import org.lwjgl.BufferChecks; -import org.lwjgl.LWJGLException; import java.nio.*; @@ -45,7 +43,7 @@ public interface GL20 { /* * Accepted by the parameter of GetString: */ - public static final int GL_SHADING_LANGUAGE_VERSION = 0x8B8C; + int GL_SHADING_LANGUAGE_VERSION = 0x8B8C; // ------------------------------------------------------------------ // ----------------------[ ARB_shader_objects ]---------------------- @@ -54,51 +52,51 @@ public interface GL20 { /* * Accepted by the argument of GetInteger: */ - public static final int GL_CURRENT_PROGRAM = 0x8B8D; + int GL_CURRENT_PROGRAM = 0x8B8D; /* * Accepted by the parameter of GetObjectParameter{fi}vARB: */ - public static final int GL_SHADER_TYPE = 0x8B4F; - public static final int GL_DELETE_STATUS = 0x8B80; - public static final int GL_COMPILE_STATUS = 0x8B81; - public static final int GL_LINK_STATUS = 0x8B82; - public static final int GL_VALIDATE_STATUS = 0x8B83; - public static final int GL_INFO_LOG_LENGTH = 0x8B84; - public static final int GL_ATTACHED_SHADERS = 0x8B85; - public static final int GL_ACTIVE_UNIFORMS = 0x8B86; - public static final int GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87; - public static final int GL_ACTIVE_ATTRIBUTES = 0x8B89; - public static final int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A; - public static final int GL_SHADER_SOURCE_LENGTH = 0x8B88; + int GL_SHADER_TYPE = 0x8B4F; + int GL_DELETE_STATUS = 0x8B80; + int GL_COMPILE_STATUS = 0x8B81; + int GL_LINK_STATUS = 0x8B82; + int GL_VALIDATE_STATUS = 0x8B83; + int GL_INFO_LOG_LENGTH = 0x8B84; + int GL_ATTACHED_SHADERS = 0x8B85; + int GL_ACTIVE_UNIFORMS = 0x8B86; + int GL_ACTIVE_UNIFORM_MAX_LENGTH = 0x8B87; + int GL_ACTIVE_ATTRIBUTES = 0x8B89; + int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A; + int GL_SHADER_SOURCE_LENGTH = 0x8B88; /* * Returned by the parameter of GetObjectParameter{fi}vARB: */ - public static final int GL_SHADER_OBJECT = 0x8B48; + int GL_SHADER_OBJECT = 0x8B48; /* * Returned by the parameter of GetActiveUniformARB: */ - public static final int GL_FLOAT_VEC2 = 0x8B50; - public static final int GL_FLOAT_VEC3 = 0x8B51; - public static final int GL_FLOAT_VEC4 = 0x8B52; - public static final int GL_INT_VEC2 = 0x8B53; - public static final int GL_INT_VEC3 = 0x8B54; - public static final int GL_INT_VEC4 = 0x8B55; - public static final int GL_BOOL = 0x8B56; - public static final int GL_BOOL_VEC2 = 0x8B57; - public static final int GL_BOOL_VEC3 = 0x8B58; - public static final int GL_BOOL_VEC4 = 0x8B59; - public static final int GL_FLOAT_MAT2 = 0x8B5A; - public static final int GL_FLOAT_MAT3 = 0x8B5B; - public static final int GL_FLOAT_MAT4 = 0x8B5C; - public static final int GL_SAMPLER_1D = 0x8B5D; - public static final int GL_SAMPLER_2D = 0x8B5E; - public static final int GL_SAMPLER_3D = 0x8B5F; - public static final int GL_SAMPLER_CUBE = 0x8B60; - public static final int GL_SAMPLER_1D_SHADOW = 0x8B61; - public static final int GL_SAMPLER_2D_SHADOW = 0x8B62; + int GL_FLOAT_VEC2 = 0x8B50; + int GL_FLOAT_VEC3 = 0x8B51; + int GL_FLOAT_VEC4 = 0x8B52; + int GL_INT_VEC2 = 0x8B53; + int GL_INT_VEC3 = 0x8B54; + int GL_INT_VEC4 = 0x8B55; + int GL_BOOL = 0x8B56; + int GL_BOOL_VEC2 = 0x8B57; + int GL_BOOL_VEC3 = 0x8B58; + int GL_BOOL_VEC4 = 0x8B59; + int GL_FLOAT_MAT2 = 0x8B5A; + int GL_FLOAT_MAT3 = 0x8B5B; + int GL_FLOAT_MAT4 = 0x8B5C; + int GL_SAMPLER_1D = 0x8B5D; + int GL_SAMPLER_2D = 0x8B5E; + int GL_SAMPLER_3D = 0x8B5F; + int GL_SAMPLER_CUBE = 0x8B60; + int GL_SAMPLER_1D_SHADOW = 0x8B61; + int GL_SAMPLER_2D_SHADOW = 0x8B62; /** * The ARB_shader_objects extension allows multiple, optionally null-terminated, source strings to define a shader program. @@ -108,7 +106,7 @@ public interface GL20 { * @param shader * @param string */ - public void glShaderSource(@GLuint int shader, @Constant("1") @GLsizei int count, + void glShaderSource(@GLuint int shader, @Constant("1") @GLsizei int count, @Indirect @Check @Const @@ -120,105 +118,105 @@ public interface GL20 { @GLint int length); - public int glCreateShader(@GLuint int type); + int glCreateShader(@GLuint int type); - public boolean glIsShader(@GLuint int shader); + boolean glIsShader(@GLuint int shader); - public void glCompileShader(@GLuint int shader); + void glCompileShader(@GLuint int shader); - public void glDeleteShader(@GLuint int shader); + void glDeleteShader(@GLuint int shader); - public int glCreateProgram(); + int glCreateProgram(); - public boolean glIsProgram(int program); + boolean glIsProgram(int program); - public void glAttachShader(@GLuint int program, @GLuint int shader); + void glAttachShader(@GLuint int program, @GLuint int shader); - public void glDetachShader(@GLuint int program, @GLuint int shader); + void glDetachShader(@GLuint int program, @GLuint int shader); - public void glLinkProgram(@GLuint int program); + void glLinkProgram(@GLuint int program); - public void glUseProgram(@GLuint int program); + void glUseProgram(@GLuint int program); - public void glValidateProgram(@GLuint int program); + void glValidateProgram(@GLuint int program); - public void glDeleteProgram(@GLuint int program); + void glDeleteProgram(@GLuint int program); - public void glUniform1f(int location, float v0); + void glUniform1f(int location, float v0); - public void glUniform2f(int location, float v0, float v1); + void glUniform2f(int location, float v0, float v1); - public void glUniform3f(int location, float v0, float v1, float v2); + void glUniform3f(int location, float v0, float v1, float v2); - public void glUniform4f(int location, float v0, float v1, float v2, float v3); + void glUniform4f(int location, float v0, float v1, float v2, float v3); - public void glUniform1i(int location, int v0); + void glUniform1i(int location, int v0); - public void glUniform2i(int location, int v0, int v1); + void glUniform2i(int location, int v0, int v1); - public void glUniform3i(int location, int v0, int v1, int v2); + void glUniform3i(int location, int v0, int v1, int v2); - public void glUniform4i(int location, int v0, int v1, int v2, int v3); - - @StripPostfix("values") - public void glUniform1fv(int location, @AutoSize("values") @GLsizei int count, FloatBuffer values); - @StripPostfix("values") - public void glUniform2fv(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, FloatBuffer values); - @StripPostfix("values") - public void glUniform3fv(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, FloatBuffer values); - @StripPostfix("values") - public void glUniform4fv(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, FloatBuffer values); + void glUniform4i(int location, int v0, int v1, int v2, int v3); @StripPostfix("values") - public void glUniform1iv(int location, @AutoSize("values") @GLsizei int count, IntBuffer values); + void glUniform1fv(int location, @AutoSize("values") @GLsizei int count, FloatBuffer values); @StripPostfix("values") - public void glUniform2iv(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, IntBuffer values); + void glUniform2fv(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, FloatBuffer values); @StripPostfix("values") - public void glUniform3iv(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, IntBuffer values); + void glUniform3fv(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, FloatBuffer values); @StripPostfix("values") - public void glUniform4iv(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, IntBuffer values); + void glUniform4fv(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, FloatBuffer values); + + @StripPostfix("values") + void glUniform1iv(int location, @AutoSize("values") @GLsizei int count, IntBuffer values); + @StripPostfix("values") + void glUniform2iv(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, IntBuffer values); + @StripPostfix("values") + void glUniform3iv(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, IntBuffer values); + @StripPostfix("values") + void glUniform4iv(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, IntBuffer values); @StripPostfix("matrices") - public void glUniformMatrix2fv(int location, @AutoSize(value="matrices", expression=" >> 2") @GLsizei int count, + void glUniformMatrix2fv(int location, @AutoSize(value="matrices", expression=" >> 2") @GLsizei int count, boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") - public void glUniformMatrix3fv(int location, @AutoSize(value="matrices", expression=" / (3 * 3)") @GLsizei int count, + void glUniformMatrix3fv(int location, @AutoSize(value="matrices", expression=" / (3 * 3)") @GLsizei int count, boolean transpose, FloatBuffer matrices); @StripPostfix("matrices") - public void glUniformMatrix4fv(int location, @AutoSize(value="matrices", expression=" >> 4") @GLsizei int count, + void glUniformMatrix4fv(int location, @AutoSize(value="matrices", expression=" >> 4") @GLsizei int count, boolean transpose, FloatBuffer matrices); @StripPostfix("params") - public void glGetShaderfv(@GLuint int shader, @GLenum int pname, @Check FloatBuffer params); + void glGetShaderfv(@GLuint int shader, @GLenum int pname, @Check FloatBuffer params); @StripPostfix("params") - public void glGetShaderiv(@GLuint int shader, @GLenum int pname, @Check IntBuffer params); - - @StripPostfix("params") - public void glGetProgramfv(@GLuint int program, @GLenum int pname, @Check FloatBuffer params); - @StripPostfix("params") - public void glGetProgramiv(@GLuint int program, @GLenum int pname, @Check IntBuffer params); + void glGetShaderiv(@GLuint int shader, @GLenum int pname, @Check IntBuffer params); - public void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int maxLength, + @StripPostfix("params") + void glGetProgramfv(@GLuint int program, @GLenum int pname, @Check FloatBuffer params); + @StripPostfix("params") + void glGetProgramiv(@GLuint int program, @GLenum int pname, @Check IntBuffer params); + + void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int maxLength, @GLsizei @Check(value="1", canBeNull=true) IntBuffer length, @GLchar ByteBuffer infoLog); - public void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int maxLength, + void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int maxLength, @GLsizei @Check(value="1", canBeNull=true) IntBuffer length, @GLchar ByteBuffer infoLog); - public void glGetAttachedShaders(@GLuint int program, @AutoSize("shaders") @GLsizei int maxCount, + void glGetAttachedShaders(@GLuint int program, @AutoSize("shaders") @GLsizei int maxCount, @GLsizei @Check(value="1", canBeNull=true) IntBuffer count, @GLuint IntBuffer shaders); - + /** * Returns the location of the uniform with the specified name. The ByteBuffer should contain the uniform name as a * null-terminated string. @@ -228,9 +226,9 @@ public interface GL20 { * * @return */ - public int glGetUniformLocation(@GLuint int program, @NullTerminated @Check("1") @Const @GLchar ByteBuffer name); + int glGetUniformLocation(@GLuint int program, @NullTerminated @Check("1") @Const @GLchar ByteBuffer name); - public void glGetActiveUniform(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int maxLength, + void glGetActiveUniform(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int maxLength, @Check(value="1", canBeNull=true) @GLsizei IntBuffer length, @@ -244,11 +242,11 @@ public interface GL20 { ByteBuffer name); @StripPostfix("params") - public void glGetUniformfv(@GLuint int program, int location, @Check FloatBuffer params); + void glGetUniformfv(@GLuint int program, int location, @Check FloatBuffer params); @StripPostfix("params") - public void glGetUniformiv(@GLuint int program, int location, @Check IntBuffer params); - - public void glGetShaderSource(@GLuint int shader, @AutoSize("source") @GLsizei int maxLength, + void glGetUniformiv(@GLuint int program, int location, @Check IntBuffer params); + + void glGetShaderSource(@GLuint int shader, @AutoSize("source") @GLsizei int maxLength, @Check(value="1", canBeNull=true) @GLsizei IntBuffer length, @@ -259,25 +257,25 @@ public interface GL20 { // ----------------------[ ARB_vertex_program ]---------------------- // ------------------------------------------------------------------ - public void glVertexAttrib1s(@GLuint int index, short x); + void glVertexAttrib1s(@GLuint int index, short x); - public void glVertexAttrib1f(@GLuint int index, float x); + void glVertexAttrib1f(@GLuint int index, float x); - public void glVertexAttrib2s(@GLuint int index, short x, short y); + void glVertexAttrib2s(@GLuint int index, short x, short y); - public void glVertexAttrib2f(@GLuint int index, float x, float y); + void glVertexAttrib2f(@GLuint int index, float x, float y); - public void glVertexAttrib3s(@GLuint int index, short x, short y, short z); + void glVertexAttrib3s(@GLuint int index, short x, short y, short z); - public void glVertexAttrib3f(@GLuint int index, float x, float y, float z); + void glVertexAttrib3f(@GLuint int index, float x, float y, float z); - public void glVertexAttrib4s(@GLuint int index, short x, short y, short z, short w); + void glVertexAttrib4s(@GLuint int index, short x, short y, short z, short w); - public void glVertexAttrib4f(@GLuint int index, float x, float y, float z, float w); + void glVertexAttrib4f(@GLuint int index, float x, float y, float z, float w); - public void glVertexAttrib4Nub(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); + void glVertexAttrib4Nub(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); - public void glVertexAttribPointer(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride, + void glVertexAttribPointer(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -290,16 +288,16 @@ public interface GL20 { @GLfloat Buffer buffer); - public void glEnableVertexAttribArray(@GLuint int index); - public void glDisableVertexAttribArray(@GLuint int index); + void glEnableVertexAttribArray(@GLuint int index); + void glDisableVertexAttribArray(@GLuint int index); @StripPostfix("params") - public void glGetVertexAttribfv(@GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetVertexAttribfv(@GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetVertexAttribiv(@GLuint int index, @GLenum int pname, @Check("4") IntBuffer params); - + void glGetVertexAttribiv(@GLuint int index, @GLenum int pname, @Check("4") IntBuffer params); + @StripPostfix("pointer") - public void glGetVertexAttribPointerv(@GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); + void glGetVertexAttribPointerv(@GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer pointer); // ----------------------------------------------------------------- // ----------------------[ ARB_vertex_shader ]---------------------- @@ -309,46 +307,46 @@ public interface GL20 { * Accepted by the argument of CreateShader and * returned by the parameter of GetShader{if}v: */ - public static final int GL_VERTEX_SHADER = 0x8B31; + int GL_VERTEX_SHADER = 0x8B31; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A; - public static final int GL_MAX_VARYING_FLOATS = 0x8B4B; - public static final int GL_MAX_VERTEX_ATTRIBS = 0x8869; - public static final int GL_MAX_TEXTURE_IMAGE_UNITS = 0x8872; - public static final int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8B4C; - public static final int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D; - public static final int GL_MAX_TEXTURE_COORDS = 0x8871; + int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A; + int GL_MAX_VARYING_FLOATS = 0x8B4B; + int GL_MAX_VERTEX_ATTRIBS = 0x8869; + int GL_MAX_TEXTURE_IMAGE_UNITS = 0x8872; + int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8B4C; + int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D; + int GL_MAX_TEXTURE_COORDS = 0x8871; /* * Accepted by the parameter of Disable, Enable, and IsEnabled, and * by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and * GetDoublev: */ - public static final int GL_VERTEX_PROGRAM_POINT_SIZE = 0x8642; - public static final int GL_VERTEX_PROGRAM_TWO_SIDE = 0x8643; + int GL_VERTEX_PROGRAM_POINT_SIZE = 0x8642; + int GL_VERTEX_PROGRAM_TWO_SIDE = 0x8643; /* * Accepted by the parameter of GetVertexAttrib{dfi}vARB: */ - public static final int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622; - public static final int GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623; - public static final int GL_VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624; - public static final int GL_VERTEX_ATTRIB_ARRAY_TYPE = 0x8625; - public static final int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A; - public static final int GL_CURRENT_VERTEX_ATTRIB = 0x8626; + int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622; + int GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623; + int GL_VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624; + int GL_VERTEX_ATTRIB_ARRAY_TYPE = 0x8625; + int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A; + int GL_CURRENT_VERTEX_ATTRIB = 0x8626; /* * Accepted by the parameter of GetVertexAttribPointervARB: */ - public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645; + int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645; - public void glBindAttribLocation(@GLuint int program, @GLuint int index, @NullTerminated @Const @GLchar ByteBuffer name); - - public void glGetActiveAttrib(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int maxLength, + void glBindAttribLocation(@GLuint int program, @GLuint int index, @NullTerminated @Const @GLchar ByteBuffer name); + + void glGetActiveAttrib(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int maxLength, @Check(value="1", canBeNull=true) @GLsizei IntBuffer length, @@ -361,7 +359,7 @@ public interface GL20 { @GLchar ByteBuffer name); - public int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name); + int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name); // ------------------------------------------------------------------- // ----------------------[ ARB_fragment_shader ]---------------------- @@ -371,19 +369,19 @@ public interface GL20 { * Accepted by the argument of CreateShader and * returned by the parameter of GetShader{fi}vARB: */ - public static final int GL_FRAGMENT_SHADER = 0x8B30; + int GL_FRAGMENT_SHADER = 0x8B30; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8B49; + int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8B49; /* * Accepted by the parameter of Hint and the parameter of * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8B8B; + int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8B8B; // ---------------------------------------------------------------- // ----------------------[ ARB_draw_buffers ]---------------------- @@ -393,25 +391,25 @@ public interface GL20 { * Accepted by the parameters of GetIntegerv, GetFloatv, * and GetDoublev: */ - public static final int GL_MAX_DRAW_BUFFERS = 0x8824; - public static final int GL_DRAW_BUFFER0 = 0x8825; - public static final int GL_DRAW_BUFFER1 = 0x8826; - public static final int GL_DRAW_BUFFER2 = 0x8827; - public static final int GL_DRAW_BUFFER3 = 0x8828; - public static final int GL_DRAW_BUFFER4 = 0x8829; - public static final int GL_DRAW_BUFFER5 = 0x882A; - public static final int GL_DRAW_BUFFER6 = 0x882B; - public static final int GL_DRAW_BUFFER7 = 0x882C; - public static final int GL_DRAW_BUFFER8 = 0x882D; - public static final int GL_DRAW_BUFFER9 = 0x882E; - public static final int GL_DRAW_BUFFER10 = 0x882F; - public static final int GL_DRAW_BUFFER11 = 0x8830; - public static final int GL_DRAW_BUFFER12 = 0x8831; - public static final int GL_DRAW_BUFFER13 = 0x8832; - public static final int GL_DRAW_BUFFER14 = 0x8833; - public static final int GL_DRAW_BUFFER15 = 0x8834; + int GL_MAX_DRAW_BUFFERS = 0x8824; + int GL_DRAW_BUFFER0 = 0x8825; + int GL_DRAW_BUFFER1 = 0x8826; + int GL_DRAW_BUFFER2 = 0x8827; + int GL_DRAW_BUFFER3 = 0x8828; + int GL_DRAW_BUFFER4 = 0x8829; + int GL_DRAW_BUFFER5 = 0x882A; + int GL_DRAW_BUFFER6 = 0x882B; + int GL_DRAW_BUFFER7 = 0x882C; + int GL_DRAW_BUFFER8 = 0x882D; + int GL_DRAW_BUFFER9 = 0x882E; + int GL_DRAW_BUFFER10 = 0x882F; + int GL_DRAW_BUFFER11 = 0x8830; + int GL_DRAW_BUFFER12 = 0x8831; + int GL_DRAW_BUFFER13 = 0x8832; + int GL_DRAW_BUFFER14 = 0x8833; + int GL_DRAW_BUFFER15 = 0x8834; - public void glDrawBuffers(@AutoSize("buffers") @GLsizei int size, @Const @GLenum IntBuffer buffers); + void glDrawBuffers(@AutoSize("buffers") @GLsizei int size, @Const @GLenum IntBuffer buffers); // ---------------------------------------------------------------- // ----------------------[ ARB_point_sprite ]---------------------- @@ -423,51 +421,51 @@ public interface GL20 { * GetDoublev, and by the parameter of TexEnvi, TexEnviv, * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv: */ - public static final int GL_POINT_SPRITE = 0x8861; + int GL_POINT_SPRITE = 0x8861; /* * When the parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv, * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE, then the value of * may be: */ - public static final int GL_COORD_REPLACE = 0x8862; + int GL_COORD_REPLACE = 0x8862; /* * Accepted by the parameter of PointParameter{if}vARB, and the * of Get: */ - public static final int GL_POINT_SPRITE_COORD_ORIGIN = 0x8CA0; + int GL_POINT_SPRITE_COORD_ORIGIN = 0x8CA0; /* * Accepted by the parameter of PointParameter{if}vARB: */ - public static final int GL_LOWER_LEFT = 0x8CA1; - public static final int GL_UPPER_LEFT = 0x8CA2; + int GL_LOWER_LEFT = 0x8CA1; + int GL_UPPER_LEFT = 0x8CA2; // ----------------------------------------------------------------- // ----------------------[ Two-Sided Stencil ]---------------------- // ----------------------------------------------------------------- - public static final int GL_STENCIL_BACK_FUNC = 0x8800; - public static final int GL_STENCIL_BACK_FAIL = 0x8801; - public static final int GL_STENCIL_BACK_PASS_DEPTH_FAIL = 0x8802; - public static final int GL_STENCIL_BACK_PASS_DEPTH_PASS = 0x8803; - public static final int GL_STENCIL_BACK_REF = 0x8CA3; - public static final int GL_STENCIL_BACK_VALUE_MASK = 0x8CA4; - public static final int GL_STENCIL_BACK_WRITEMASK = 0x8CA5; + int GL_STENCIL_BACK_FUNC = 0x8800; + int GL_STENCIL_BACK_FAIL = 0x8801; + int GL_STENCIL_BACK_PASS_DEPTH_FAIL = 0x8802; + int GL_STENCIL_BACK_PASS_DEPTH_PASS = 0x8803; + int GL_STENCIL_BACK_REF = 0x8CA3; + int GL_STENCIL_BACK_VALUE_MASK = 0x8CA4; + int GL_STENCIL_BACK_WRITEMASK = 0x8CA5; - public void glStencilOpSeparate(@GLenum int face, @GLenum int sfail, @GLenum int dpfail, @GLenum int dppass); + void glStencilOpSeparate(@GLenum int face, @GLenum int sfail, @GLenum int dpfail, @GLenum int dppass); - public void glStencilFuncSeparate(@GLenum int face, @GLenum int func, int ref, @GLuint int mask); + void glStencilFuncSeparate(@GLenum int face, @GLenum int func, int ref, @GLuint int mask); - public void glStencilMaskSeparate(@GLenum int face, @GLuint int mask); + void glStencilMaskSeparate(@GLenum int face, @GLuint int mask); // ------------------------------------------------------------- // ----------------------[ EXT_blend_equation_separate ]---------------------- // ------------------------------------------------------------- - public static final int GL_BLEND_EQUATION_RGB = 0x8009; - public static final int GL_BLEND_EQUATION_ALPHA = 0x883D; + int GL_BLEND_EQUATION_RGB = 0x8009; + int GL_BLEND_EQUATION_ALPHA = 0x883D; - public void glBlendEquationSeparate(@GLenum int modeRGB, @GLenum int modeAlpha); + void glBlendEquationSeparate(@GLenum int modeRGB, @GLenum int modeAlpha); } diff --git a/src/templates/org/lwjgl/opengl/NV_copy_depth_to_color.java b/src/templates/org/lwjgl/opengl/NV_copy_depth_to_color.java index 620847ef..bc827bfe 100644 --- a/src/templates/org/lwjgl/opengl/NV_copy_depth_to_color.java +++ b/src/templates/org/lwjgl/opengl/NV_copy_depth_to_color.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface NV_copy_depth_to_color { - public static final int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E; - public static final int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F; + int GL_DEPTH_STENCIL_TO_RGBA_NV = 0x886E; + int GL_DEPTH_STENCIL_TO_BGRA_NV = 0x886F; } diff --git a/src/templates/org/lwjgl/opengl/NV_depth_clamp.java b/src/templates/org/lwjgl/opengl/NV_depth_clamp.java index a8147665..4148cdb8 100644 --- a/src/templates/org/lwjgl/opengl/NV_depth_clamp.java +++ b/src/templates/org/lwjgl/opengl/NV_depth_clamp.java @@ -32,5 +32,5 @@ package org.lwjgl.opengl; public interface NV_depth_clamp { - public static final int GL_DEPTH_CLAMP_NV = 0x864F; + int GL_DEPTH_CLAMP_NV = 0x864F; } diff --git a/src/templates/org/lwjgl/opengl/NV_evaluators.java b/src/templates/org/lwjgl/opengl/NV_evaluators.java index b1f0f6f4..228be81d 100644 --- a/src/templates/org/lwjgl/opengl/NV_evaluators.java +++ b/src/templates/org/lwjgl/opengl/NV_evaluators.java @@ -38,53 +38,53 @@ import java.nio.IntBuffer; import org.lwjgl.generator.*; public interface NV_evaluators { - 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; + int GL_EVAL_2D_NV = 0x86C0; + int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1; + int GL_MAP_TESSELLATION_NV = 0x86C2; + int GL_MAP_ATTRIB_U_ORDER_NV = 0x86C3; + int GL_MAP_ATTRIB_V_ORDER_NV = 0x86C4; + int GL_EVAL_FRACTIONAL_TESSELLATION_NV = 0x86C5; + int GL_EVAL_VERTEX_ATTRIB0_NV = 0x86C6; + int GL_EVAL_VERTEX_ATTRIB1_NV = 0x86C7; + int GL_EVAL_VERTEX_ATTRIB2_NV = 0x86C8; + int GL_EVAL_VERTEX_ATTRIB3_NV = 0x86C9; + int GL_EVAL_VERTEX_ATTRIB4_NV = 0x86CA; + int GL_EVAL_VERTEX_ATTRIB5_NV = 0x86CB; + int GL_EVAL_VERTEX_ATTRIB6_NV = 0x86CC; + int GL_EVAL_VERTEX_ATTRIB7_NV = 0x86CD; + int GL_EVAL_VERTEX_ATTRIB8_NV = 0x86CE; + int GL_EVAL_VERTEX_ATTRIB9_NV = 0x86CF; + int GL_EVAL_VERTEX_ATTRIB10_NV = 0x86D0; + int GL_EVAL_VERTEX_ATTRIB11_NV = 0x86D1; + int GL_EVAL_VERTEX_ATTRIB12_NV = 0x86D2; + int GL_EVAL_VERTEX_ATTRIB13_NV = 0x86D3; + int GL_EVAL_VERTEX_ATTRIB14_NV = 0x86D4; + int GL_EVAL_VERTEX_ATTRIB15_NV = 0x86D5; + int GL_MAX_MAP_TESSELLATION_NV = 0x86D6; + int GL_MAX_RATIONAL_EVAL_ORDER_NV = 0x86D7; - public void glGetMapControlPointsNV(@GLenum int target, @GLuint int index, @GLenum int type, @GLsizei int ustride, @GLsizei int vstride, boolean packed, + void glGetMapControlPointsNV(@GLenum int target, @GLuint int index, @GLenum int type, @GLsizei int ustride, @GLsizei int vstride, boolean packed, @Check @Const @GLfloat Buffer pPoints); - public void glMapControlPointsNV(@GLenum int target, @GLuint int index, @GLenum int type, @GLsizei int ustride, @GLsizei int vstride, int uorder, int vorder, boolean packed, @Check @Const @GLfloat Buffer pPoints); + void glMapControlPointsNV(@GLenum int target, @GLuint int index, @GLenum int type, @GLsizei int ustride, @GLsizei int vstride, int uorder, int vorder, boolean packed, @Check @Const @GLfloat Buffer pPoints); @StripPostfix("params") - public void glMapParameterfvNV(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params); + void glMapParameterfvNV(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params); @StripPostfix("params") - public void glMapParameterivNV(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params); + void glMapParameterivNV(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params); @StripPostfix("params") - public void glGetMapParameterfvNV(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params); + void glGetMapParameterfvNV(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params); @StripPostfix("params") - public void glGetMapParameterivNV(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params); + void glGetMapParameterivNV(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params); @StripPostfix("params") - public void glGetMapAttribParameterfvNV(@GLenum int target, @GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetMapAttribParameterfvNV(@GLenum int target, @GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetMapAttribParameterivNV(@GLenum int target, @GLuint int index, @GLenum int pname, @Check("4") IntBuffer params); + void glGetMapAttribParameterivNV(@GLenum int target, @GLuint int index, @GLenum int pname, @Check("4") IntBuffer params); - public void glEvalMapsNV(@GLenum int target, @GLenum int mode); + void glEvalMapsNV(@GLenum int target, @GLenum int mode); } diff --git a/src/templates/org/lwjgl/opengl/NV_fence.java b/src/templates/org/lwjgl/opengl/NV_fence.java index 80b097c4..da179a4f 100644 --- a/src/templates/org/lwjgl/opengl/NV_fence.java +++ b/src/templates/org/lwjgl/opengl/NV_fence.java @@ -36,20 +36,20 @@ import java.nio.IntBuffer; import org.lwjgl.generator.*; public interface NV_fence { - 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; + int GL_ALL_COMPLETED_NV = 0x84F2; + int GL_FENCE_STATUS_NV = 0x84F3; + int GL_FENCE_CONDITION_NV = 0x84F4; - public void glGenFencesNV(@AutoSize("piFences") @GLsizei int n, @GLuint IntBuffer piFences); - public void glDeleteFencesNV(@AutoSize("piFences") @GLsizei int n, @Const @GLuint IntBuffer piFences); + void glGenFencesNV(@AutoSize("piFences") @GLsizei int n, @GLuint IntBuffer piFences); + void glDeleteFencesNV(@AutoSize("piFences") @GLsizei int n, @Const @GLuint IntBuffer piFences); - public void glSetFenceNV(@GLuint int fence, @GLenum int condition); + void glSetFenceNV(@GLuint int fence, @GLenum int condition); - public boolean glTestFenceNV(@GLuint int fence); + boolean glTestFenceNV(@GLuint int fence); - public void glFinishFenceNV(@GLuint int fence); + void glFinishFenceNV(@GLuint int fence); - public boolean glIsFenceNV(@GLuint int fence); + boolean glIsFenceNV(@GLuint int fence); - public void glGetFenceivNV(@GLuint int fence, @GLenum int pname, @Check("4") IntBuffer piParams); + void glGetFenceivNV(@GLuint int fence, @GLenum int pname, @Check("4") IntBuffer piParams); } diff --git a/src/templates/org/lwjgl/opengl/NV_float_buffer.java b/src/templates/org/lwjgl/opengl/NV_float_buffer.java index 2e7ae56f..acc9cb98 100644 --- a/src/templates/org/lwjgl/opengl/NV_float_buffer.java +++ b/src/templates/org/lwjgl/opengl/NV_float_buffer.java @@ -36,50 +36,50 @@ public interface NV_float_buffer { * Accepted by the parameter of TexImage2D and * CopyTexImage2D: */ - public static final int GL_FLOAT_R_NV = 0x8880; - public static final int GL_FLOAT_RG_NV = 0x8881; - public static final int GL_FLOAT_RGB_NV = 0x8882; - public static final int GL_FLOAT_RGBA_NV = 0x8883; - public static final int GL_FLOAT_R16_NV = 0x8884; - public static final int GL_FLOAT_R32_NV = 0x8885; - public static final int GL_FLOAT_RG16_NV = 0x8886; - public static final int GL_FLOAT_RG32_NV = 0x8887; - public static final int GL_FLOAT_RGB16_NV = 0x8888; - public static final int GL_FLOAT_RGB32_NV = 0x8889; - public static final int GL_FLOAT_RGBA16_NV = 0x888A; - public static final int GL_FLOAT_RGBA32_NV = 0x888B; + int GL_FLOAT_R_NV = 0x8880; + int GL_FLOAT_RG_NV = 0x8881; + int GL_FLOAT_RGB_NV = 0x8882; + int GL_FLOAT_RGBA_NV = 0x8883; + int GL_FLOAT_R16_NV = 0x8884; + int GL_FLOAT_R32_NV = 0x8885; + int GL_FLOAT_RG16_NV = 0x8886; + int GL_FLOAT_RG32_NV = 0x8887; + int GL_FLOAT_RGB16_NV = 0x8888; + int GL_FLOAT_RGB32_NV = 0x8889; + int GL_FLOAT_RGBA16_NV = 0x888A; + int GL_FLOAT_RGBA32_NV = 0x888B; /* * Accepted by the parameter of GetTexLevelParameterfv and * GetTexLevelParameteriv: */ - public static final int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888C; + int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888C; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, * and GetDoublev: */ - public static final int GL_FLOAT_CLEAR_COLOR_VALUE_NV = 0x888D; - public static final int GL_FLOAT_RGBA_MODE_NV = 0x888E; + int GL_FLOAT_CLEAR_COLOR_VALUE_NV = 0x888D; + int GL_FLOAT_RGBA_MODE_NV = 0x888E; /* * Accepted in the array of wglGetPixelFormatAttribivARB and * wglGetPixelFormatAttribfvARB and in the and * arrays of wglChoosePixelFormatARB: */ - public static final int GL_WGL_FLOAT_COMPONENTS_NV = 0x20B0; - public static final int GL_WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV = 0x20B1; - public static final int GL_WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV = 0x20B2; - public static final int GL_WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV = 0x20B3; - public static final int GL_WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV = 0x20B4; + int GL_WGL_FLOAT_COMPONENTS_NV = 0x20B0; + int GL_WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV = 0x20B1; + int GL_WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV = 0x20B2; + int GL_WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV = 0x20B3; + int GL_WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV = 0x20B4; /* * Accepted in the array of wglCreatePbufferARB and returned * in the parameter of wglQueryPbufferARB when is * WGL_TEXTURE_FORMAT_ARB: */ - public static final int GL_WGL_TEXTURE_FLOAT_R_NV = 0x20B5; - public static final int GL_WGL_TEXTURE_FLOAT_RG_NV = 0x20B6; - public static final int GL_WGL_TEXTURE_FLOAT_RGB_NV = 0x20B7; - public static final int GL_WGL_TEXTURE_FLOAT_RGBA_NV = 0x20B8; + int GL_WGL_TEXTURE_FLOAT_R_NV = 0x20B5; + int GL_WGL_TEXTURE_FLOAT_RG_NV = 0x20B6; + int GL_WGL_TEXTURE_FLOAT_RGB_NV = 0x20B7; + int GL_WGL_TEXTURE_FLOAT_RGBA_NV = 0x20B8; } diff --git a/src/templates/org/lwjgl/opengl/NV_fog_distance.java b/src/templates/org/lwjgl/opengl/NV_fog_distance.java index c3c3386e..bd813c77 100644 --- a/src/templates/org/lwjgl/opengl/NV_fog_distance.java +++ b/src/templates/org/lwjgl/opengl/NV_fog_distance.java @@ -25,14 +25,14 @@ * 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 interface NV_fog_distance { - 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; + int GL_FOG_DISTANCE_MODE_NV = 0x855A; + int GL_EYE_RADIAL_NV = 0x855B; + int GL_EYE_PLANE_ABSOLUTE_NV = 0x855C; } diff --git a/src/templates/org/lwjgl/opengl/NV_fragment_program.java b/src/templates/org/lwjgl/opengl/NV_fragment_program.java index 1b02ba4c..f58a7250 100644 --- a/src/templates/org/lwjgl/opengl/NV_fragment_program.java +++ b/src/templates/org/lwjgl/opengl/NV_fragment_program.java @@ -45,20 +45,20 @@ public interface NV_fragment_program extends NV_program { * ProgramLocalParameter4fARB, ProgramLocalParameter4fvARB, * GetProgramLocalParameterdvARB, and GetProgramLocalParameterfvARB: */ - public static final int GL_FRAGMENT_PROGRAM_NV = 0x8870; + int GL_FRAGMENT_PROGRAM_NV = 0x8870; /* * 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; - public static final int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873; - public static final int GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV = 0x8868; + int GL_MAX_TEXTURE_COORDS_NV = 0x8871; + int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872; + int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873; + int GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV = 0x8868; - public void glProgramNamedParameter4fNV(@GLuint int id, @AutoSize("name") @GLsizei int length, @Const @GLubyte ByteBuffer name, float x, float y, float z, float w); + void glProgramNamedParameter4fNV(@GLuint int id, @AutoSize("name") @GLsizei int length, @Const @GLubyte ByteBuffer name, float x, float y, float z, float w); @StripPostfix("params") - public void glGetProgramNamedParameterfvNV(@GLuint int id, @AutoSize("name") @GLsizei int length, @Const @GLubyte ByteBuffer name, @Check("4") FloatBuffer params); + void glGetProgramNamedParameterfvNV(@GLuint int id, @AutoSize("name") @GLsizei int length, @Const @GLubyte ByteBuffer name, @Check("4") FloatBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/NV_fragment_program2.java b/src/templates/org/lwjgl/opengl/NV_fragment_program2.java index f3df2652..790ea333 100644 --- a/src/templates/org/lwjgl/opengl/NV_fragment_program2.java +++ b/src/templates/org/lwjgl/opengl/NV_fragment_program2.java @@ -35,9 +35,9 @@ public interface NV_fragment_program2 { /* * Accepted by the parameter of GetProgramivARB: */ - public static final int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4; - public static final int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5; - public static final int GL_MAX_PROGRAM_IF_DEPTH_NV = 0x88F6; - public static final int GL_MAX_PROGRAM_LOOP_DEPTH_NV = 0x88F7; - public static final int GL_MAX_PROGRAM_LOOP_COUNT_NV = 0x88F8; + int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4; + int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5; + int GL_MAX_PROGRAM_IF_DEPTH_NV = 0x88F6; + int GL_MAX_PROGRAM_LOOP_DEPTH_NV = 0x88F7; + int GL_MAX_PROGRAM_LOOP_COUNT_NV = 0x88F8; } diff --git a/src/templates/org/lwjgl/opengl/NV_half_float.java b/src/templates/org/lwjgl/opengl/NV_half_float.java index 18ce1d94..272f2199 100644 --- a/src/templates/org/lwjgl/opengl/NV_half_float.java +++ b/src/templates/org/lwjgl/opengl/NV_half_float.java @@ -43,54 +43,54 @@ public interface NV_half_float { * DrawPixels, ReadPixels, TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, * TexSubImage2D, TexSubImage3D, and GetTexImage: */ - public static final int GL_HALF_FLOAT_NV = 0x140B; + int GL_HALF_FLOAT_NV = 0x140B; - public void glVertex2hNV(@GLhalf short x, @GLhalf short y); + void glVertex2hNV(@GLhalf short x, @GLhalf short y); - public void glVertex3hNV(@GLhalf short x, @GLhalf short y, @GLhalf short z); + void glVertex3hNV(@GLhalf short x, @GLhalf short y, @GLhalf short z); - public void glVertex4hNV(@GLhalf short x, @GLhalf short y, @GLhalf short z, @GLhalf short w); + void glVertex4hNV(@GLhalf short x, @GLhalf short y, @GLhalf short z, @GLhalf short w); - public void glNormal3hNV(@GLhalf short nx, @GLhalf short ny, @GLhalf short nz); + void glNormal3hNV(@GLhalf short nx, @GLhalf short ny, @GLhalf short nz); - public void glColor3hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue); + void glColor3hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue); - public void glColor4hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue, @GLhalf short alpha); + void glColor4hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue, @GLhalf short alpha); - public void glTexCoord1hNV(@GLhalf short s); + void glTexCoord1hNV(@GLhalf short s); - public void glTexCoord2hNV(@GLhalf short s, @GLhalf short t); + void glTexCoord2hNV(@GLhalf short s, @GLhalf short t); - public void glTexCoord3hNV(@GLhalf short s, @GLhalf short t, @GLhalf short r); + void glTexCoord3hNV(@GLhalf short s, @GLhalf short t, @GLhalf short r); - public void glTexCoord4hNV(@GLhalf short s, @GLhalf short t, @GLhalf short r, @GLhalf short q); + void glTexCoord4hNV(@GLhalf short s, @GLhalf short t, @GLhalf short r, @GLhalf short q); - public void glMultiTexCoord1hNV(@GLenum int target, @GLhalf short s); + void glMultiTexCoord1hNV(@GLenum int target, @GLhalf short s); - public void glMultiTexCoord2hNV(@GLenum int target, @GLhalf short s, @GLhalf short t); + void glMultiTexCoord2hNV(@GLenum int target, @GLhalf short s, @GLhalf short t); - public void glMultiTexCoord3hNV(@GLenum int target, @GLhalf short s, @GLhalf short t, @GLhalf short r); + void glMultiTexCoord3hNV(@GLenum int target, @GLhalf short s, @GLhalf short t, @GLhalf short r); - public void glMultiTexCoord4hNV(@GLenum int target, @GLhalf short s, @GLhalf short t, @GLhalf short r, @GLhalf short q); + void glMultiTexCoord4hNV(@GLenum int target, @GLhalf short s, @GLhalf short t, @GLhalf short r, @GLhalf short q); - public void glFogCoordhNV(@GLhalf short fog); + void glFogCoordhNV(@GLhalf short fog); - public void glSecondaryColor3hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue); + void glSecondaryColor3hNV(@GLhalf short red, @GLhalf short green, @GLhalf short blue); - public void glVertexAttrib1hNV(@GLuint int index, @GLhalf short x); + void glVertexAttrib1hNV(@GLuint int index, @GLhalf short x); - public void glVertexAttrib2hNV(@GLuint int index, @GLhalf short x, @GLhalf short y); + void glVertexAttrib2hNV(@GLuint int index, @GLhalf short x, @GLhalf short y); - public void glVertexAttrib3hNV(@GLuint int index, @GLhalf short x, @GLhalf short y, @GLhalf short z); + void glVertexAttrib3hNV(@GLuint int index, @GLhalf short x, @GLhalf short y, @GLhalf short z); - public void glVertexAttrib4hNV(@GLuint int index, @GLhalf short x, @GLhalf short y, @GLhalf short z, @GLhalf short w); + void glVertexAttrib4hNV(@GLuint int index, @GLhalf short x, @GLhalf short y, @GLhalf short z, @GLhalf short w); @StripPostfix("attribs") - public void glVertexAttribs1hvNV(@GLuint int index, @AutoSize("attribs") @GLsizei int n, @Const @GLhalf ShortBuffer attribs); + void glVertexAttribs1hvNV(@GLuint int index, @AutoSize("attribs") @GLsizei int n, @Const @GLhalf ShortBuffer attribs); @StripPostfix("attribs") - public void glVertexAttribs2hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" >> 1") @GLsizei int n, @Const @GLhalf ShortBuffer attribs); + void glVertexAttribs2hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" >> 1") @GLsizei int n, @Const @GLhalf ShortBuffer attribs); @StripPostfix("attribs") - public void glVertexAttribs3hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" / 3") @GLsizei int n, @Const @GLhalf ShortBuffer attribs); + void glVertexAttribs3hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" / 3") @GLsizei int n, @Const @GLhalf ShortBuffer attribs); @StripPostfix("attribs") - public void glVertexAttribs4hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" >> 2") @GLsizei int n, @Const @GLhalf ShortBuffer attribs); + void glVertexAttribs4hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" >> 2") @GLsizei int n, @Const @GLhalf ShortBuffer attribs); } diff --git a/src/templates/org/lwjgl/opengl/NV_light_max_exponent.java b/src/templates/org/lwjgl/opengl/NV_light_max_exponent.java index d1111aab..daaa4f83 100644 --- a/src/templates/org/lwjgl/opengl/NV_light_max_exponent.java +++ b/src/templates/org/lwjgl/opengl/NV_light_max_exponent.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface NV_light_max_exponent { - public static final int GL_MAX_SHININESS_NV = 0x8504; - public static final int GL_MAX_SPOT_EXPONENT_NV = 0x8505; + int GL_MAX_SHININESS_NV = 0x8504; + int GL_MAX_SPOT_EXPONENT_NV = 0x8505; } diff --git a/src/templates/org/lwjgl/opengl/NV_multisample_filter_hint.java b/src/templates/org/lwjgl/opengl/NV_multisample_filter_hint.java index 4fbbefde..3c3d6f5b 100644 --- a/src/templates/org/lwjgl/opengl/NV_multisample_filter_hint.java +++ b/src/templates/org/lwjgl/opengl/NV_multisample_filter_hint.java @@ -36,5 +36,5 @@ public interface NV_multisample_filter_hint { * Accepted by the parameter of Hint and by the * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534; + int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534; } diff --git a/src/templates/org/lwjgl/opengl/NV_occlusion_query.java b/src/templates/org/lwjgl/opengl/NV_occlusion_query.java index d8a347f9..c2f96569 100644 --- a/src/templates/org/lwjgl/opengl/NV_occlusion_query.java +++ b/src/templates/org/lwjgl/opengl/NV_occlusion_query.java @@ -36,25 +36,25 @@ import java.nio.IntBuffer; import org.lwjgl.generator.*; public interface NV_occlusion_query { - public static final int GL_OCCLUSION_TEST_HP = 0x8165; - public static final int GL_OCCLUSION_TEST_RESULT_HP = 0x8166; + int GL_OCCLUSION_TEST_HP = 0x8165; + 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; + int GL_PIXEL_COUNTER_BITS_NV = 0x8864; + int GL_CURRENT_OCCLUSION_QUERY_ID_NV = 0x8865; + int GL_PIXEL_COUNT_NV = 0x8866; + int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867; - public void glGenOcclusionQueriesNV(@AutoSize("piIDs") @GLsizei int n, @GLuint IntBuffer piIDs); - public void glDeleteOcclusionQueriesNV(@AutoSize("piIDs") @GLsizei int n, @Const @GLuint IntBuffer piIDs); + void glGenOcclusionQueriesNV(@AutoSize("piIDs") @GLsizei int n, @GLuint IntBuffer piIDs); + void glDeleteOcclusionQueriesNV(@AutoSize("piIDs") @GLsizei int n, @Const @GLuint IntBuffer piIDs); - public boolean glIsOcclusionQueryNV(@GLuint int id); + boolean glIsOcclusionQueryNV(@GLuint int id); - public void glBeginOcclusionQueryNV(@GLuint int id); + void glBeginOcclusionQueryNV(@GLuint int id); - public void glEndOcclusionQueryNV(); + void glEndOcclusionQueryNV(); @StripPostfix("params") - public void glGetOcclusionQueryuivNV(@GLuint int id, @GLenum int pname, @Check("4") @GLuint IntBuffer params); + void glGetOcclusionQueryuivNV(@GLuint int id, @GLenum int pname, @Check("4") @GLuint IntBuffer params); @StripPostfix("params") - public void glGetOcclusionQueryivNV(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params); + void glGetOcclusionQueryivNV(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/NV_packed_depth_stencil.java b/src/templates/org/lwjgl/opengl/NV_packed_depth_stencil.java index 3694efe5..f00f67e9 100644 --- a/src/templates/org/lwjgl/opengl/NV_packed_depth_stencil.java +++ b/src/templates/org/lwjgl/opengl/NV_packed_depth_stencil.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface NV_packed_depth_stencil { - public static final int GL_DEPTH_STENCIL_NV = 0x84F9; - public static final int GL_UNSIGNED_INT_24_8_NV = 0x84FA; + int GL_DEPTH_STENCIL_NV = 0x84F9; + int GL_UNSIGNED_INT_24_8_NV = 0x84FA; } diff --git a/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java b/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java index 50da6c3c..6a8ea130 100644 --- a/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java +++ b/src/templates/org/lwjgl/opengl/NV_pixel_data_range.java @@ -32,10 +32,6 @@ package org.lwjgl.opengl; import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.ShortBuffer; import org.lwjgl.generator.*; @@ -45,28 +41,28 @@ public interface NV_pixel_data_range { * FlushPixelDataRangeNV, and by the parameter of * EnableClientState, DisableClientState, and IsEnabled: */ - public static final int GL_WRITE_PIXEL_DATA_RANGE_NV = 0x8878; - public static final int GL_READ_PIXEL_DATA_RANGE_NV = 0x8879; + int GL_WRITE_PIXEL_DATA_RANGE_NV = 0x8878; + int GL_READ_PIXEL_DATA_RANGE_NV = 0x8879; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV = 0x887A; - public static final int GL_READ_PIXEL_DATA_RANGE_LENGTH_NV = 0x887B; + int GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV = 0x887A; + int GL_READ_PIXEL_DATA_RANGE_LENGTH_NV = 0x887B; /* * Accepted by the parameter of GetPointerv: */ - public static final int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = 0x887C; - public static final int GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887D; + int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = 0x887C; + int GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887D; - public void glPixelDataRangeNV(@GLenum int target, @AutoSize("data") @GLsizei int length, + void glPixelDataRangeNV(@GLenum int target, @AutoSize("data") @GLsizei int length, @GLbyte @GLshort @GLint @GLfloat Buffer data); - public void glFlushPixelDataRangeNV(@GLenum int target); + void glFlushPixelDataRangeNV(@GLenum int target); } diff --git a/src/templates/org/lwjgl/opengl/NV_point_sprite.java b/src/templates/org/lwjgl/opengl/NV_point_sprite.java index 64a9e638..b3a428bb 100644 --- a/src/templates/org/lwjgl/opengl/NV_point_sprite.java +++ b/src/templates/org/lwjgl/opengl/NV_point_sprite.java @@ -36,12 +36,12 @@ import java.nio.IntBuffer; import org.lwjgl.generator.*; public interface NV_point_sprite { - 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; + int GL_POINT_SPRITE_NV = 0x8861; + int GL_COORD_REPLACE_NV = 0x8862; + int GL_POINT_SPRITE_R_MODE_NV = 0x8863; - public void glPointParameteriNV(@GLenum int pname, int param); + void glPointParameteriNV(@GLenum int pname, int param); @StripPostfix("params") - public void glPointParameterivNV(@GLenum int pname, @Check("4") @Const IntBuffer params); + void glPointParameterivNV(@GLenum int pname, @Check("4") @Const IntBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/NV_primitive_restart.java b/src/templates/org/lwjgl/opengl/NV_primitive_restart.java index 870dd303..ffc719d0 100644 --- a/src/templates/org/lwjgl/opengl/NV_primitive_restart.java +++ b/src/templates/org/lwjgl/opengl/NV_primitive_restart.java @@ -40,15 +40,15 @@ public interface NV_primitive_restart { * the parameter of GetBooleanv, GetIntegerv, GetFloatv, and * GetDoublev: */ - public static final int GL_PRIMITIVE_RESTART_NV = 0x8558; + int GL_PRIMITIVE_RESTART_NV = 0x8558; /* * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559; + int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559; - public void glPrimitiveRestartNV(); + void glPrimitiveRestartNV(); - public void glPrimitiveRestartIndexNV(@GLuint int index); + void glPrimitiveRestartIndexNV(@GLuint int index); } diff --git a/src/templates/org/lwjgl/opengl/NV_program.java b/src/templates/org/lwjgl/opengl/NV_program.java index 9d3887cd..4ad32ea6 100644 --- a/src/templates/org/lwjgl/opengl/NV_program.java +++ b/src/templates/org/lwjgl/opengl/NV_program.java @@ -42,43 +42,43 @@ public interface NV_program { /* Accepted by the parameter of GetProgramivNV: */ - public static final int GL_PROGRAM_TARGET_NV = 0x8646; - public static final int GL_PROGRAM_LENGTH_NV = 0x8627; - public static final int GL_PROGRAM_RESIDENT_NV = 0x8647; + int GL_PROGRAM_TARGET_NV = 0x8646; + int GL_PROGRAM_LENGTH_NV = 0x8627; + int GL_PROGRAM_RESIDENT_NV = 0x8647; /* Accepted by the parameter of GetProgramStringNV: */ - public static final int GL_PROGRAM_STRING_NV = 0x8628; + int GL_PROGRAM_STRING_NV = 0x8628; /* Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_PROGRAM_ERROR_POSITION_NV = 0x864B; + int GL_PROGRAM_ERROR_POSITION_NV = 0x864B; /* Accepted by the parameter of GetString: */ - public static final int GL_PROGRAM_ERROR_STRING_NV = 0x8874; + int GL_PROGRAM_ERROR_STRING_NV = 0x8874; - public void glLoadProgramNV(@GLenum int target, @GLuint int programID, @AutoSize("string") @GLsizei int length, @Const @GLubyte Buffer string); + void glLoadProgramNV(@GLenum int target, @GLuint int programID, @AutoSize("string") @GLsizei int length, @Const @GLubyte Buffer string); - public void glBindProgramNV(@GLenum int target, @GLuint int programID); + void glBindProgramNV(@GLenum int target, @GLuint int programID); - public void glDeleteProgramsNV(@AutoSize("programs") @GLsizei int n, @Const @GLuint IntBuffer programs); - public void glGenProgramsNV(@AutoSize("programs") @GLsizei int n, @GLuint IntBuffer programs); + void glDeleteProgramsNV(@AutoSize("programs") @GLsizei int n, @Const @GLuint IntBuffer programs); + void glGenProgramsNV(@AutoSize("programs") @GLsizei int n, @GLuint IntBuffer programs); @StripPostfix("params") - public void glGetProgramivNV(@GLuint int programID, @GLenum int parameterName, @Check @GLint IntBuffer params); + void glGetProgramivNV(@GLuint int programID, @GLenum int parameterName, @Check @GLint IntBuffer params); - public void glGetProgramStringNV(@GLuint int programID, @GLenum int parameterName, @Check @GLubyte Buffer paramString); + void glGetProgramStringNV(@GLuint int programID, @GLenum int parameterName, @Check @GLubyte Buffer paramString); - public boolean glIsProgramNV(@GLuint int programID); + boolean glIsProgramNV(@GLuint int programID); @Code( " if (programIDs.remaining() != programResidences.remaining())\n" + " throw new IllegalArgumentException(\"programIDs.remaining() != programResidences.remaining()\");") - public boolean glAreProgramsResidentNV(@AutoSize("programIDs") @GLsizei int n, + boolean glAreProgramsResidentNV(@AutoSize("programIDs") @GLsizei int n, @Const @GLuint IntBuffer programIDs, @@ -86,6 +86,6 @@ public interface NV_program { @GLboolean ByteBuffer programResidences); - public void glRequestResidentProgramsNV(@AutoSize("programIDs") @GLsizei int n, @GLuint IntBuffer programIDs); + void glRequestResidentProgramsNV(@AutoSize("programIDs") @GLsizei int n, @GLuint IntBuffer programIDs); } diff --git a/src/templates/org/lwjgl/opengl/NV_register_combiners.java b/src/templates/org/lwjgl/opengl/NV_register_combiners.java index 99a441db..a6cf52fe 100644 --- a/src/templates/org/lwjgl/opengl/NV_register_combiners.java +++ b/src/templates/org/lwjgl/opengl/NV_register_combiners.java @@ -37,86 +37,86 @@ import java.nio.IntBuffer; import org.lwjgl.generator.*; public interface NV_register_combiners { - 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; + int GL_REGISTER_COMBINERS_NV = 0x8522; + int GL_COMBINER0_NV = 0x8550; + int GL_COMBINER1_NV = 0x8551; + int GL_COMBINER2_NV = 0x8552; + int GL_COMBINER3_NV = 0x8553; + int GL_COMBINER4_NV = 0x8554; + int GL_COMBINER5_NV = 0x8555; + int GL_COMBINER6_NV = 0x8556; + int GL_COMBINER7_NV = 0x8557; + int GL_VARIABLE_A_NV = 0x8523; + int GL_VARIABLE_B_NV = 0x8524; + int GL_VARIABLE_C_NV = 0x8525; + int GL_VARIABLE_D_NV = 0x8526; + int GL_VARIABLE_E_NV = 0x8527; + int GL_VARIABLE_F_NV = 0x8528; + int GL_VARIABLE_G_NV = 0x8529; + int GL_CONSTANT_COLOR0_NV = 0x852A; + int GL_CONSTANT_COLOR1_NV = 0x852B; + int GL_PRIMARY_COLOR_NV = 0x852C; + int GL_SECONDARY_COLOR_NV = 0x852D; + int GL_SPARE0_NV = 0x852E; + int GL_SPARE1_NV = 0x852F; + int GL_UNSIGNED_IDENTITY_NV = 0x8536; + int GL_UNSIGNED_INVERT_NV = 0x8537; + int GL_EXPAND_NORMAL_NV = 0x8538; + int GL_EXPAND_NEGATE_NV = 0x8539; + int GL_HALF_BIAS_NORMAL_NV = 0x853A; + int GL_HALF_BIAS_NEGATE_NV = 0x853B; + int GL_SIGNED_IDENTITY_NV = 0x853C; + int GL_SIGNED_NEGATE_NV = 0x853D; + int GL_E_TIMES_F_NV = 0x8531; + int GL_SPARE0_PLUS_SECONDARY_COLOR_NV = 0x8532; + int GL_SCALE_BY_TWO_NV = 0x853E; + int GL_SCALE_BY_FOUR_NV = 0x853F; + int GL_SCALE_BY_ONE_HALF_NV = 0x8540; + int GL_BIAS_BY_NEGATIVE_ONE_HALF_NV = 0x8541; + int GL_DISCARD_NV = 0x8530; + int GL_COMBINER_INPUT_NV = 0x8542; + int GL_COMBINER_MAPPING_NV = 0x8543; + int GL_COMBINER_COMPONENT_USAGE_NV = 0x8544; + int GL_COMBINER_AB_DOT_PRODUCT_NV = 0x8545; + int GL_COMBINER_CD_DOT_PRODUCT_NV = 0x8546; + int GL_COMBINER_MUX_SUM_NV = 0x8547; + int GL_COMBINER_SCALE_NV = 0x8548; + int GL_COMBINER_BIAS_NV = 0x8549; + int GL_COMBINER_AB_OUTPUT_NV = 0x854A; + int GL_COMBINER_CD_OUTPUT_NV = 0x854B; + int GL_COMBINER_SUM_OUTPUT_NV = 0x854C; + int GL_NUM_GENERAL_COMBINERS_NV = 0x854E; + int GL_COLOR_SUM_CLAMP_NV = 0x854F; + int GL_MAX_GENERAL_COMBINERS_NV = 0x854D; - public void glCombinerParameterfNV(@GLenum int pname, float param); + void glCombinerParameterfNV(@GLenum int pname, float param); @StripPostfix("params") - public void glCombinerParameterfvNV(@GLenum int pname, @Check("4") @Const FloatBuffer params); + void glCombinerParameterfvNV(@GLenum int pname, @Check("4") @Const FloatBuffer params); - public void glCombinerParameteriNV(@GLenum int pname, int param); + void glCombinerParameteriNV(@GLenum int pname, int param); @StripPostfix("params") - public void glCombinerParameterivNV(@GLenum int pname, @Check("4") @Const IntBuffer params); + void glCombinerParameterivNV(@GLenum int pname, @Check("4") @Const IntBuffer params); - public void glCombinerInputNV(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int input, @GLenum int mapping, @GLenum int componentUsage); + void glCombinerInputNV(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int input, @GLenum int mapping, @GLenum int componentUsage); - public void glCombinerOutputNV(@GLenum int stage, @GLenum int portion, @GLenum int abOutput, @GLenum int cdOutput, @GLenum int sumOutput, @GLenum int scale, @GLenum int bias, boolean abDotProduct, boolean cdDotProduct, boolean muxSum); + void glCombinerOutputNV(@GLenum int stage, @GLenum int portion, @GLenum int abOutput, @GLenum int cdOutput, @GLenum int sumOutput, @GLenum int scale, @GLenum int bias, boolean abDotProduct, boolean cdDotProduct, boolean muxSum); - public void glFinalCombinerInputNV(@GLenum int variable, @GLenum int input, @GLenum int mapping, @GLenum int componentUsage); + void glFinalCombinerInputNV(@GLenum int variable, @GLenum int input, @GLenum int mapping, @GLenum int componentUsage); @StripPostfix("params") - public void glGetCombinerInputParameterfvNV(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetCombinerInputParameterfvNV(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetCombinerInputParameterivNV(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int pname, @Check("4") IntBuffer params); + void glGetCombinerInputParameterivNV(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetCombinerOutputParameterfvNV(@GLenum int stage, @GLenum int portion, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetCombinerOutputParameterfvNV(@GLenum int stage, @GLenum int portion, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetCombinerOutputParameterivNV(@GLenum int stage, @GLenum int portion, @GLenum int pname, @Check("4") IntBuffer params); + void glGetCombinerOutputParameterivNV(@GLenum int stage, @GLenum int portion, @GLenum int pname, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetFinalCombinerInputParameterfvNV(@GLenum int variable, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetFinalCombinerInputParameterfvNV(@GLenum int variable, @GLenum int pname, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetFinalCombinerInputParameterivNV(@GLenum int variable, @GLenum int pname, @Check("4") IntBuffer params); + void glGetFinalCombinerInputParameterivNV(@GLenum int variable, @GLenum int pname, @Check("4") IntBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/NV_register_combiners2.java b/src/templates/org/lwjgl/opengl/NV_register_combiners2.java index f142ab70..cb041dcd 100644 --- a/src/templates/org/lwjgl/opengl/NV_register_combiners2.java +++ b/src/templates/org/lwjgl/opengl/NV_register_combiners2.java @@ -36,11 +36,11 @@ import java.nio.FloatBuffer; import org.lwjgl.generator.*; public interface NV_register_combiners2 { - public static final int GL_PER_STAGE_CONSTANTS_NV = 0x8535; + int GL_PER_STAGE_CONSTANTS_NV = 0x8535; @StripPostfix("params") - public void glCombinerStageParameterfvNV(@GLenum int stage, @GLenum int pname, @Const @Check("4") FloatBuffer params); + void glCombinerStageParameterfvNV(@GLenum int stage, @GLenum int pname, @Const @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetCombinerStageParameterfvNV(@GLenum int stage, @GLenum int pname, @Check("4") FloatBuffer params); + void glGetCombinerStageParameterfvNV(@GLenum int stage, @GLenum int pname, @Check("4") FloatBuffer params); } diff --git a/src/templates/org/lwjgl/opengl/NV_texgen_reflection.java b/src/templates/org/lwjgl/opengl/NV_texgen_reflection.java index 517fac70..4f6546a5 100644 --- a/src/templates/org/lwjgl/opengl/NV_texgen_reflection.java +++ b/src/templates/org/lwjgl/opengl/NV_texgen_reflection.java @@ -32,6 +32,6 @@ package org.lwjgl.opengl; public interface NV_texgen_reflection { - public static final int GL_NORMAL_MAP_NV = 0x8511; - public static final int GL_REFLECTION_MAP_NV = 0x8512; + int GL_NORMAL_MAP_NV = 0x8511; + int GL_REFLECTION_MAP_NV = 0x8512; } diff --git a/src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java b/src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java index a4673065..3bc81994 100644 --- a/src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java +++ b/src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java @@ -40,8 +40,8 @@ public interface NV_texture_compression_vtc { * 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; + int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0; + int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1; + int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2; + int GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3; } diff --git a/src/templates/org/lwjgl/opengl/NV_texture_env_combine4.java b/src/templates/org/lwjgl/opengl/NV_texture_env_combine4.java index b7b6ed6e..a75ab0a0 100644 --- a/src/templates/org/lwjgl/opengl/NV_texture_env_combine4.java +++ b/src/templates/org/lwjgl/opengl/NV_texture_env_combine4.java @@ -32,9 +32,9 @@ package org.lwjgl.opengl; public interface NV_texture_env_combine4 { - 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; + int GL_COMBINE4_NV = 0x8503; + int GL_SOURCE3_RGB_NV = 0x8583; + int GL_SOURCE3_ALPHA_NV = 0x858B; + int GL_OPERAND3_RGB_NV = 0x8593; + int GL_OPERAND3_ALPHA_NV = 0x859B; } diff --git a/src/templates/org/lwjgl/opengl/NV_texture_expand_normal.java b/src/templates/org/lwjgl/opengl/NV_texture_expand_normal.java index 4db8b1c7..5d0dabd7 100644 --- a/src/templates/org/lwjgl/opengl/NV_texture_expand_normal.java +++ b/src/templates/org/lwjgl/opengl/NV_texture_expand_normal.java @@ -37,5 +37,5 @@ public interface NV_texture_expand_normal { * TexParameteriv, TexParameterf, TexParameterfv, GetTexParameteri, * and GetTexParameteriv: */ - public static final int GL_TEXTURE_UNSIGNED_REMAP_MODE_NV = 0x888F; + int GL_TEXTURE_UNSIGNED_REMAP_MODE_NV = 0x888F; } diff --git a/src/templates/org/lwjgl/opengl/NV_texture_rectangle.java b/src/templates/org/lwjgl/opengl/NV_texture_rectangle.java index 89aa5f3a..f8eda5ac 100644 --- a/src/templates/org/lwjgl/opengl/NV_texture_rectangle.java +++ b/src/templates/org/lwjgl/opengl/NV_texture_rectangle.java @@ -32,8 +32,8 @@ package org.lwjgl.opengl; public interface NV_texture_rectangle { - 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; + int GL_TEXTURE_RECTANGLE_NV = 0x84F5; + int GL_TEXTURE_BINDING_RECTANGLE_NV = 0x84F6; + int GL_PROXY_TEXTURE_RECTANGLE_NV = 0x84F7; + int GL_MAX_RECTANGLE_TEXTURE_SIZE_NV = 0x84F8; } diff --git a/src/templates/org/lwjgl/opengl/NV_texture_shader.java b/src/templates/org/lwjgl/opengl/NV_texture_shader.java index c5f79b9e..c20d7736 100644 --- a/src/templates/org/lwjgl/opengl/NV_texture_shader.java +++ b/src/templates/org/lwjgl/opengl/NV_texture_shader.java @@ -32,74 +32,74 @@ package org.lwjgl.opengl; public interface NV_texture_shader { - 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; + int GL_TEXTURE_SHADER_NV = 0x86DE; + int GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV = 0x86D9; + int GL_SHADER_OPERATION_NV = 0x86DF; + int GL_CULL_MODES_NV = 0x86E0; + int GL_OFFSET_TEXTURE_MATRIX_NV = 0x86E1; + int GL_OFFSET_TEXTURE_SCALE_NV = 0x86E2; + int GL_OFFSET_TEXTURE_BIAS_NV = 0x86E3; + int GL_PREVIOUS_TEXTURE_INPUT_NV = 0x86E4; + int GL_CONST_EYE_NV = 0x86E5; + int GL_SHADER_CONSISTENT_NV = 0x86DD; + int GL_PASS_THROUGH_NV = 0x86E6; + int GL_CULL_FRAGMENT_NV = 0x86E7; + int GL_OFFSET_TEXTURE_2D_NV = 0x86E8; + int GL_OFFSET_TEXTURE_RECTANGLE_NV = 0x864C; + int GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV = 0x864D; + int GL_DEPENDENT_AR_TEXTURE_2D_NV = 0x86E9; + int GL_DEPENDENT_GB_TEXTURE_2D_NV = 0x86EA; + int GL_DOT_PRODUCT_NV = 0x86EC; + int GL_DOT_PRODUCT_DEPTH_REPLACE_NV = 0x86ED; + int GL_DOT_PRODUCT_TEXTURE_2D_NV = 0x86EE; + int GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV = 0x864E; + int GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV = 0x86F0; + int GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV = 0x86F1; + int GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV = 0x86F2; + int GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV = 0x86F3; + int GL_HILO_NV = 0x86F4; + int GL_DSDT_NV = 0x86F5; + int GL_DSDT_MAG_NV = 0x86F6; + int GL_DSDT_MAG_VIB_NV = 0x86F7; + int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; + int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; + int GL_SIGNED_RGBA_NV = 0x86FB; + int GL_SIGNED_RGBA8_NV = 0x86FC; + int GL_SIGNED_RGB_NV = 0x86FE; + int GL_SIGNED_RGB8_NV = 0x86FF; + int GL_SIGNED_LUMINANCE_NV = 0x8701; + int GL_SIGNED_LUMINANCE8_NV = 0x8702; + int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703; + int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; + int GL_SIGNED_ALPHA_NV = 0x8705; + int GL_SIGNED_ALPHA8_NV = 0x8706; + int GL_SIGNED_INTENSITY_NV = 0x8707; + int GL_SIGNED_INTENSITY8_NV = 0x8708; + int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; + int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; + int GL_HILO16_NV = 0x86F8; + int GL_SIGNED_HILO_NV = 0x86F9; + int GL_SIGNED_HILO16_NV = 0x86FA; + int GL_DSDT8_NV = 0x8709; + int GL_DSDT8_MAG8_NV = 0x870A; + int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; + int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; + int GL_HI_SCALE_NV = 0x870E; + int GL_LO_SCALE_NV = 0x870F; + int GL_DS_SCALE_NV = 0x8710; + int GL_DT_SCALE_NV = 0x8711; + int GL_MAGNITUDE_SCALE_NV = 0x8712; + int GL_VIBRANCE_SCALE_NV = 0x8713; + int GL_HI_BIAS_NV = 0x8714; + int GL_LO_BIAS_NV = 0x8715; + int GL_DS_BIAS_NV = 0x8716; + int GL_DT_BIAS_NV = 0x8717; + int GL_MAGNITUDE_BIAS_NV = 0x8718; + int GL_VIBRANCE_BIAS_NV = 0x8719; + int GL_TEXTURE_BORDER_VALUES_NV = 0x871A; + int GL_TEXTURE_HI_SIZE_NV = 0x871B; + int GL_TEXTURE_LO_SIZE_NV = 0x871C; + int GL_TEXTURE_DS_SIZE_NV = 0x871D; + int GL_TEXTURE_DT_SIZE_NV = 0x871E; + int GL_TEXTURE_MAG_SIZE_NV = 0x871F; } diff --git a/src/templates/org/lwjgl/opengl/NV_texture_shader2.java b/src/templates/org/lwjgl/opengl/NV_texture_shader2.java index bf16907c..38223aff 100644 --- a/src/templates/org/lwjgl/opengl/NV_texture_shader2.java +++ b/src/templates/org/lwjgl/opengl/NV_texture_shader2.java @@ -32,32 +32,32 @@ package org.lwjgl.opengl; public interface NV_texture_shader2 { - 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; + int GL_DOT_PRODUCT_TEXTURE_3D_NV = 0x86EF; + int GL_HILO_NV = 0x86F4; + int GL_DSDT_NV = 0x86F5; + int GL_DSDT_MAG_NV = 0x86F6; + int GL_DSDT_MAG_VIB_NV = 0x86F7; + int GL_UNSIGNED_INT_S8_S8_8_8_NV = 0x86DA; + int GL_UNSIGNED_INT_8_8_S8_S8_REV_NV = 0x86DB; + int GL_SIGNED_RGBA_NV = 0x86FB; + int GL_SIGNED_RGBA8_NV = 0x86FC; + int GL_SIGNED_RGB_NV = 0x86FE; + int GL_SIGNED_RGB8_NV = 0x86FF; + int GL_SIGNED_LUMINANCE_NV = 0x8701; + int GL_SIGNED_LUMINANCE8_NV = 0x8702; + int GL_SIGNED_LUMINANCE_ALPHA_NV = 0x8703; + int GL_SIGNED_LUMINANCE8_ALPHA8_NV = 0x8704; + int GL_SIGNED_ALPHA_NV = 0x8705; + int GL_SIGNED_ALPHA8_NV = 0x8706; + int GL_SIGNED_INTENSITY_NV = 0x8707; + int GL_SIGNED_INTENSITY8_NV = 0x8708; + int GL_SIGNED_RGB_UNSIGNED_ALPHA_NV = 0x870C; + int GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV = 0x870D; + int GL_HILO16_NV = 0x86F8; + int GL_SIGNED_HILO_NV = 0x86F9; + int GL_SIGNED_HILO16_NV = 0x86FA; + int GL_DSDT8_NV = 0x8709; + int GL_DSDT8_MAG8_NV = 0x870A; + int GL_DSDT_MAG_INTENSITY_NV = 0x86DC; + int GL_DSDT8_MAG8_INTENSITY8_NV = 0x870B; } diff --git a/src/templates/org/lwjgl/opengl/NV_texture_shader3.java b/src/templates/org/lwjgl/opengl/NV_texture_shader3.java index 18af1aed..5cb484d3 100644 --- a/src/templates/org/lwjgl/opengl/NV_texture_shader3.java +++ b/src/templates/org/lwjgl/opengl/NV_texture_shader3.java @@ -32,21 +32,21 @@ package org.lwjgl.opengl; public interface NV_texture_shader3 { - 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; + int GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV = 0x8850; + int GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV = 0x8851; + int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8852; + int GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV = 0x8853; + int GL_OFFSET_HILO_TEXTURE_2D_NV = 0x8854; + int GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV = 0x8855; + int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV = 0x8856; + int GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV = 0x8857; + int GL_DEPENDENT_HILO_TEXTURE_2D_NV = 0x8858; + int GL_DEPENDENT_RGB_TEXTURE_3D_NV = 0x8859; + int GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV = 0x885A; + int GL_DOT_PRODUCT_PASS_THROUGH_NV = 0x885B; + int GL_DOT_PRODUCT_TEXTURE_1D_NV = 0x885C; + int GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV = 0x885D; + int GL_HILO8_NV = 0x885E; + int GL_SIGNED_HILO8_NV = 0x885F; + int GL_FORCE_BLUE_TO_ONE_NV = 0x8860; } diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java b/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java index 11db12d9..1b35f998 100644 --- a/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java +++ b/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java @@ -37,13 +37,13 @@ import java.nio.ByteBuffer; import org.lwjgl.generator.*; public interface NV_vertex_array_range { - 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; + int GL_VERTEX_ARRAY_RANGE_NV = 0x851D; + int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E; + int GL_VERTEX_ARRAY_RANGE_VALID_NV = 0x851F; + int GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV = 0x8520; + int GL_VERTEX_ARRAY_RANGE_POINTER_NV = 0x8521; - public void glVertexArrayRangeNV(@AutoSize("pPointer") @GLsizei int size, + void glVertexArrayRangeNV(@AutoSize("pPointer") @GLsizei int size, @Const @GLbyte @GLshort @@ -51,11 +51,11 @@ public interface NV_vertex_array_range { @GLfloat Buffer pPointer); - public void glFlushVertexArrayRangeNV(); + void glFlushVertexArrayRangeNV(); @PlatformDependent({Platform.WGL, Platform.GLX}) - public @GLvoid ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority); + @GLvoid ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority); @PlatformDependent({Platform.WGL, Platform.GLX}) - public void glFreeMemoryNV(@Check @GLbyte Buffer pointer); + void glFreeMemoryNV(@Check @GLbyte Buffer pointer); } diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_array_range2.java b/src/templates/org/lwjgl/opengl/NV_vertex_array_range2.java index 66201e18..8b02dba1 100644 --- a/src/templates/org/lwjgl/opengl/NV_vertex_array_range2.java +++ b/src/templates/org/lwjgl/opengl/NV_vertex_array_range2.java @@ -32,5 +32,5 @@ package org.lwjgl.opengl; public interface NV_vertex_array_range2 { - public static final int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533; + int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV = 0x8533; } diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_program.java b/src/templates/org/lwjgl/opengl/NV_vertex_program.java index a1f80551..79dbbca3 100644 --- a/src/templates/org/lwjgl/opengl/NV_vertex_program.java +++ b/src/templates/org/lwjgl/opengl/NV_vertex_program.java @@ -48,82 +48,82 @@ public interface NV_vertex_program extends NV_program { ExecuteProgramNV, GetProgramParameter[df]vNV, GetTrackMatrixivNV, LoadProgramNV, ProgramParameter[s]4[df][v]NV, and TrackMatrixNV: */ - public static final int GL_VERTEX_PROGRAM_NV = 0x8620; + int GL_VERTEX_PROGRAM_NV = 0x8620; /* Accepted by the parameter of Disable, Enable, and IsEnabled, and by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642; - public static final int GL_VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643; + int GL_VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642; + int GL_VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643; /* Accepted by the parameter of ExecuteProgramNV and LoadProgramNV: */ - public static final int GL_VERTEX_STATE_PROGRAM_NV = 0x8621; + int GL_VERTEX_STATE_PROGRAM_NV = 0x8621; /* Accepted by the parameter of GetVertexAttrib[dfi]vNV: */ - public static final int GL_ATTRIB_ARRAY_SIZE_NV = 0x8623; - public static final int GL_ATTRIB_ARRAY_STRIDE_NV = 0x8624; - public static final int GL_ATTRIB_ARRAY_TYPE_NV = 0x8625; - public static final int GL_CURRENT_ATTRIB_NV = 0x8626; + int GL_ATTRIB_ARRAY_SIZE_NV = 0x8623; + int GL_ATTRIB_ARRAY_STRIDE_NV = 0x8624; + int GL_ATTRIB_ARRAY_TYPE_NV = 0x8625; + int GL_CURRENT_ATTRIB_NV = 0x8626; /* Accepted by the parameter of GetProgramParameterfvNV and GetProgramParameterdvNV: */ - public static final int GL_PROGRAM_PARAMETER_NV = 0x8644; + int GL_PROGRAM_PARAMETER_NV = 0x8644; /* Accepted by the parameter of GetVertexAttribPointervNV: */ - public static final int GL_ATTRIB_ARRAY_POINTER_NV = 0x8645; + int GL_ATTRIB_ARRAY_POINTER_NV = 0x8645; /* Accepted by the parameter of GetTrackMatrixivNV: */ - public static final int GL_TRACK_MATRIX_NV = 0x8648; - public static final int GL_TRACK_MATRIX_TRANSFORM_NV = 0x8649; + int GL_TRACK_MATRIX_NV = 0x8648; + int GL_TRACK_MATRIX_TRANSFORM_NV = 0x8649; /* Accepted by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862E; - public static final int GL_MAX_TRACK_MATRICES_NV = 0x862F; - public static final int GL_CURRENT_MATRIX_STACK_DEPTH_NV = 0x8640; - public static final int GL_CURRENT_MATRIX_NV = 0x8641; - public static final int GL_VERTEX_PROGRAM_BINDING_NV = 0x864A; + int GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862E; + int GL_MAX_TRACK_MATRICES_NV = 0x862F; + int GL_CURRENT_MATRIX_STACK_DEPTH_NV = 0x8640; + int GL_CURRENT_MATRIX_NV = 0x8641; + int GL_VERTEX_PROGRAM_BINDING_NV = 0x864A; /* Accepted by the parameter of TrackMatrixNV: */ - public static final int GL_MODELVIEW_PROJECTION_NV = 0x8629; + int GL_MODELVIEW_PROJECTION_NV = 0x8629; /* Accepted by the parameter of TrackMatrixNV and by the parameter of MatrixMode: */ - public static final int GL_MATRIX0_NV = 0x8630; - public static final int GL_MATRIX1_NV = 0x8631; - public static final int GL_MATRIX2_NV = 0x8632; - public static final int GL_MATRIX3_NV = 0x8633; - public static final int GL_MATRIX4_NV = 0x8634; - public static final int GL_MATRIX5_NV = 0x8635; - public static final int GL_MATRIX6_NV = 0x8636; - public static final int GL_MATRIX7_NV = 0x8637; + int GL_MATRIX0_NV = 0x8630; + int GL_MATRIX1_NV = 0x8631; + int GL_MATRIX2_NV = 0x8632; + int GL_MATRIX3_NV = 0x8633; + int GL_MATRIX4_NV = 0x8634; + int GL_MATRIX5_NV = 0x8635; + int GL_MATRIX6_NV = 0x8636; + int GL_MATRIX7_NV = 0x8637; /* Accepted by the parameter of TrackMatrixNV: */ - public static final int GL_IDENTITY_NV = 0x862A; - public static final int GL_INVERSE_NV = 0x862B; - public static final int GL_TRANSPOSE_NV = 0x862C; - public static final int GL_INVERSE_TRANSPOSE_NV = 0x862D; + int GL_IDENTITY_NV = 0x862A; + int GL_INVERSE_NV = 0x862B; + int GL_TRANSPOSE_NV = 0x862C; + int GL_INVERSE_TRANSPOSE_NV = 0x862D; /* Accepted by the parameter of EnableClientState and @@ -131,22 +131,22 @@ public interface NV_vertex_program extends NV_program { the parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_VERTEX_ATTRIB_ARRAY0_NV = 0x8650; - public static final int GL_VERTEX_ATTRIB_ARRAY1_NV = 0x8651; - public static final int GL_VERTEX_ATTRIB_ARRAY2_NV = 0x8652; - public static final int GL_VERTEX_ATTRIB_ARRAY3_NV = 0x8653; - public static final int GL_VERTEX_ATTRIB_ARRAY4_NV = 0x8654; - public static final int GL_VERTEX_ATTRIB_ARRAY5_NV = 0x8655; - public static final int GL_VERTEX_ATTRIB_ARRAY6_NV = 0x8656; - public static final int GL_VERTEX_ATTRIB_ARRAY7_NV = 0x8657; - public static final int GL_VERTEX_ATTRIB_ARRAY8_NV = 0x8658; - public static final int GL_VERTEX_ATTRIB_ARRAY9_NV = 0x8659; - public static final int GL_VERTEX_ATTRIB_ARRAY10_NV = 0x865A; - public static final int GL_VERTEX_ATTRIB_ARRAY11_NV = 0x865B; - public static final int GL_VERTEX_ATTRIB_ARRAY12_NV = 0x865C; - public static final int GL_VERTEX_ATTRIB_ARRAY13_NV = 0x865D; - public static final int GL_VERTEX_ATTRIB_ARRAY14_NV = 0x865E; - public static final int GL_VERTEX_ATTRIB_ARRAY15_NV = 0x865F; + int GL_VERTEX_ATTRIB_ARRAY0_NV = 0x8650; + int GL_VERTEX_ATTRIB_ARRAY1_NV = 0x8651; + int GL_VERTEX_ATTRIB_ARRAY2_NV = 0x8652; + int GL_VERTEX_ATTRIB_ARRAY3_NV = 0x8653; + int GL_VERTEX_ATTRIB_ARRAY4_NV = 0x8654; + int GL_VERTEX_ATTRIB_ARRAY5_NV = 0x8655; + int GL_VERTEX_ATTRIB_ARRAY6_NV = 0x8656; + int GL_VERTEX_ATTRIB_ARRAY7_NV = 0x8657; + int GL_VERTEX_ATTRIB_ARRAY8_NV = 0x8658; + int GL_VERTEX_ATTRIB_ARRAY9_NV = 0x8659; + int GL_VERTEX_ATTRIB_ARRAY10_NV = 0x865A; + int GL_VERTEX_ATTRIB_ARRAY11_NV = 0x865B; + int GL_VERTEX_ATTRIB_ARRAY12_NV = 0x865C; + int GL_VERTEX_ATTRIB_ARRAY13_NV = 0x865D; + int GL_VERTEX_ATTRIB_ARRAY14_NV = 0x865E; + int GL_VERTEX_ATTRIB_ARRAY15_NV = 0x865F; /* Accepted by the parameter of GetMapdv, GetMapfv, GetMapiv, @@ -154,22 +154,22 @@ public interface NV_vertex_program extends NV_program { IsEnabled, and by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_MAP1_VERTEX_ATTRIB0_4_NV = 0x8660; - public static final int GL_MAP1_VERTEX_ATTRIB1_4_NV = 0x8661; - public static final int GL_MAP1_VERTEX_ATTRIB2_4_NV = 0x8662; - public static final int GL_MAP1_VERTEX_ATTRIB3_4_NV = 0x8663; - public static final int GL_MAP1_VERTEX_ATTRIB4_4_NV = 0x8664; - public static final int GL_MAP1_VERTEX_ATTRIB5_4_NV = 0x8665; - public static final int GL_MAP1_VERTEX_ATTRIB6_4_NV = 0x8666; - public static final int GL_MAP1_VERTEX_ATTRIB7_4_NV = 0x8667; - public static final int GL_MAP1_VERTEX_ATTRIB8_4_NV = 0x8668; - public static final int GL_MAP1_VERTEX_ATTRIB9_4_NV = 0x8669; - public static final int GL_MAP1_VERTEX_ATTRIB10_4_NV = 0x866A; - public static final int GL_MAP1_VERTEX_ATTRIB11_4_NV = 0x866B; - public static final int GL_MAP1_VERTEX_ATTRIB12_4_NV = 0x866C; - public static final int GL_MAP1_VERTEX_ATTRIB13_4_NV = 0x866D; - public static final int GL_MAP1_VERTEX_ATTRIB14_4_NV = 0x866E; - public static final int GL_MAP1_VERTEX_ATTRIB15_4_NV = 0x866F; + int GL_MAP1_VERTEX_ATTRIB0_4_NV = 0x8660; + int GL_MAP1_VERTEX_ATTRIB1_4_NV = 0x8661; + int GL_MAP1_VERTEX_ATTRIB2_4_NV = 0x8662; + int GL_MAP1_VERTEX_ATTRIB3_4_NV = 0x8663; + int GL_MAP1_VERTEX_ATTRIB4_4_NV = 0x8664; + int GL_MAP1_VERTEX_ATTRIB5_4_NV = 0x8665; + int GL_MAP1_VERTEX_ATTRIB6_4_NV = 0x8666; + int GL_MAP1_VERTEX_ATTRIB7_4_NV = 0x8667; + int GL_MAP1_VERTEX_ATTRIB8_4_NV = 0x8668; + int GL_MAP1_VERTEX_ATTRIB9_4_NV = 0x8669; + int GL_MAP1_VERTEX_ATTRIB10_4_NV = 0x866A; + int GL_MAP1_VERTEX_ATTRIB11_4_NV = 0x866B; + int GL_MAP1_VERTEX_ATTRIB12_4_NV = 0x866C; + int GL_MAP1_VERTEX_ATTRIB13_4_NV = 0x866D; + int GL_MAP1_VERTEX_ATTRIB14_4_NV = 0x866E; + int GL_MAP1_VERTEX_ATTRIB15_4_NV = 0x866F; /* Accepted by the parameter of GetMapdv, GetMapfv, GetMapiv, @@ -177,49 +177,49 @@ public interface NV_vertex_program extends NV_program { IsEnabled, and by the parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: */ - public static final int GL_MAP2_VERTEX_ATTRIB0_4_NV = 0x8670; - public static final int GL_MAP2_VERTEX_ATTRIB1_4_NV = 0x8671; - public static final int GL_MAP2_VERTEX_ATTRIB2_4_NV = 0x8672; - public static final int GL_MAP2_VERTEX_ATTRIB3_4_NV = 0x8673; - public static final int GL_MAP2_VERTEX_ATTRIB4_4_NV = 0x8674; - public static final int GL_MAP2_VERTEX_ATTRIB5_4_NV = 0x8675; - public static final int GL_MAP2_VERTEX_ATTRIB6_4_NV = 0x8676; - public static final int GL_MAP2_VERTEX_ATTRIB7_4_NV = 0x8677; - public static final int GL_MAP2_VERTEX_ATTRIB8_4_NV = 0x8678; - public static final int GL_MAP2_VERTEX_ATTRIB9_4_NV = 0x8679; - public static final int GL_MAP2_VERTEX_ATTRIB10_4_NV = 0x867A; - public static final int GL_MAP2_VERTEX_ATTRIB11_4_NV = 0x867B; - public static final int GL_MAP2_VERTEX_ATTRIB12_4_NV = 0x867C; - public static final int GL_MAP2_VERTEX_ATTRIB13_4_NV = 0x867D; - public static final int GL_MAP2_VERTEX_ATTRIB14_4_NV = 0x867E; - public static final int GL_MAP2_VERTEX_ATTRIB15_4_NV = 0x867F; + int GL_MAP2_VERTEX_ATTRIB0_4_NV = 0x8670; + int GL_MAP2_VERTEX_ATTRIB1_4_NV = 0x8671; + int GL_MAP2_VERTEX_ATTRIB2_4_NV = 0x8672; + int GL_MAP2_VERTEX_ATTRIB3_4_NV = 0x8673; + int GL_MAP2_VERTEX_ATTRIB4_4_NV = 0x8674; + int GL_MAP2_VERTEX_ATTRIB5_4_NV = 0x8675; + int GL_MAP2_VERTEX_ATTRIB6_4_NV = 0x8676; + int GL_MAP2_VERTEX_ATTRIB7_4_NV = 0x8677; + int GL_MAP2_VERTEX_ATTRIB8_4_NV = 0x8678; + int GL_MAP2_VERTEX_ATTRIB9_4_NV = 0x8679; + int GL_MAP2_VERTEX_ATTRIB10_4_NV = 0x867A; + int GL_MAP2_VERTEX_ATTRIB11_4_NV = 0x867B; + int GL_MAP2_VERTEX_ATTRIB12_4_NV = 0x867C; + int GL_MAP2_VERTEX_ATTRIB13_4_NV = 0x867D; + int GL_MAP2_VERTEX_ATTRIB14_4_NV = 0x867E; + int GL_MAP2_VERTEX_ATTRIB15_4_NV = 0x867F; - public void glExecuteProgramNV(@GLenum int target, @GLuint int id, @Check("4") @Const FloatBuffer params); + void glExecuteProgramNV(@GLenum int target, @GLuint int id, @Check("4") @Const FloatBuffer params); @StripPostfix("params") - public void glGetProgramParameterfvNV(@GLenum int target, @GLuint int index, @GLenum int parameterName, @Check("4") FloatBuffer params); + void glGetProgramParameterfvNV(@GLenum int target, @GLuint int index, @GLenum int parameterName, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetTrackMatrixivNV(@GLenum int target, @GLuint int address, @GLenum int parameterName, @Check("4") IntBuffer params); + void glGetTrackMatrixivNV(@GLenum int target, @GLuint int address, @GLenum int parameterName, @Check("4") IntBuffer params); @StripPostfix("params") - public void glGetVertexAttribfvNV(@GLuint int index, @GLenum int parameterName, @Check("4") FloatBuffer params); + void glGetVertexAttribfvNV(@GLuint int index, @GLenum int parameterName, @Check("4") FloatBuffer params); @StripPostfix("params") - public void glGetVertexAttribivNV(@GLuint int index, @GLenum int parameterName, @Check("4") IntBuffer params); + void glGetVertexAttribivNV(@GLuint int index, @GLenum int parameterName, @Check("4") IntBuffer params); @StripPostfix("pointer") - public void glGetVertexAttribPointervNV(@GLuint int index, @GLenum int parameterName, @Result @GLvoid ByteBuffer pointer); + void glGetVertexAttribPointervNV(@GLuint int index, @GLenum int parameterName, @Result @GLvoid ByteBuffer pointer); - public void glProgramParameter4fNV(@GLenum int target, @GLuint int index, float x, float y, float z, float w); + void glProgramParameter4fNV(@GLenum int target, @GLuint int index, float x, float y, float z, float w); @StripPostfix("params") - public void glProgramParameters4fvNV(@GLenum int target, @GLuint int index, @AutoSize(value="params", expression=" >> 2") @GLuint int count, + void glProgramParameters4fvNV(@GLenum int target, @GLuint int index, @AutoSize(value="params", expression=" >> 2") @GLuint int count, @Const FloatBuffer params); - public void glTrackMatrixNV(@GLenum int target, @GLuint int address, @GLenum int matrix, @GLenum int transform); + void glTrackMatrixNV(@GLenum int target, @GLuint int address, @GLenum int matrix, @GLenum int transform); - public void glVertexAttribPointerNV(@GLuint int index, int size, @GLenum int type, @GLsizei int stride, + void glVertexAttribPointerNV(@GLuint int index, int size, @GLenum int type, @GLsizei int stride, @BufferObject(BufferKind.ArrayVBO) @Check @Const @@ -232,41 +232,41 @@ public interface NV_vertex_program extends NV_program { @GLfloat Buffer buffer); - public void glVertexAttrib1sNV(@GLuint int index, short x); + void glVertexAttrib1sNV(@GLuint int index, short x); - public void glVertexAttrib1fNV(@GLuint int index, float x); + void glVertexAttrib1fNV(@GLuint int index, float x); - public void glVertexAttrib2sNV(@GLuint int index, short x, short y); + void glVertexAttrib2sNV(@GLuint int index, short x, short y); - public void glVertexAttrib2fNV(@GLuint int index, float x, float y); + void glVertexAttrib2fNV(@GLuint int index, float x, float y); - public void glVertexAttrib3sNV(@GLuint int index, short x, short y, short z); + void glVertexAttrib3sNV(@GLuint int index, short x, short y, short z); - public void glVertexAttrib3fNV(@GLuint int index, float x, float y, float z); + void glVertexAttrib3fNV(@GLuint int index, float x, float y, float z); - public void glVertexAttrib4sNV(@GLuint int index, short x, short y, short z, short w); + void glVertexAttrib4sNV(@GLuint int index, short x, short y, short z, short w); - public void glVertexAttrib4fNV(@GLuint int index, float x, float y, float z, float w); + void glVertexAttrib4fNV(@GLuint int index, float x, float y, float z, float w); - public void glVertexAttrib4ubNV(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); + void glVertexAttrib4ubNV(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); @StripPostfix("v") - public void glVertexAttribs1svNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const ShortBuffer v); + void glVertexAttribs1svNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const ShortBuffer v); @StripPostfix("v") - public void glVertexAttribs1fvNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const FloatBuffer v); + void glVertexAttribs1fvNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const FloatBuffer v); @StripPostfix("v") - public void glVertexAttribs2svNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const ShortBuffer v); + void glVertexAttribs2svNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const ShortBuffer v); @StripPostfix("v") - public void glVertexAttribs2fvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const FloatBuffer v); - - @StripPostfix("v") - public void glVertexAttribs3svNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const ShortBuffer v); - @StripPostfix("v") - public void glVertexAttribs3fvNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const FloatBuffer v); + void glVertexAttribs2fvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const FloatBuffer v); @StripPostfix("v") - public void glVertexAttribs4svNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const ShortBuffer v); + void glVertexAttribs3svNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const ShortBuffer v); @StripPostfix("v") - public void glVertexAttribs4fvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const FloatBuffer v); + void glVertexAttribs3fvNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const FloatBuffer v); + + @StripPostfix("v") + void glVertexAttribs4svNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const ShortBuffer v); + @StripPostfix("v") + void glVertexAttribs4fvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const FloatBuffer v); } diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_program2_option.java b/src/templates/org/lwjgl/opengl/NV_vertex_program2_option.java index 13ea41de..6b864692 100644 --- a/src/templates/org/lwjgl/opengl/NV_vertex_program2_option.java +++ b/src/templates/org/lwjgl/opengl/NV_vertex_program2_option.java @@ -35,6 +35,6 @@ public interface NV_vertex_program2_option { /* * Accepted by the parameter of GetProgramivARB: */ - public static final int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4; - public static final int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5; + int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4; + int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5; } diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_program3.java b/src/templates/org/lwjgl/opengl/NV_vertex_program3.java index 1bd84193..cdc9d3ad 100644 --- a/src/templates/org/lwjgl/opengl/NV_vertex_program3.java +++ b/src/templates/org/lwjgl/opengl/NV_vertex_program3.java @@ -36,5 +36,5 @@ public interface NV_vertex_program3 { * Accepted by the parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - public static final int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C; + int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C; } diff --git a/src/templates/org/lwjgl/opengl/SUN_slice_accum.java b/src/templates/org/lwjgl/opengl/SUN_slice_accum.java index e2fe8e86..3fa135e5 100644 --- a/src/templates/org/lwjgl/opengl/SUN_slice_accum.java +++ b/src/templates/org/lwjgl/opengl/SUN_slice_accum.java @@ -32,4 +32,10 @@ package org.lwjgl.opengl; public interface SUN_slice_accum { + + /* + * Accepted by the parameter of Accum, + */ + int GL_SLICE_ACCUM_SUN = 0x85CC; + }