You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
1
|
2
|
3
|
|
4
|
5
|
6
|
7
|
8
|
9
(2) |
10
|
|
11
|
12
|
13
(4) |
14
|
15
|
16
|
17
(10) |
|
18
(4) |
19
(1) |
20
(5) |
21
|
22
|
23
|
24
(5) |
|
25
|
26
(2) |
27
(14) |
28
(1) |
29
(2) |
30
|
31
|
|
From: Elias N. <eli...@us...> - 2005-12-29 22:31:55
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14273/src/java/org/lwjgl/opengl Modified Files: Display.java Log Message: Make Display, Pbuffer and AWTGLCanvas fail on null PixelFormats Index: Display.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Display.java,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- Display.java 29 Dec 2005 22:30:14 -0000 1.57 +++ Display.java 29 Dec 2005 22:31:46 -0000 1.58 @@ -646,8 +646,6 @@ * @throws LWJGLException */ public static void create(PixelFormat pixel_format, Drawable shared_drawable) throws LWJGLException { - if (pixel_format == null) - throw new NullPointerException("Pixel format must be non-null"); if (isCreated()) throw new IllegalStateException("Only one LWJGL context may be instantiated at any one time."); if (pixel_format == null) |
|
From: Elias N. <eli...@us...> - 2005-12-29 22:30:29
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13935/src/java/org/lwjgl/opengl Modified Files: AWTGLCanvas.java Display.java Pbuffer.java Log Message: Make Display, Pbuffer and AWTGLCanvas fail on null PixelFormats Index: Pbuffer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- Pbuffer.java 20 Jul 2005 07:30:26 -0000 1.42 +++ Pbuffer.java 29 Dec 2005 22:30:14 -0000 1.43 @@ -178,6 +178,8 @@ * with the Display context (if created). */ public Pbuffer(int width, int height, PixelFormat pixel_format, RenderTexture renderTexture, Drawable shared_drawable) throws LWJGLException { + if (pixel_format == null) + throw new NullPointerException("Pixel format must be non-null"); this.width = width; this.height = height; this.peer_info = createPbuffer(width, height, pixel_format, renderTexture); Index: AWTGLCanvas.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- AWTGLCanvas.java 28 Dec 2005 22:23:35 -0000 1.15 +++ AWTGLCanvas.java 29 Dec 2005 22:30:13 -0000 1.16 @@ -147,6 +147,8 @@ */ public AWTGLCanvas(GraphicsDevice device, PixelFormat pixel_format, Drawable drawable) throws LWJGLException { super(implementation.findConfiguration(device, pixel_format)); + if (pixel_format == null) + throw new NullPointerException("Pixel format must be non-null"); addHierarchyListener(this); this.drawable = drawable; this.pixel_format = pixel_format; Index: Display.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Display.java,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- Display.java 21 Oct 2005 18:53:21 -0000 1.56 +++ Display.java 29 Dec 2005 22:30:14 -0000 1.57 @@ -646,6 +646,8 @@ * @throws LWJGLException */ public static void create(PixelFormat pixel_format, Drawable shared_drawable) throws LWJGLException { + if (pixel_format == null) + throw new NullPointerException("Pixel format must be non-null"); if (isCreated()) throw new IllegalStateException("Only one LWJGL context may be instantiated at any one time."); if (pixel_format == null) |
|
From: Elias N. <eli...@us...> - 2005-12-28 22:23:44
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11940/src/java/org/lwjgl/opengl Modified Files: AWTGLCanvas.java Log Message: Added initGL to AWTGLCanvas Index: AWTGLCanvas.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- AWTGLCanvas.java 12 May 2005 15:45:53 -0000 1.14 +++ AWTGLCanvas.java 28 Dec 2005 22:23:35 -0000 1.15 @@ -229,6 +229,14 @@ } /** + * Override this to do initialising of the context. + * It will be called once from paint(), immediately after + * the context is created. + */ + protected void initGL() { + } + + /** * Override this to do painting */ protected void paintGL() { @@ -246,6 +254,8 @@ try { if (context == null) { this.context = new Context(peer_info, drawable != null ? drawable.getContext() : null); + context.makeCurrent(); + initGL(); } if (!context.isCurrent()) context.makeCurrent(); |
|
From: Elias N. <eli...@us...> - 2005-12-27 14:46:50
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3186/src/java/org/lwjgl/opengl Modified Files: GLChecks.java StateTracker.java Log Message: PBO/VBO checks now query OpenGL directly instead of keeping track of the currently bound buffers Index: GLChecks.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GLChecks.java 4 May 2005 20:59:37 -0000 1.2 +++ GLChecks.java 27 Dec 2005 14:46:42 -0000 1.3 @@ -32,6 +32,7 @@ package org.lwjgl.opengl; import java.nio.Buffer; +import java.nio.IntBuffer; import org.lwjgl.BufferUtils; @@ -57,51 +58,66 @@ return StateTracker.getReferencesStack().getReferences(); } + private static boolean checkBufferObject(int buffer_enum, boolean state) { + IntBuffer scratch_buffer = GLContext.getCapabilities().scratch_int_buffer; + GL11.glGetInteger(buffer_enum, scratch_buffer); + boolean is_enabled = scratch_buffer.get(0) != 0; + return state == is_enabled; + } + /** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureArrayVBOdisabled() { - if (StateTracker.getVBOArrayStack().getState() != 0) + if ((GLContext.getCapabilities().OpenGL15 && !checkBufferObject(GL15.GL_ARRAY_BUFFER_BINDING, false) || + (GLContext.getCapabilities().GL_ARB_vertex_buffer_object && !checkBufferObject(ARBVertexBufferObject.GL_ARRAY_BUFFER_BINDING_ARB, false)))) throw new OpenGLException("Cannot use Buffers when Array Buffer Object is enabled"); } /** Helper method to ensure that array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureArrayVBOenabled() { - if (StateTracker.getVBOArrayStack().getState() == 0) + if ((GLContext.getCapabilities().OpenGL15 && !checkBufferObject(GL15.GL_ARRAY_BUFFER_BINDING, true) || + (GLContext.getCapabilities().GL_ARB_vertex_buffer_object && !checkBufferObject(ARBVertexBufferObject.GL_ARRAY_BUFFER_BINDING_ARB, true)))) throw new OpenGLException("Cannot use offsets when Array Buffer Object is disabled"); } /** Helper method to ensure that element array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureElementVBOdisabled() { - if (StateTracker.getVBOElementStack().getState() != 0) + if ((GLContext.getCapabilities().OpenGL15 && !checkBufferObject(GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, false) || + (GLContext.getCapabilities().GL_ARB_vertex_buffer_object && !checkBufferObject(ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, false)))) throw new OpenGLException("Cannot use Buffers when Element Array Buffer Object is enabled"); } /** Helper method to ensure that element array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureElementVBOenabled() { - if (StateTracker.getVBOElementStack().getState() == 0) + if ((GLContext.getCapabilities().OpenGL15 && !checkBufferObject(GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, true) || + (GLContext.getCapabilities().GL_ARB_vertex_buffer_object && !checkBufferObject(ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, true)))) throw new OpenGLException("Cannot use offsets when Element Array Buffer Object is disabled"); } /** Helper method to ensure that pixel pack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensurePackPBOdisabled() { - if (StateTracker.getPBOPackStack().getState() != 0) + if ((GLContext.getCapabilities().GL_ARB_pixel_buffer_object && !checkBufferObject(ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_ARB, false) || + (GLContext.getCapabilities().GL_EXT_pixel_buffer_object && !checkBufferObject(EXTPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_EXT, false)))) throw new OpenGLException("Cannot use Buffers when Pixel Pack Buffer Object is enabled"); } /** Helper method to ensure that pixel pack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensurePackPBOenabled() { - if (StateTracker.getPBOPackStack().getState() == 0) + if ((GLContext.getCapabilities().GL_ARB_pixel_buffer_object && !checkBufferObject(ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_ARB, true) || + (GLContext.getCapabilities().GL_EXT_pixel_buffer_object && !checkBufferObject(EXTPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_EXT, true)))) throw new OpenGLException("Cannot use offsets when Pixel Pack Buffer Object is disabled"); } /** Helper method to ensure that pixel unpack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureUnpackPBOdisabled() { - if (StateTracker.getPBOUnpackStack().getState() != 0) + if ((GLContext.getCapabilities().GL_ARB_pixel_buffer_object && !checkBufferObject(ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_ARB, false) || + (GLContext.getCapabilities().GL_EXT_pixel_buffer_object && !checkBufferObject(EXTPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, false)))) throw new OpenGLException("Cannot use Buffers when Pixel Unpack Buffer Object is enabled"); } /** Helper method to ensure that pixel unpack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureUnpackPBOenabled() { - if (StateTracker.getPBOUnpackStack().getState() == 0) + if ((GLContext.getCapabilities().GL_ARB_pixel_buffer_object && !checkBufferObject(ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_ARB, true) || + (GLContext.getCapabilities().GL_EXT_pixel_buffer_object && !checkBufferObject(EXTPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, true)))) throw new OpenGLException("Cannot use offsets when Pixel Unpack Buffer Object is disabled"); } Index: StateTracker.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- StateTracker.java 4 May 2005 20:59:35 -0000 1.2 +++ StateTracker.java 27 Dec 2005 14:46:42 -0000 1.3 @@ -35,12 +35,6 @@ /** Track Vertex Buffer Objects by context. */ final class StateTracker { - private final StateStack vbo_array_stack; - private final StateStack vbo_element_stack; - - private final StateStack pbo_pack_stack; - private final StateStack pbo_unpack_stack; - private final ReferencesStack references_stack; private final StateStack attrib_stack; @@ -48,12 +42,6 @@ StateTracker() { int stack_size = Math.max(1, Util.glGetInteger(GL11.GL_MAX_CLIENT_ATTRIB_STACK_DEPTH)); - vbo_array_stack = new StateStack(stack_size, 0); - vbo_element_stack = new StateStack(stack_size, 0); - - pbo_pack_stack = new StateStack(stack_size, 0); - pbo_unpack_stack = new StateStack(stack_size, 0); - references_stack = new ReferencesStack(stack_size); attrib_stack = new StateStack(stack_size, 0); @@ -61,10 +49,6 @@ static void popAttrib() { if ((getClientAttribStack().popState() & GL11.GL_CLIENT_VERTEX_ARRAY_BIT) != 0) { - getVBOArrayStack().popState(); - getVBOElementStack().popState(); - getPBOPackStack().popState(); - getPBOUnpackStack().popState(); getReferencesStack().popState(); } } @@ -73,63 +57,10 @@ getClientAttribStack().pushState(); getClientAttribStack().setState(mask); if ((mask & GL11.GL_CLIENT_VERTEX_ARRAY_BIT) != 0) { - getVBOArrayStack().pushState(); - getVBOElementStack().pushState(); - getPBOPackStack().pushState(); - getPBOUnpackStack().pushState(); getReferencesStack().pushState(); } } - static void deleteBuffers(IntBuffer buffers) { - for (int i = buffers.position(); i < buffers.limit(); i++) { - int buffer_handle = buffers.get(i); - if (getVBOArrayStack().getState() == buffer_handle) - getVBOArrayStack().setState(0); - if (getVBOElementStack().getState() == buffer_handle) - getVBOElementStack().setState(0); - if (getPBOPackStack().getState() == buffer_handle) - getPBOPackStack().setState(0); - if (getPBOUnpackStack().getState() == buffer_handle) - getPBOUnpackStack().setState(0); - } - } - - static void bindBuffer(int target, int buffer) { - switch ( target ) { - case ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB: - getVBOArrayStack().setState(buffer); - break; - case ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_ARB: - getVBOElementStack().setState(buffer); - break; - case ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_ARB: - getPBOPackStack().setState(buffer); - break; - case ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_ARB: - getPBOUnpackStack().setState(buffer); - break; - default: - throw new IllegalArgumentException("Unsupported VBO target " + target); - } - } - - static StateStack getVBOArrayStack() { - return GLContext.getCapabilities().tracker.vbo_array_stack; - } - - static StateStack getVBOElementStack() { - return GLContext.getCapabilities().tracker.vbo_element_stack; - } - - static StateStack getPBOPackStack() { - return GLContext.getCapabilities().tracker.pbo_pack_stack; - } - - static StateStack getPBOUnpackStack() { - return GLContext.getCapabilities().tracker.pbo_unpack_stack; - } - static ReferencesStack getReferencesStack() { return GLContext.getCapabilities().tracker.references_stack; } |
|
From: Elias N. <eli...@us...> - 2005-12-27 14:46:50
|
Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3186/src/templates/org/lwjgl/opengl Modified Files: ARB_buffer_object.java EXT_pixel_buffer_object.java GL15.java Log Message: PBO/VBO checks now query OpenGL directly instead of keeping track of the currently bound buffers Index: ARB_buffer_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ARB_buffer_object.java 24 Dec 2005 19:26:36 -0000 1.7 +++ ARB_buffer_object.java 27 Dec 2005 14:46:42 -0000 1.8 @@ -67,10 +67,8 @@ int GL_BUFFER_MAPPED_ARB = 0x88BC; int GL_BUFFER_MAP_POINTER_ARB = 0x88BD; - @Code(" StateTracker.bindBuffer(target, buffer);") void glBindBufferARB(@GLenum int target, @GLuint int buffer); - @Code(" StateTracker.deleteBuffers(buffers);") void glDeleteBuffersARB(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers); void glGenBuffersARB(@AutoSize("buffers") int n, @GLuint IntBuffer buffers); Index: EXT_pixel_buffer_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_pixel_buffer_object.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EXT_pixel_buffer_object.java 24 Dec 2005 19:26:37 -0000 1.3 +++ EXT_pixel_buffer_object.java 27 Dec 2005 14:46:42 -0000 1.4 @@ -45,6 +45,6 @@ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: */ - int PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED; - int PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF; + int GL_PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED; + int GL_PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF; } Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL15.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- GL15.java 24 Dec 2005 19:26:37 -0000 1.6 +++ GL15.java 27 Dec 2005 14:46:42 -0000 1.7 @@ -72,10 +72,8 @@ int GL_BUFFER_MAPPED = 0x88BC; int GL_BUFFER_MAP_POINTER = 0x88BD; - @Code(" StateTracker.bindBuffer(target, buffer);") void glBindBuffer(@GLenum int target, @GLuint int buffer); - @Code(" StateTracker.deleteBuffers(buffers);") void glDeleteBuffers(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers); void glGenBuffers(@AutoSize("buffers") @GLsizei int n, @GLuint IntBuffer buffers); |
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3186/src/generated/org/lwjgl/opengl Modified Files: ARBBufferObject.java ContextCapabilities.java EXTPackedDepthStencil.java EXTPixelBufferObject.java EXTStencilClearTag.java GL15.java Log Message: PBO/VBO checks now query OpenGL directly instead of keeping track of the currently bound buffers Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL15.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GL15.java 24 Dec 2005 19:28:13 -0000 1.3 +++ GL15.java 27 Dec 2005 14:46:42 -0000 1.4 @@ -60,7 +60,6 @@ public static void glBindBuffer(int target, int buffer) { - StateTracker.bindBuffer(target, buffer); long function_pointer = GLContext.getCapabilities().GL15_glBindBuffer_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglBindBuffer(target, buffer, function_pointer); @@ -68,7 +67,6 @@ private static native void nglBindBuffer(int target, int buffer, long function_pointer); public static void glDeleteBuffers(IntBuffer buffers) { - StateTracker.deleteBuffers(buffers); long function_pointer = GLContext.getCapabilities().GL15_glDeleteBuffers_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(buffers); Index: EXTStencilClearTag.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTStencilClearTag.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTStencilClearTag.java 24 Dec 2005 19:28:13 -0000 1.2 +++ EXTStencilClearTag.java 27 Dec 2005 14:46:42 -0000 1.3 @@ -8,8 +8,8 @@ public final class EXTStencilClearTag { /** - * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, - * GetFloatv, and GetDoublev. + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev. */ public static final int GL_STENCIL_TAG_BITS_EXT = 0x88f2; public static final int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88f3; @@ -19,9 +19,9 @@ /** - * Controls the stencil clear tag state. stencilTagBits is a count of - * the number of most-significant stencil buffer bits involved in the - * stencil clear tag update. + * Controls the stencil clear tag state. stencilTagBits is a count of + * the number of most-significant stencil buffer bits involved in the + * stencil clear tag update. */ public static void glStencilClearTagEXT(int stencilTagBits, int stencilClearTag) { long function_pointer = GLContext.getCapabilities().EXT_stencil_clear_tag_glStencilClearTagEXT_pointer; Index: EXTPixelBufferObject.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTPixelBufferObject.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTPixelBufferObject.java 24 Dec 2005 19:28:13 -0000 1.2 +++ EXTPixelBufferObject.java 27 Dec 2005 14:46:42 -0000 1.3 @@ -18,8 +18,8 @@ * Accepted by the <pname> 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; + public static final int GL_PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ed; + public static final int GL_PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88ef; private EXTPixelBufferObject() { } Index: EXTPackedDepthStencil.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTPackedDepthStencil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTPackedDepthStencil.java 24 Dec 2005 19:28:13 -0000 1.2 +++ EXTPackedDepthStencil.java 27 Dec 2005 14:46:42 -0000 1.3 @@ -8,30 +8,30 @@ public final class EXTPackedDepthStencil { /** - * Accepted by the <format> parameter of DrawPixels, ReadPixels, - * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, - * TexSubImage3D, and GetTexImage, by the <type> parameter of - * CopyPixels, by the <internalformat> parameter of TexImage1D, - * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and - * RenderbufferStorageEXT, and returned in the <data> parameter of - * GetTexLevelParameter and GetRenderbufferParameterivEXT. + * Accepted by the <format> parameter of DrawPixels, ReadPixels, + * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, + * TexSubImage3D, and GetTexImage, by the <type> parameter of + * CopyPixels, by the <internalformat> parameter of TexImage1D, + * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and + * RenderbufferStorageEXT, and returned in the <data> parameter of + * GetTexLevelParameter and GetRenderbufferParameterivEXT. */ public static final int GL_DEPTH_STENCIL_EXT = 0x84f9; /** - * Accepted by the <type> parameter of DrawPixels, ReadPixels, - * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, - * TexSubImage3D, and GetTexImage. + * Accepted by the <type> parameter of DrawPixels, ReadPixels, + * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, + * TexSubImage3D, and GetTexImage. */ public static final int GL_UNSIGNED_INT_24_8_EXT = 0x84fa; /** - * Accepted by the <internalformat> parameter of TexImage1D, - * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and - * RenderbufferStorageEXT, and returned in the <data> parameter of - * GetTexLevelParameter and GetRenderbufferParameterivEXT. + * Accepted by the <internalformat> parameter of TexImage1D, + * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and + * RenderbufferStorageEXT, and returned in the <data> parameter of + * GetTexLevelParameter and GetRenderbufferParameterivEXT. */ public static final int GL_DEPTH24_STENCIL8_EXT = 0x88f0; /** - * Accepted by the <value> parameter of GetTexLevelParameter. + * Accepted by the <value> parameter of GetTexLevelParameter. */ public static final int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88f1; Index: ContextCapabilities.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ContextCapabilities.java 27 Dec 2005 12:35:12 -0000 1.4 +++ ContextCapabilities.java 27 Dec 2005 14:46:42 -0000 1.5 @@ -3,10 +3,13 @@ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; +import org.lwjgl.BufferUtils; import java.util.Set; +import java.nio.IntBuffer; public class ContextCapabilities { final StateTracker tracker; + final IntBuffer scratch_int_buffer = BufferUtils.createIntBuffer(16); public final boolean GL_ARB_color_buffer_float; public final boolean GL_ARB_depth_texture; Index: ARBBufferObject.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARBBufferObject.java 24 Dec 2005 19:28:13 -0000 1.3 +++ ARBBufferObject.java 27 Dec 2005 14:46:42 -0000 1.4 @@ -36,7 +36,6 @@ public static void glBindBufferARB(int target, int buffer) { - StateTracker.bindBuffer(target, buffer); long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBindBufferARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglBindBufferARB(target, buffer, function_pointer); @@ -44,7 +43,6 @@ private static native void nglBindBufferARB(int target, int buffer, long function_pointer); public static void glDeleteBuffersARB(IntBuffer buffers) { - StateTracker.deleteBuffers(buffers); long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glDeleteBuffersARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(buffers); |
|
From: Elias N. <eli...@us...> - 2005-12-27 14:46:50
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3186/src/java/org/lwjgl/util/generator Modified Files: ContextCapabilitiesGenerator.java ContextGeneratorProcessorFactory.java Log Message: PBO/VBO checks now query OpenGL directly instead of keeping track of the currently bound buffers Index: ContextGeneratorProcessorFactory.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ContextGeneratorProcessorFactory.java 29 Sep 2005 17:13:37 -0000 1.3 +++ ContextGeneratorProcessorFactory.java 27 Dec 2005 14:46:42 -0000 1.4 @@ -111,7 +111,9 @@ writer.println("package org.lwjgl.opengl;"); writer.println(); writer.println("import org.lwjgl.LWJGLException;"); + writer.println("import org.lwjgl.BufferUtils;"); writer.println("import java.util.Set;"); + writer.println("import java.nio.IntBuffer;"); writer.println(); ContextCapabilitiesGenerator.generateClassPrologue(writer, context_specific); DeclarationFilter filter = DeclarationFilter.getFilter(InterfaceDeclaration.class); Index: ContextCapabilitiesGenerator.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ContextCapabilitiesGenerator.java 4 Apr 2005 11:19:18 -0000 1.3 +++ ContextCapabilitiesGenerator.java 27 Dec 2005 14:46:42 -0000 1.4 @@ -65,6 +65,7 @@ public static void generateClassPrologue(PrintWriter writer, boolean context_specific) { writer.println("public class " + Utils.CONTEXT_CAPS_CLASS_NAME + " {"); writer.println("\tfinal StateTracker tracker;"); + writer.println("\tfinal IntBuffer scratch_int_buffer = BufferUtils.createIntBuffer(16);"); writer.println(); if (!context_specific) { writer.println("\tprivate static boolean " + STUBS_LOADED_NAME + " = false;"); |
|
From: Elias N. <eli...@us...> - 2005-12-27 13:48:41
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25407/src/native/win32 Modified Files: display.h Log Message: Win32: Removed stale declaration from display.h Index: display.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- display.h 27 Dec 2005 13:47:25 -0000 1.5 +++ display.h 27 Dec 2005 13:48:27 -0000 1.6 @@ -50,7 +50,6 @@ extern void restoreDisplayMode(void); extern void setGammaRamp(JNIEnv * env, jobject gammaRampBuffer); extern jobject initDisplay(JNIEnv * env); -extern jstring getAdapter(JNIEnv * env); extern jstring getVersion(JNIEnv * env, char *driver); #endif |
|
From: Elias N. <eli...@us...> - 2005-12-27 13:47:40
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25180/src/native/win32 Modified Files: Window.h display.c display.h org_lwjgl_opengl_Display.c Log Message: Win32: Moved getGammaRampLength to java side Index: display.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- display.h 23 Sep 2005 10:39:56 -0000 1.4 +++ display.h 27 Dec 2005 13:47:25 -0000 1.5 @@ -48,7 +48,6 @@ extern void switchDisplayMode(JNIEnv * env, jobject mode); extern void resetDisplayMode(JNIEnv * env); extern void restoreDisplayMode(void); -extern int getGammaRampLength(void); extern void setGammaRamp(JNIEnv * env, jobject gammaRampBuffer); extern jobject initDisplay(JNIEnv * env); extern jstring getAdapter(JNIEnv * env); Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- display.c 27 Dec 2005 11:21:46 -0000 1.12 +++ display.c 27 Dec 2005 13:47:25 -0000 1.13 @@ -45,14 +45,13 @@ #define COMPILE_MULTIMON_STUBS #include <Multimon.h> #include <jni.h> +#include "org_lwjgl_opengl_Win32Display.h" #include "display.h" #include "common_tools.h" -#define GAMMA_SIZE 256 - static bool modeSet = false; // Whether we've done a display mode change -static WORD originalGamma[3*GAMMA_SIZE]; // Original gamma settings -static WORD currentGamma[3*GAMMA_SIZE]; // Current gamma settings +static WORD originalGamma[3*org_lwjgl_opengl_Win32Display_GAMMA_LENGTH]; // Original gamma settings +static WORD currentGamma[3*org_lwjgl_opengl_Win32Display_GAMMA_LENGTH]; // Current gamma settings static DEVMODE devmode; // Now we'll remember this value for the future static jobject createDisplayMode(JNIEnv *env, DEVMODE *devmode) { @@ -169,11 +168,6 @@ modeSet = true; } -int getGammaRampLength(void) -{ - return GAMMA_SIZE; -} - void setGammaRamp(JNIEnv * env, jobject gammaRampBuffer) { int i; @@ -183,12 +177,12 @@ const float *gammaRamp = (const float *)(*env)->GetDirectBufferAddress(env, gammaRampBuffer); // Turn array of floats into array of RGB WORDs - for (i = 0; i < GAMMA_SIZE; i ++) { + for (i = 0; i < org_lwjgl_opengl_Win32Display_GAMMA_LENGTH; i ++) { scaledRampEntry = gammaRamp[i]*0xffff; rampEntry = (WORD)scaledRampEntry; currentGamma[i] = rampEntry; - currentGamma[i + GAMMA_SIZE] = rampEntry; - currentGamma[i + 2*GAMMA_SIZE] = rampEntry; + currentGamma[i + org_lwjgl_opengl_Win32Display_GAMMA_LENGTH] = rampEntry; + currentGamma[i + 2*org_lwjgl_opengl_Win32Display_GAMMA_LENGTH] = rampEntry; } screenDC = GetDC(NULL); if (SetDeviceGammaRamp(screenDC, currentGamma) == FALSE) { @@ -214,7 +208,7 @@ if (GetDeviceGammaRamp(screenDC, originalGamma) == FALSE) { printfDebugJava(env, "Failed to get initial device gamma"); } - memcpy(currentGamma, originalGamma, sizeof(WORD)*3*GAMMA_SIZE); + memcpy(currentGamma, originalGamma, sizeof(WORD)*3*org_lwjgl_opengl_Win32Display_GAMMA_LENGTH); ReleaseDC(NULL, screenDC); if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode)) { Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- org_lwjgl_opengl_Display.c 23 Sep 2005 10:39:56 -0000 1.30 +++ org_lwjgl_opengl_Display.c 27 Dec 2005 13:47:25 -0000 1.31 @@ -354,10 +354,6 @@ resetDisplayModeAndClipping(env); } -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_getGammaRampLength(JNIEnv *env, jobject self) { - return getGammaRampLength(); -} - JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_setGammaRamp(JNIEnv *env, jobject self, jobject gamma_buffer) { setGammaRamp(env, gamma_buffer); } Index: Window.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/Window.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Window.h 27 Dec 2005 13:40:21 -0000 1.26 +++ Window.h 27 Dec 2005 13:47:25 -0000 1.27 @@ -48,7 +48,7 @@ #include <windows.h> #include <jni.h> - #include "extgl.h" + #include "common_tools.h" #ifdef _PRIVATE_WINDOW_H_ #define WINDOW_H_API |
|
From: Elias N. <eli...@us...> - 2005-12-27 13:47:39
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25180/src/java/org/lwjgl/opengl Modified Files: Win32Display.java Log Message: Win32: Moved getGammaRampLength to java side Index: Win32Display.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Win32Display.java 27 Dec 2005 13:40:21 -0000 1.24 +++ Win32Display.java 27 Dec 2005 13:47:25 -0000 1.25 @@ -47,6 +47,8 @@ import org.lwjgl.input.Cursor; final class Win32Display implements DisplayImplementation { + private final static int GAMMA_LENGTH = 256; + private static Win32DisplayPeerInfo peer_info; public void createWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException { @@ -57,7 +59,11 @@ public native void destroyWindow(); public native void switchDisplayMode(DisplayMode mode) throws LWJGLException; public native void resetDisplayMode(); - public native int getGammaRampLength(); + + public int getGammaRampLength() { + return GAMMA_LENGTH; + } + public native void setGammaRamp(FloatBuffer gammaRamp) throws LWJGLException; public String getAdapter() { try { |
|
From: Elias N. <eli...@us...> - 2005-12-27 13:40:29
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23812/src/native/win32 Modified Files: Window.h org_lwjgl_input_Keyboard.c org_lwjgl_input_Mouse.c Log Message: Win32: Moved handleMessages to java side (update()) Index: org_lwjgl_input_Keyboard.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_input_Keyboard.c 12 May 2005 07:47:07 -0000 1.4 +++ org_lwjgl_input_Keyboard.c 27 Dec 2005 13:40:21 -0000 1.5 @@ -137,7 +137,7 @@ * Method: nPoll * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_pollKeyboard +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_nPollKeyboard (JNIEnv * env, jobject self, jobject buffer) { HRESULT ret; @@ -171,7 +171,7 @@ IDirectInputDevice_GetDeviceState(lpdiKeyboard, (DWORD)buffer_size, keyboardBuffer); } -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_readKeyboard +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_nReadKeyboard (JNIEnv * env, jobject self, jobject buffer_obj, jint buffer_position) { UINT scan_code; Index: Window.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/Window.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Window.h 29 Apr 2005 15:20:19 -0000 1.25 +++ Window.h 27 Dec 2005 13:40:21 -0000 1.26 @@ -66,8 +66,6 @@ WINDOW_H_API void handleMouseButton(int button, int state); - WINDOW_H_API void handleMessages(void); - WINDOW_H_API bool getCurrentFullscreen(); /* * Handle native Win32 messages Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- org_lwjgl_input_Mouse.c 12 May 2005 07:47:07 -0000 1.15 +++ org_lwjgl_input_Mouse.c 27 Dec 2005 13:40:21 -0000 1.16 @@ -315,15 +315,13 @@ } } -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_readMouse +JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Win32Display_nReadMouse (JNIEnv * env, jobject self, jobject buffer_obj, jint buffer_position) { jint* buffer_ptr = (jint *)(*env)->GetDirectBufferAddress(env, buffer_obj) + buffer_position; int buffer_size = ((*env)->GetDirectBufferCapacity(env, buffer_obj))/sizeof(jint) - buffer_position; if (mouse_grabbed) { readDXBuffer(env); - } else { - handleMessages(); } return copyEvents(&event_queue, buffer_ptr, buffer_size); } @@ -348,7 +346,7 @@ ShutdownMouse(env); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_pollMouse(JNIEnv * env, jobject self, jobject coord_buffer_obj, jobject button_buffer_obj) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_nPollMouse(JNIEnv * env, jobject self, jobject coord_buffer_obj, jobject button_buffer_obj) { UpdateMouseFields(env, coord_buffer_obj, button_buffer_obj); } @@ -469,8 +467,6 @@ return; } - handleMessages(); - if (mouse_grabbed) { hRes = IDirectInputDevice_GetDeviceState(mDIDevice, sizeof(DIMOUSESTATE), &diMouseState); if (hRes != DI_OK) { |
|
From: Elias N. <eli...@us...> - 2005-12-27 13:40:29
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23812/src/java/org/lwjgl/opengl Modified Files: Win32Display.java Log Message: Win32: Moved handleMessages to java side (update()) Index: Win32Display.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Win32Display.java 23 Sep 2005 10:39:56 -0000 1.23 +++ Win32Display.java 27 Dec 2005 13:40:21 -0000 1.24 @@ -120,8 +120,18 @@ public native int getButtonCount(); public native void createMouse() throws LWJGLException; public native void destroyMouse(); - public native void pollMouse(IntBuffer coord_buffer, ByteBuffer buttons); - public native int readMouse(IntBuffer buffer, int buffer_position); + public void pollMouse(IntBuffer coord_buffer, ByteBuffer buttons) { + update(); + nPollMouse(coord_buffer, buttons); + } + private native void nPollMouse(IntBuffer coord_buffer, ByteBuffer buttons); + + public int readMouse(IntBuffer buffer, int buffer_position) { + update(); + return nReadMouse(buffer, buffer_position); + } + private native int nReadMouse(IntBuffer buffer, int buffer_position); + public native void grabMouse(boolean grab); public int getNativeCursorCapabilities() { return Cursor.CURSOR_ONE_BIT_TRANSPARENCY; @@ -135,8 +145,19 @@ /* Keyboard */ public native void createKeyboard() throws LWJGLException; public native void destroyKeyboard(); - public native void pollKeyboard(ByteBuffer keyDownBuffer); - public native int readKeyboard(IntBuffer buffer, int buffer_position); + + public void pollKeyboard(ByteBuffer keyDownBuffer) { + update(); + nPollKeyboard(keyDownBuffer); + } + private native void nPollKeyboard(ByteBuffer keyDownBuffer); + + public int readKeyboard(IntBuffer buffer, int buffer_position) { + update(); + return nReadKeyboard(buffer, buffer_position); + } + private native int nReadKeyboard(IntBuffer buffer, int buffer_position); + public native int isStateKeySet(int key); public native ByteBuffer nCreateCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, int images_offset, IntBuffer delays, int delays_offset) throws LWJGLException; |
|
From: Ioannis T. <sp...@us...> - 2005-12-27 12:35:21
|
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11624 Modified Files: ContextCapabilities.java Log Message: New EXT_framebuffer extensions Index: ContextCapabilities.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ContextCapabilities.java 7 Nov 2005 08:49:50 -0000 1.3 +++ ContextCapabilities.java 27 Dec 2005 12:35:12 -0000 1.4 @@ -67,6 +67,8 @@ public final boolean GL_EXT_depth_bounds_test; public final boolean GL_EXT_draw_range_elements; public final boolean GL_EXT_fog_coord; + public final boolean GL_EXT_framebuffer_blit; + public final boolean GL_EXT_framebuffer_multisample; public final boolean GL_EXT_framebuffer_object; public final boolean GL_EXT_multi_draw_arrays; public final boolean GL_EXT_packed_depth_stencil; @@ -419,6 +421,8 @@ long EXT_fog_coord_glFogCoordfEXT_pointer; long EXT_fog_coord_glFogCoorddEXT_pointer; long EXT_fog_coord_glFogCoordPointerEXT_pointer; + long EXT_framebuffer_blit_glBlitFramebufferEXT_pointer; + long EXT_framebuffer_multisample_glRenderbufferStorageMultisampleEXT_pointer; long EXT_framebuffer_object_glIsRenderbufferEXT_pointer; long EXT_framebuffer_object_glBindRenderbufferEXT_pointer; long EXT_framebuffer_object_glDeleteRenderbuffersEXT_pointer; @@ -1396,6 +1400,16 @@ (EXT_fog_coord_glFogCoordPointerEXT_pointer = GLContext.getFunctionAddress("glFogCoordPointerEXT")) != 0; } + private boolean EXT_framebuffer_blit_initNativeFunctionAddresses() { + return + (EXT_framebuffer_blit_glBlitFramebufferEXT_pointer = GLContext.getFunctionAddress("glBlitFramebufferEXT")) != 0; + } + + private boolean EXT_framebuffer_multisample_initNativeFunctionAddresses() { + return + (EXT_framebuffer_multisample_glRenderbufferStorageMultisampleEXT_pointer = GLContext.getFunctionAddress("glRenderbufferStorageMultisampleEXT")) != 0; + } + private boolean EXT_framebuffer_object_initNativeFunctionAddresses() { return (EXT_framebuffer_object_glIsRenderbufferEXT_pointer = GLContext.getFunctionAddress("glIsRenderbufferEXT")) != 0 && @@ -2146,6 +2160,10 @@ supported_extensions.remove("GL_EXT_draw_range_elements"); if (supported_extensions.contains("GL_EXT_fog_coord") && !EXT_fog_coord_initNativeFunctionAddresses()) supported_extensions.remove("GL_EXT_fog_coord"); + if (supported_extensions.contains("GL_EXT_framebuffer_blit") && !EXT_framebuffer_blit_initNativeFunctionAddresses()) + supported_extensions.remove("GL_EXT_framebuffer_blit"); + if (supported_extensions.contains("GL_EXT_framebuffer_multisample") && !EXT_framebuffer_multisample_initNativeFunctionAddresses()) + supported_extensions.remove("GL_EXT_framebuffer_multisample"); if (supported_extensions.contains("GL_EXT_framebuffer_object") && !EXT_framebuffer_object_initNativeFunctionAddresses()) supported_extensions.remove("GL_EXT_framebuffer_object"); if (supported_extensions.contains("GL_EXT_multi_draw_arrays") && !EXT_multi_draw_arrays_initNativeFunctionAddresses()) @@ -2272,6 +2290,8 @@ this.GL_EXT_depth_bounds_test = supported_extensions.contains("GL_EXT_depth_bounds_test"); this.GL_EXT_draw_range_elements = supported_extensions.contains("GL_EXT_draw_range_elements"); this.GL_EXT_fog_coord = supported_extensions.contains("GL_EXT_fog_coord"); + this.GL_EXT_framebuffer_blit = supported_extensions.contains("GL_EXT_framebuffer_blit"); + this.GL_EXT_framebuffer_multisample = supported_extensions.contains("GL_EXT_framebuffer_multisample"); this.GL_EXT_framebuffer_object = supported_extensions.contains("GL_EXT_framebuffer_object"); this.GL_EXT_multi_draw_arrays = supported_extensions.contains("GL_EXT_multi_draw_arrays"); this.GL_EXT_packed_depth_stencil = supported_extensions.contains("GL_EXT_packed_depth_stencil"); |
|
From: Elias N. <eli...@us...> - 2005-12-27 11:22:03
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32143/src/native/win32 Modified Files: display.c Log Message: Win32: display.c: Make initDisplay use the same API as getAvailableDisplayModes Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- display.c 27 Dec 2005 11:12:53 -0000 1.11 +++ display.c 27 Dec 2005 11:21:46 -0000 1.12 @@ -200,38 +200,28 @@ jobject initDisplay(JNIEnv * env) { - int width; - int height; - int bpp; - int freq; - jclass jclass_DisplayMode; - jmethodID ctor; + DEVMODE devmode; jobject newMode; - // Determine the current screen resolution + LONG cdsret; + // Get the screen HDC screenDC = GetDC(NULL); if (!screenDC) { throwException(env, "Couldn't get screen DC!"); return NULL; } - // Get the device caps - width = GetDeviceCaps(screenDC, HORZRES); - height = GetDeviceCaps(screenDC, VERTRES); - bpp = GetDeviceCaps(screenDC, BITSPIXEL); - freq = GetDeviceCaps(screenDC, VREFRESH); - if (freq <= 1) - freq = 0; // Unknown - - jclass_DisplayMode = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); - ctor = (*env)->GetMethodID(env, jclass_DisplayMode, "<init>", "(IIII)V"); - newMode = (*env)->NewObject(env, jclass_DisplayMode, ctor, width, height, bpp, freq); - // Get the default gamma ramp if (GetDeviceGammaRamp(screenDC, originalGamma) == FALSE) { printfDebugJava(env, "Failed to get initial device gamma"); } memcpy(currentGamma, originalGamma, sizeof(WORD)*3*GAMMA_SIZE); ReleaseDC(NULL, screenDC); + + if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode)) { + throwFormattedException(env, "Couldn't get current display settings (%ld)", GetLastError()); + return NULL; + } + newMode = createDisplayMode(env, &devmode); return newMode; } |
|
From: Elias N. <eli...@us...> - 2005-12-27 11:13:19
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31065/src/native/win32 Modified Files: display.c Log Message: Win32: Adder createDisplayMode helper function to display.c Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- display.c 27 Dec 2005 11:03:33 -0000 1.10 +++ display.c 27 Dec 2005 11:12:53 -0000 1.11 @@ -48,13 +48,30 @@ #include "display.h" #include "common_tools.h" -#define GAMMA_SIZE (3*256) +#define GAMMA_SIZE 256 static bool modeSet = false; // Whether we've done a display mode change -static WORD originalGamma[GAMMA_SIZE]; // Original gamma settings -static WORD currentGamma[GAMMA_SIZE]; // Current gamma settings +static WORD originalGamma[3*GAMMA_SIZE]; // Original gamma settings +static WORD currentGamma[3*GAMMA_SIZE]; // Current gamma settings static DEVMODE devmode; // Now we'll remember this value for the future +static jobject createDisplayMode(JNIEnv *env, DEVMODE *devmode) { + jclass displayModeClass; + + jmethodID displayModeConstructor; + + displayModeClass = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); + if (displayModeClass == NULL) + return NULL; + displayModeConstructor = (*env)->GetMethodID(env, displayModeClass, "<init>", "(IIII)V"); + if (displayModeConstructor == NULL) + return NULL; + + return (*env)->NewObject(env, displayModeClass, displayModeConstructor, + devmode->dmPelsWidth, devmode->dmPelsHeight, + devmode->dmBitsPerPel, devmode->dmDisplayFrequency); +} + /** * Choose displaymodes using extended codepath (multiple displaydevices) */ @@ -62,24 +79,20 @@ int i = 0, j = 0, n = 0; - DISPLAY_DEVICE DisplayDevice; +// DISPLAY_DEVICE DisplayDevice; DEVMODE DevMode; jobject *display_mode_objects = NULL; int list_size = 0; jclass displayModeClass; - jobjectArray ret; - jmethodID displayModeConstructor; + displayModeClass = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); ZeroMemory(&DevMode, sizeof(DEVMODE)); - ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE)); +// ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE)); DevMode.dmSize = sizeof(DEVMODE); - DisplayDevice.cb = sizeof(DISPLAY_DEVICE); - - displayModeClass = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); - displayModeConstructor = (*env)->GetMethodID(env, displayModeClass, "<init>", "(IIII)V"); +// DisplayDevice.cb = sizeof(DISPLAY_DEVICE); /* Multi-monitor stuff commented out since we're only really interested in the primary monitor */ /* while(EnumDisplayDevices(NULL, i++, &DisplayDevice, 0) != 0) { @@ -100,9 +113,7 @@ if (display_mode_objects == NULL) return NULL; } - displayMode = (*env)->NewObject(env, displayModeClass, displayModeConstructor, - DevMode.dmPelsWidth, DevMode.dmPelsHeight, - DevMode.dmBitsPerPel, DevMode.dmDisplayFrequency); + displayMode = createDisplayMode(env, &DevMode); display_mode_objects[n++] = displayMode; } } @@ -160,7 +171,7 @@ int getGammaRampLength(void) { - return 256; + return GAMMA_SIZE; } void setGammaRamp(JNIEnv * env, jobject gammaRampBuffer) @@ -172,12 +183,12 @@ const float *gammaRamp = (const float *)(*env)->GetDirectBufferAddress(env, gammaRampBuffer); // Turn array of floats into array of RGB WORDs - for (i = 0; i < 256; i ++) { + for (i = 0; i < GAMMA_SIZE; i ++) { scaledRampEntry = gammaRamp[i]*0xffff; rampEntry = (WORD)scaledRampEntry; currentGamma[i] = rampEntry; - currentGamma[i + 256] = rampEntry; - currentGamma[i + 512] = rampEntry; + currentGamma[i + GAMMA_SIZE] = rampEntry; + currentGamma[i + 2*GAMMA_SIZE] = rampEntry; } screenDC = GetDC(NULL); if (SetDeviceGammaRamp(screenDC, currentGamma) == FALSE) { @@ -219,7 +230,7 @@ if (GetDeviceGammaRamp(screenDC, originalGamma) == FALSE) { printfDebugJava(env, "Failed to get initial device gamma"); } - memcpy(currentGamma, originalGamma, sizeof(WORD)*GAMMA_SIZE); + memcpy(currentGamma, originalGamma, sizeof(WORD)*3*GAMMA_SIZE); ReleaseDC(NULL, screenDC); return newMode; } |
|
From: Elias N. <eli...@us...> - 2005-12-27 11:03:56
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29567/src/native/win32 Modified Files: display.c Log Message: Win32: Removed unused cruft from display.c Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- display.c 27 Dec 2005 08:54:56 -0000 1.9 +++ display.c 27 Dec 2005 11:03:33 -0000 1.10 @@ -48,28 +48,17 @@ #include "display.h" #include "common_tools.h" -#define WINDOWCLASSNAME "LWJGLWINDOW" - #define GAMMA_SIZE (3*256) -static jobjectArray GetAvailableDisplayModesEx(JNIEnv * env); -static char * getDriver(); static bool modeSet = false; // Whether we've done a display mode change static WORD originalGamma[GAMMA_SIZE]; // Original gamma settings static WORD currentGamma[GAMMA_SIZE]; // Current gamma settings static DEVMODE devmode; // Now we'll remember this value for the future -extern HWND display_hwnd; // Handle to the window - -jobjectArray getAvailableDisplayModes(JNIEnv *env) -{ - jobjectArray result = GetAvailableDisplayModesEx(env); - return result; -} /** * Choose displaymodes using extended codepath (multiple displaydevices) */ -static jobjectArray GetAvailableDisplayModesEx(JNIEnv * env) { +jobjectArray getAvailableDisplayModes(JNIEnv * env) { int i = 0, j = 0, n = 0; |
|
From: Elias N. <eli...@us...> - 2005-12-27 08:55:09
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10486 Modified Files: display.c Log Message: Win32: Zero out the devmode struct in display.c Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- display.c 26 Dec 2005 21:52:12 -0000 1.8 +++ display.c 27 Dec 2005 08:54:56 -0000 1.9 @@ -142,6 +142,7 @@ int freq = (*env)->GetIntField(env, mode, fid_freq); LONG cdsret; + ZeroMemory(&devmode, sizeof(DEVMODE)); devmode.dmSize = sizeof(DEVMODE); devmode.dmBitsPerPel = bpp; devmode.dmPelsWidth = width; |
|
From: Elias N. <eli...@us...> - 2005-12-26 21:52:21
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14378/src/native/win32 Modified Files: display.c Log Message: Win32: Commented multi-monitor stuff out from display.c, since we don't really support multiple monitors anyway. Now we only operate on the default (DISPLAY_DEVICE_PRIMARY_DEVICE) device, which should scale to multi monitor setups. Needs thorough testing, of course. Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- display.c 26 Dec 2005 15:06:45 -0000 1.7 +++ display.c 26 Dec 2005 21:52:12 -0000 1.8 @@ -92,14 +92,16 @@ displayModeClass = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); displayModeConstructor = (*env)->GetMethodID(env, displayModeClass, "<init>", "(IIII)V"); - while(EnumDisplayDevices(NULL, i++, &DisplayDevice, 0) != 0) { + /* Multi-monitor stuff commented out since we're only really interested in the primary monitor */ +/* while(EnumDisplayDevices(NULL, i++, &DisplayDevice, 0) != 0) { // continue if mirroring device if((DisplayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) != 0) { continue; } j = 0; - while(EnumDisplaySettings((const char *) DisplayDevice.DeviceName, j++, &DevMode) != 0) { + while(EnumDisplaySettings((const char *) DisplayDevice.DeviceName, j++, &DevMode) != 0) {*/ + while(EnumDisplaySettings(NULL, j++, &DevMode) != 0) { // Filter out indexed modes if (DevMode.dmBitsPerPel > 8 && ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN | CDS_TEST) == DISP_CHANGE_SUCCESSFUL) { jobject displayMode; @@ -115,7 +117,7 @@ display_mode_objects[n++] = displayMode; } } - } +// } printfDebugJava(env, "Found %d displaymodes", n); ret = (*env)->NewObjectArray(env, n, displayModeClass, NULL); @@ -151,16 +153,17 @@ cdsret = ChangeDisplaySettings(&devmode, CDS_FULLSCREEN); if (cdsret != DISP_CHANGE_SUCCESSFUL) { - // Failed: so let's check to see if it's a wierd dual screen display + /* What's the proper way to do this multiply with 2 thing, if at all necessary? */ +/* // Failed: so let's check to see if it's a wierd dual screen display printfDebugJava(env, "Failed to set display mode (%ld) ... assuming dual monitors", cdsret); devmode.dmPelsWidth = width * 2; cdsret = ChangeDisplaySettings(&devmode, CDS_FULLSCREEN); if (cdsret != DISP_CHANGE_SUCCESSFUL) { - printfDebugJava(env, "Failed to set display mode using dual monitors (%ld)", cdsret); + printfDebugJava(env, "Failed to set display mode using dual monitors (%ld)", cdsret);*/ throwFormattedException(env, "Failed to set display mode (%ld).", cdsret); return; - } +// } } modeSet = true; } |
|
From: Elias N. <eli...@us...> - 2005-12-26 15:06:53
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9610/src/native/win32 Modified Files: display.c Log Message: Win32: Added debug to dispaly mode switching and removed the DM_DISPLAYFLAGS flag Index: display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/display.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- display.c 23 Sep 2005 10:39:56 -0000 1.6 +++ display.c 26 Dec 2005 15:06:45 -0000 1.7 @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + /** * $Id$ * @@ -58,9 +58,7 @@ static WORD originalGamma[GAMMA_SIZE]; // Original gamma settings static WORD currentGamma[GAMMA_SIZE]; // Current gamma settings static DEVMODE devmode; // Now we'll remember this value for the future -extern HWND display_hwnd; // Handle to the window - - +extern HWND display_hwnd; // Handle to the window jobjectArray getAvailableDisplayModes(JNIEnv *env) { @@ -73,33 +71,33 @@ */ static jobjectArray GetAvailableDisplayModesEx(JNIEnv * env) { - int i = 0, j = 0, n = 0; + int i = 0, j = 0, n = 0; DISPLAY_DEVICE DisplayDevice; DEVMODE DevMode; jobject *display_mode_objects = NULL; int list_size = 0; - jclass displayModeClass; + jclass displayModeClass; + + jobjectArray ret; + jmethodID displayModeConstructor; - jobjectArray ret; - jmethodID displayModeConstructor; - ZeroMemory(&DevMode, sizeof(DEVMODE)); ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE)); DevMode.dmSize = sizeof(DEVMODE); DisplayDevice.cb = sizeof(DISPLAY_DEVICE); - - displayModeClass = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); - displayModeConstructor = (*env)->GetMethodID(env, displayModeClass, "<init>", "(IIII)V"); - + + displayModeClass = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); + displayModeConstructor = (*env)->GetMethodID(env, displayModeClass, "<init>", "(IIII)V"); + while(EnumDisplayDevices(NULL, i++, &DisplayDevice, 0) != 0) { - // continue if mirroring device + // continue if mirroring device if((DisplayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) != 0) { continue; } - + j = 0; while(EnumDisplaySettings((const char *) DisplayDevice.DeviceName, j++, &DevMode) != 0) { // Filter out indexed modes @@ -111,16 +109,16 @@ if (display_mode_objects == NULL) return NULL; } - displayMode = (*env)->NewObject(env, displayModeClass, displayModeConstructor, - DevMode.dmPelsWidth, DevMode.dmPelsHeight, - DevMode.dmBitsPerPel, DevMode.dmDisplayFrequency); + displayMode = (*env)->NewObject(env, displayModeClass, displayModeConstructor, + DevMode.dmPelsWidth, DevMode.dmPelsHeight, + DevMode.dmBitsPerPel, DevMode.dmDisplayFrequency); display_mode_objects[n++] = displayMode; } } } printfDebugJava(env, "Found %d displaymodes", n); - - ret = (*env)->NewObjectArray(env, n, displayModeClass, NULL); + + ret = (*env)->NewObjectArray(env, n, displayModeClass, NULL); for (i = 0; i < n; i++) { (*env)->SetObjectArrayElement(env, ret, i, display_mode_objects[i]); } @@ -130,38 +128,37 @@ void switchDisplayMode(JNIEnv * env, jobject mode) { - jclass cls_displayMode = (*env)->GetObjectClass(env, mode); - jfieldID fid_width = (*env)->GetFieldID(env, cls_displayMode, "width", "I"); - jfieldID fid_height = (*env)->GetFieldID(env, cls_displayMode, "height", "I"); - jfieldID fid_bpp = (*env)->GetFieldID(env, cls_displayMode, "bpp", "I"); - jfieldID fid_freq = (*env)->GetFieldID(env, cls_displayMode, "freq", "I"); + jclass cls_displayMode = (*env)->GetObjectClass(env, mode); + jfieldID fid_width = (*env)->GetFieldID(env, cls_displayMode, "width", "I"); + jfieldID fid_height = (*env)->GetFieldID(env, cls_displayMode, "height", "I"); + jfieldID fid_bpp = (*env)->GetFieldID(env, cls_displayMode, "bpp", "I"); + jfieldID fid_freq = (*env)->GetFieldID(env, cls_displayMode, "freq", "I"); - int width = (*env)->GetIntField(env, mode, fid_width); - int height = (*env)->GetIntField(env, mode, fid_height); - int bpp = (*env)->GetIntField(env, mode, fid_bpp); - int freq = (*env)->GetIntField(env, mode, fid_freq); - LONG cdsret; + int width = (*env)->GetIntField(env, mode, fid_width); + int height = (*env)->GetIntField(env, mode, fid_height); + int bpp = (*env)->GetIntField(env, mode, fid_bpp); + int freq = (*env)->GetIntField(env, mode, fid_freq); + LONG cdsret; devmode.dmSize = sizeof(DEVMODE); devmode.dmBitsPerPel = bpp; devmode.dmPelsWidth = width; devmode.dmPelsHeight = height; - devmode.dmDisplayFlags = 0; devmode.dmDisplayFrequency = freq; - devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS; + devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; if (freq != 0) devmode.dmFields |= DM_DISPLAYFREQUENCY; - cdsret = ChangeDisplaySettings(&devmode, CDS_FULLSCREEN); + cdsret = ChangeDisplaySettings(&devmode, CDS_FULLSCREEN); if (cdsret != DISP_CHANGE_SUCCESSFUL) { // Failed: so let's check to see if it's a wierd dual screen display - printfDebugJava(env, "Failed to set display mode... assuming dual monitors"); + printfDebugJava(env, "Failed to set display mode (%ld) ... assuming dual monitors", cdsret); devmode.dmPelsWidth = width * 2; cdsret = ChangeDisplaySettings(&devmode, CDS_FULLSCREEN); if (cdsret != DISP_CHANGE_SUCCESSFUL) { - printfDebugJava(env, "Failed to set display mode using dual monitors"); - throwException(env, "Failed to set display mode."); + printfDebugJava(env, "Failed to set display mode using dual monitors (%ld)", cdsret); + throwFormattedException(env, "Failed to set display mode (%ld).", cdsret); return; } } @@ -175,21 +172,21 @@ void setGammaRamp(JNIEnv * env, jobject gammaRampBuffer) { - int i; - float scaledRampEntry; - WORD rampEntry; - HDC screenDC; - const float *gammaRamp = (const float *)(*env)->GetDirectBufferAddress(env, gammaRampBuffer); + int i; + float scaledRampEntry; + WORD rampEntry; + HDC screenDC; + const float *gammaRamp = (const float *)(*env)->GetDirectBufferAddress(env, gammaRampBuffer); // Turn array of floats into array of RGB WORDs - for (i = 0; i < 256; i ++) { - scaledRampEntry = gammaRamp[i]*0xffff; - rampEntry = (WORD)scaledRampEntry; + for (i = 0; i < 256; i ++) { + scaledRampEntry = gammaRamp[i]*0xffff; + rampEntry = (WORD)scaledRampEntry; currentGamma[i] = rampEntry; currentGamma[i + 256] = rampEntry; currentGamma[i + 512] = rampEntry; } - screenDC = GetDC(NULL); + screenDC = GetDC(NULL); if (SetDeviceGammaRamp(screenDC, currentGamma) == FALSE) { throwException(env, "Failed to set device gamma."); } @@ -199,13 +196,13 @@ jobject initDisplay(JNIEnv * env) { - int width; - int height; - int bpp; - int freq; - jclass jclass_DisplayMode; - jmethodID ctor; - jobject newMode; + int width; + int height; + int bpp; + int freq; + jclass jclass_DisplayMode; + jmethodID ctor; + jobject newMode; // Determine the current screen resolution // Get the screen HDC screenDC = GetDC(NULL); @@ -214,16 +211,16 @@ return NULL; } // Get the device caps - width = GetDeviceCaps(screenDC, HORZRES); - height = GetDeviceCaps(screenDC, VERTRES); - bpp = GetDeviceCaps(screenDC, BITSPIXEL); - freq = GetDeviceCaps(screenDC, VREFRESH); + width = GetDeviceCaps(screenDC, HORZRES); + height = GetDeviceCaps(screenDC, VERTRES); + bpp = GetDeviceCaps(screenDC, BITSPIXEL); + freq = GetDeviceCaps(screenDC, VREFRESH); if (freq <= 1) freq = 0; // Unknown - jclass_DisplayMode = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); - ctor = (*env)->GetMethodID(env, jclass_DisplayMode, "<init>", "(IIII)V"); - newMode = (*env)->NewObject(env, jclass_DisplayMode, ctor, width, height, bpp, freq); + jclass_DisplayMode = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode"); + ctor = (*env)->GetMethodID(env, jclass_DisplayMode, "<init>", "(IIII)V"); + newMode = (*env)->NewObject(env, jclass_DisplayMode, ctor, width, height, bpp, freq); // Get the default gamma ramp if (GetDeviceGammaRamp(screenDC, originalGamma) == FALSE) { @@ -259,7 +256,7 @@ void restoreDisplayMode(void) { // Restore gamma HDC screenDC = GetDC(NULL); - LONG cdsret; + LONG cdsret; if (!SetDeviceGammaRamp(screenDC, currentGamma)) { printfDebug("Could not restore device gamma\n"); } @@ -268,7 +265,7 @@ if (!modeSet) { printfDebug("Attempting to restore the display mode\n"); modeSet = true; - cdsret = ChangeDisplaySettings(&devmode, CDS_FULLSCREEN); + cdsret = ChangeDisplaySettings(&devmode, CDS_FULLSCREEN); if (cdsret != DISP_CHANGE_SUCCESSFUL) { printfDebug("Failed to restore display mode\n"); @@ -282,18 +279,18 @@ TCHAR driverDLL[256] = "\0"; DWORD var = 0; - DWORD dwInfoSize; - LPVOID lpInfoBuff; - BOOL bRetval; + DWORD dwInfoSize; + LPVOID lpInfoBuff; + BOOL bRetval; if (driver == NULL) { return NULL; } strcat(driverDLL, driver); strcat(driverDLL, ".dll"); - dwInfoSize = GetFileVersionInfoSize(driverDLL, &var); - lpInfoBuff = malloc(dwInfoSize); - bRetval = GetFileVersionInfo(driverDLL, 0, dwInfoSize, lpInfoBuff); + dwInfoSize = GetFileVersionInfoSize(driverDLL, &var); + lpInfoBuff = malloc(dwInfoSize); + bRetval = GetFileVersionInfo(driverDLL, 0, dwInfoSize, lpInfoBuff); if (bRetval == 0) { } else { VS_FIXEDFILEINFO * fxdFileInfo; @@ -310,7 +307,7 @@ } } - free(lpInfoBuff); + free(lpInfoBuff); return ret; } |
|
From: Ioannis T. <sp...@us...> - 2005-12-24 19:37:36
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/generated In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18758 Added Files: org_lwjgl_opengl_EXTFramebufferBlit.c org_lwjgl_opengl_EXTFramebufferMultisample.c Log Message: New EXT_framebuffer extensions --- NEW FILE: org_lwjgl_opengl_EXTFramebufferMultisample.c --- /* MACHINE GENERATED FILE, DO NOT EDIT */ #include <jni.h> #include "extgl.h" typedef void (APIENTRY *glRenderbufferStorageMultisampleEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFramebufferMultisample_nglRenderbufferStorageMultisampleEXT(JNIEnv *env, jclass clazz, jint target, jint samples, jint internalformat, jint width, jint height, jlong function_pointer) { glRenderbufferStorageMultisampleEXTPROC glRenderbufferStorageMultisampleEXT = (glRenderbufferStorageMultisampleEXTPROC)((intptr_t)function_pointer); glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height); } --- NEW FILE: org_lwjgl_opengl_EXTFramebufferBlit.c --- /* MACHINE GENERATED FILE, DO NOT EDIT */ #include <jni.h> #include "extgl.h" typedef void (APIENTRY *glBlitFramebufferEXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFramebufferBlit_nglBlitFramebufferEXT(JNIEnv *env, jclass clazz, jint srcX0, jint srcY0, jint srcX1, jint srcY1, jint dstX0, jint dstY0, jint dstX1, jint dstY1, jint mask, jint filter, jlong function_pointer) { glBlitFramebufferEXTPROC glBlitFramebufferEXT = (glBlitFramebufferEXTPROC)((intptr_t)function_pointer); glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } |
|
From: Ioannis T. <sp...@us...> - 2005-12-24 19:31:12
|
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18020 Added Files: EXTFramebufferBlit.java EXTFramebufferMultisample.java Log Message: New EXT_framebuffer extensions --- NEW FILE: EXTFramebufferBlit.java --- /* MACHINE GENERATED FILE, DO NOT EDIT */ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; import java.nio.*; public final class EXTFramebufferBlit { /** * Accepted by the <target> parameter of BindFramebufferEXT, * CheckFramebufferStatusEXT, FramebufferTexture{1D|2D|3D}EXT, * FramebufferRenderbufferEXT, and * GetFramebufferAttachmentParameterivEXT. */ public static final int GL_READ_FRAMEBUFFER_EXT = 0x8ca8; public static final int GL_DRAW_FRAMEBUFFER_EXT = 0x8ca9; /** * Accepted by the <pname> parameters of GetIntegerv, GetFloatv, and GetDoublev. */ public static final int GL_DRAW_FRAMEBUFFER_BINDING_EXT = 0x8ca6; public static final int GL_READ_FRAMEBUFFER_BINDING_EXT = 0x8caa; private EXTFramebufferBlit() { } /** * Transfers a rectangle of pixel values from one * region of the read framebuffer to another in the draw framebuffer. * <mask> is the bitwise OR of a number of values indicating which * buffers are to be copied. The values are COLOR_BUFFER_BIT, * DEPTH_BUFFER_BIT, and STENCIL_BUFFER_BIT. * The pixels corresponding to these buffers are * copied from the source rectangle, bound by the locations (srcX0, * srcY0) and (srcX1, srcY1) inclusive, to the destination rectangle, * bound by the locations (dstX0, dstY0) and (dstX1, dstY1) * inclusive. * If the source and destination rectangle dimensions do not match, * the source image is stretched to fit the destination * rectangle. <filter> must be LINEAR or NEAREST and specifies the * method of interpolation to be applied if the image is * stretched. */ public static void glBlitFramebufferEXT(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter) { long function_pointer = GLContext.getCapabilities().EXT_framebuffer_blit_glBlitFramebufferEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter, function_pointer); } private static native void nglBlitFramebufferEXT(int srcX0, int srcY0, int srcX1, int srcY1, int dstX0, int dstY0, int dstX1, int dstY1, int mask, int filter, long function_pointer); } --- NEW FILE: EXTFramebufferMultisample.java --- /* MACHINE GENERATED FILE, DO NOT EDIT */ package org.lwjgl.opengl; import org.lwjgl.LWJGLException; import org.lwjgl.BufferChecks; import java.nio.*; public final class EXTFramebufferMultisample { /** * Accepted by the <pname> parameter of GetRenderbufferParameterivEXT. */ public static final int GL_RENDERBUFFER_SAMPLES_EXT = 0x8cab; private EXTFramebufferMultisample() { } /** * Establishes the data storage, format, dimensions, and number of * samples of a renderbuffer object's image. */ public static void glRenderbufferStorageMultisampleEXT(int target, int samples, int internalformat, int width, int height) { long function_pointer = GLContext.getCapabilities().EXT_framebuffer_multisample_glRenderbufferStorageMultisampleEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height, function_pointer); } private static native void nglRenderbufferStorageMultisampleEXT(int target, int samples, int internalformat, int width, int height, long function_pointer); } |
|
From: Ioannis T. <sp...@us...> - 2005-12-24 19:30:07
|
Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17760 Added Files: EXT_framebuffer_blit.java EXT_framebuffer_multisample.java Log Message: New EXT_framebuffer extensions --- NEW FILE: EXT_framebuffer_multisample.java --- /* * 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 * met: * * * 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 * 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 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; import org.lwjgl.util.generator.*; public interface EXT_framebuffer_multisample { /** Accepted by the <pname> parameter of GetRenderbufferParameterivEXT. */ int GL_RENDERBUFFER_SAMPLES_EXT = 0x8CAB; /** Establishes the data storage, format, dimensions, and number of samples of a renderbuffer object's image. */ void glRenderbufferStorageMultisampleEXT( @GLenum int target, @GLsizei int samples, @GLenum int internalformat, @GLsizei int width, @GLsizei int height); } --- NEW FILE: EXT_framebuffer_blit.java --- /* * 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 * met: * * * 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 * 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 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; import org.lwjgl.util.generator.*; public interface EXT_framebuffer_blit { /** Accepted by the <target> parameter of BindFramebufferEXT, CheckFramebufferStatusEXT, FramebufferTexture{1D|2D|3D}EXT, FramebufferRenderbufferEXT, and GetFramebufferAttachmentParameterivEXT. */ int GL_READ_FRAMEBUFFER_EXT = 0x8CA8; int GL_DRAW_FRAMEBUFFER_EXT = 0x8CA9; /** Accepted by the <pname> parameters of GetIntegerv, GetFloatv, and GetDoublev. */ int GL_DRAW_FRAMEBUFFER_BINDING_EXT = 0x8CA6; // alias FRAMEBUFFER_BINDING_EXT int GL_READ_FRAMEBUFFER_BINDING_EXT = 0x8CAA; /** Transfers a rectangle of pixel values from one region of the read framebuffer to another in the draw framebuffer. <mask> is the bitwise OR of a number of values indicating which buffers are to be copied. The values are COLOR_BUFFER_BIT, DEPTH_BUFFER_BIT, and STENCIL_BUFFER_BIT. The pixels corresponding to these buffers are copied from the source rectangle, bound by the locations (srcX0, srcY0) and (srcX1, srcY1) inclusive, to the destination rectangle, bound by the locations (dstX0, dstY0) and (dstX1, dstY1) inclusive. If the source and destination rectangle dimensions do not match, the source image is stretched to fit the destination rectangle. <filter> must be LINEAR or NEAREST and specifies the method of interpolation to be applied if the image is stretched. */ void glBlitFramebufferEXT( @GLint int srcX0, @GLint int srcY0, @GLint int srcX1, @GLint int srcY1, @GLint int dstX0, @GLint int dstY0, @GLint int dstX1, @GLint int dstY1, @GLbitfield int mask, @GLenum int filter); } |
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17529 Modified Files: ARBBufferObject.java ARBColorBufferFloat.java ARBDepthTexture.java ARBDrawBuffers.java ARBFragmentProgram.java ARBFragmentShader.java ARBHalfFloatPixel.java ARBOcclusionQuery.java ARBPixelBufferObject.java ARBPointSprite.java ARBProgram.java ARBShaderObjects.java ARBShadingLanguage100.java ARBTextureFloat.java ARBTextureRectangle.java ARBVertexBufferObject.java ARBVertexProgram.java ARBVertexShader.java ATIDrawBuffers.java ATIFragmentShader.java ATIMapObjectBuffer.java ATITextureFloat.java EXTBlendEquationSeparate.java EXTDepthBoundsTest.java EXTPackedDepthStencil.java EXTPalettedTexture.java EXTPixelBufferObject.java EXTStencilClearTag.java EXTTextureMirrorClamp.java EXTTextureSRGB.java GL15.java GL20.java HPOcclusionTest.java IBMRasterposClip.java NVFloatBuffer.java NVFragmentProgram.java NVFragmentProgram2.java NVHalfFloat.java NVMultisampleFilterHint.java NVPixelDataRange.java NVPrimitiveRestart.java NVProgram.java NVTextureCompressionVTC.java NVTextureExpandNormal.java NVVertexProgram.java NVVertexProgram2Option.java NVVertexProgram3.java SUNSliceAccum.java Log Message: Converted comments to javadoc, code cleanup Index: ARBVertexBufferObject.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexBufferObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBVertexBufferObject.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBVertexBufferObject.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,8 +7,18 @@ import java.nio.*; public final class ARBVertexBufferObject extends ARBBufferObject { + /** + * Accepted by the <target> parameters of BindBufferARB, BufferDataARB, + * BufferSubDataARB, MapBufferARB, UnmapBufferARB, + * GetBufferSubDataARB, GetBufferParameterivARB, and + * GetBufferPointervARB: + */ public static final int GL_ARRAY_BUFFER_ARB = 0x8892; public static final int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893; + /** + * Accepted by the <pname> 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; @@ -20,6 +30,9 @@ public static final int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889c; public static final int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889d; public static final int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889e; + /** + * Accepted by the <pname> parameter of GetVertexAttribivARB: + */ public static final int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889f; private ARBVertexBufferObject() { Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL15.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GL15.java 2 Nov 2005 09:28:10 -0000 1.2 +++ GL15.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -38,9 +38,20 @@ 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; + /** + * Accepted by the <target> parameter of BeginQuery, EndQuery, + * and GetQueryiv: + */ public static final int GL_SAMPLES_PASSED = 0x8914; + /** + * Accepted by the <pname> parameter of GetQueryiv: + */ public static final int GL_QUERY_COUNTER_BITS = 0x8864; public static final int GL_CURRENT_QUERY = 0x8865; + /** + * Accepted by the <pname> parameter of GetQueryObjectiv and + * GetQueryObjectuiv: + */ public static final int GL_QUERY_RESULT = 0x8866; public static final int GL_QUERY_RESULT_AVAILABLE = 0x8867; Index: SUNSliceAccum.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/SUNSliceAccum.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SUNSliceAccum.java 29 Sep 2005 17:13:36 -0000 1.1 +++ SUNSliceAccum.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,9 @@ import java.nio.*; public final class SUNSliceAccum { + /** + * Accepted by the <op> parameter of Accum, + */ public static final int GL_SLICE_ACCUM_SUN = 0x85cc; private SUNSliceAccum() { Index: ARBShadingLanguage100.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBShadingLanguage100.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBShadingLanguage100.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBShadingLanguage100.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -8,7 +8,7 @@ public final class ARBShadingLanguage100 { /** - * Accepted by the <name> parameter of GetString: + * Accepted by the <name> parameter of GetString: */ public static final int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8b8c; Index: ATITextureFloat.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ATITextureFloat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ATITextureFloat.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ATITextureFloat.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,10 @@ import java.nio.*; public final class ATITextureFloat { + /** + * Accepted by the <internalFormat> 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; Index: ARBHalfFloatPixel.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBHalfFloatPixel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBHalfFloatPixel.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBHalfFloatPixel.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,14 @@ import java.nio.*; public final class ARBHalfFloatPixel { + /** + * Accepted by the <type> parameter of DrawPixels, ReadPixels, + * TexImage1D, TexImage2D, TexImage3D, GetTexImage, TexSubImage1D, + * TexSubImage2D, TexSubImage3D, GetHistogram, GetMinmax, + * ConvolutionFilter1D, ConvolutionFilter2D, GetConvolutionFilter, + * SeparableFilter2D, GetSeparableFilter, ColorTable, ColorSubTable, + * and GetColorTable: + */ public static final int GL_HALF_FLOAT_ARB = 0x140b; private ARBHalfFloatPixel() { Index: ARBDrawBuffers.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBDrawBuffers.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBDrawBuffers.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBDrawBuffers.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,10 @@ import java.nio.*; public final class ARBDrawBuffers { + /** + * Accepted by the <pname> 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; Index: ARBOcclusionQuery.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBOcclusionQuery.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBOcclusionQuery.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,9 +7,20 @@ import java.nio.*; public final class ARBOcclusionQuery { + /** + * Accepted by the <target> parameter of BeginQueryARB, EndQueryARB, + * and GetQueryivARB: + */ public static final int GL_SAMPLES_PASSED_ARB = 0x8914; + /** + * Accepted by the <pname> parameter of GetQueryivARB: + */ public static final int GL_QUERY_COUNTER_BITS_ARB = 0x8864; public static final int GL_CURRENT_QUERY_ARB = 0x8865; + /** + * Accepted by the <pname> parameter of GetQueryObjectivARB and + * GetQueryObjectuivARB: + */ public static final int GL_QUERY_RESULT_ARB = 0x8866; public static final int GL_QUERY_RESULT_AVAILABLE_ARB = 0x8867; Index: EXTStencilClearTag.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTStencilClearTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTStencilClearTag.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTStencilClearTag.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,10 @@ import java.nio.*; public final class EXTStencilClearTag { + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev. + */ public static final int GL_STENCIL_TAG_BITS_EXT = 0x88f2; public static final int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88f3; @@ -14,6 +18,11 @@ } + /** + * Controls the stencil clear tag state. stencilTagBits is a count of + * the number of most-significant stencil buffer bits involved in the + * stencil clear tag update. + */ public static void glStencilClearTagEXT(int stencilTagBits, int stencilClearTag) { long function_pointer = GLContext.getCapabilities().EXT_stencil_clear_tag_glStencilClearTagEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: NVTextureCompressionVTC.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVTextureCompressionVTC.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVTextureCompressionVTC.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVTextureCompressionVTC.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,11 @@ import java.nio.*; public final class NVTextureCompressionVTC { + /** + * Accepted by the <internalformat> parameter of TexImage3D and + * CompressedTexImage3DARB and the <format> parameter of + * CompressedTexSubImage2DARB: + */ 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; Index: GL20.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL20.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GL20.java 2 Nov 2005 09:28:10 -0000 1.2 +++ GL20.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -7,8 +7,17 @@ import java.nio.*; public final class GL20 { + /** + * Accepted by the <name> parameter of GetString: + */ public static final int GL_SHADING_LANGUAGE_VERSION = 0x8b8c; + /** + * Accepted by the <pname> argument of GetInteger: + */ public static final int GL_CURRENT_PROGRAM = 0x8b8d; + /** + * Accepted by the <pname> 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; @@ -21,7 +30,13 @@ 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; + /** + * Returned by the <params> parameter of GetObjectParameter{fi}vARB: + */ public static final int GL_SHADER_OBJECT = 0x8b48; + /** + * Returned by the <type> 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; @@ -41,7 +56,15 @@ 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; + /** + * Accepted by the <shaderType> argument of CreateShader and + * returned by the <params> parameter of GetShader{if}v: + */ public static final int GL_VERTEX_SHADER = 0x8b31; + /** + * Accepted by the <pname> 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; @@ -49,18 +72,45 @@ 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; + /** + * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and + * by the <pname> 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; + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <pname> parameter of GetVertexAttribPointervARB: + */ public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645; + /** + * Accepted by the <shaderType> argument of CreateShader and + * returned by the <params> parameter of GetShader{fi}vARB: + */ public static final int GL_FRAGMENT_SHADER = 0x8b30; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8b49; + /** + * Accepted by the <target> parameter of Hint and the <pname> parameter of + * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: + */ public static final int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8b8b; + /** + * Accepted by the <pname> 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; @@ -78,9 +128,27 @@ public static final int GL_DRAW_BUFFER13 = 0x8832; public static final int GL_DRAW_BUFFER14 = 0x8833; public static final int GL_DRAW_BUFFER15 = 0x8834; + /** + * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by + * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and + * GetDoublev, and by the <target> parameter of TexEnvi, TexEnviv, + * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv: + */ public static final int GL_POINT_SPRITE = 0x8861; + /** + * When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv, + * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE, then the value of + * <pname> may be: + */ public static final int GL_COORD_REPLACE = 0x8862; + /** + * Accepted by the <pname> parameter of PointParameter{if}vARB, and the + * <pname> of Get: + */ public static final int GL_POINT_SPRITE_COORD_ORIGIN = 0x8ca0; + /** + * Accepted by the <param> parameter of PointParameter{if}vARB: + */ public static final int GL_LOWER_LEFT = 0x8ca1; public static final int GL_UPPER_LEFT = 0x8ca2; public static final int GL_STENCIL_BACK_FUNC = 0x8800; Index: NVVertexProgram2Option.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram2Option.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVVertexProgram2Option.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVVertexProgram2Option.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,9 @@ import java.nio.*; public final class NVVertexProgram2Option { + /** + * Accepted by the <pname> 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; Index: ARBFragmentProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBFragmentProgram.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBFragmentProgram.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBFragmentProgram.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,7 +7,18 @@ import java.nio.*; public final class ARBFragmentProgram extends ARBProgram { + /** + * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the + * <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, + * and by the <target> parameter of ProgramStringARB, BindProgramARB, + * ProgramEnvParameter4[df][v]ARB, ProgramLocalParameter4[df][v]ARB, + * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB, + * GetProgramivARB and GetProgramStringARB. + */ public static final int GL_FRAGMENT_PROGRAM_ARB = 0x8804; + /** + * Accepted by the <pname> 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; @@ -20,6 +31,10 @@ 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; + /** + * Accepted by the <pname> 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; Index: EXTPixelBufferObject.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTPixelBufferObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTPixelBufferObject.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTPixelBufferObject.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,8 +7,17 @@ import java.nio.*; public final class EXTPixelBufferObject extends ARBBufferObject { + /** + * Accepted by the <target> parameters of BindBuffer, BufferData, + * 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; + /** + * Accepted by the <pname> 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; Index: HPOcclusionTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/HPOcclusionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HPOcclusionTest.java 29 Sep 2005 17:13:36 -0000 1.1 +++ HPOcclusionTest.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -8,12 +8,12 @@ public final class HPOcclusionTest { /** - * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by - * the <pname> of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev : + * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by + * the <pname> of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev : */ public static final int GL_OCCLUSION_TEST_HP = 0x8165; /** - * Accepted by the <pname> of GetBooleanv, GetIntegerv, GetFloatv, and + * Accepted by the <pname> of GetBooleanv, GetIntegerv, GetFloatv, and * GetDoublev : */ public static final int GL_OCCLUSION_TEST_RESULT_HP = 0x8166; Index: ATIDrawBuffers.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ATIDrawBuffers.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ATIDrawBuffers.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ATIDrawBuffers.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,10 @@ import java.nio.*; public final class ATIDrawBuffers { + /** + * Accepted by the <pname> 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; Index: ATIMapObjectBuffer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ATIMapObjectBuffer.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ATIMapObjectBuffer.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -17,10 +17,10 @@ * null, in which case a new ByteBuffer will be created, pointing to the returned memory. If * oldBuffer is non-null, it will be returned if it points to the same mapped memory, otherwise a * new ByteBuffer is created. - * @param result_size The size of the buffer area. - * @param old_buffer A ByteBuffer. If this argument points to the same address as the new mapping, - * it will be returned and no new buffer will be created. In that case, size is - * ignored. + * @param result_size The size of the buffer area. + * @param old_buffer A ByteBuffer. If this argument points to the same address as the new mapping, + * it will be returned and no new buffer will be created. In that case, size is + * ignored. * @return A ByteBuffer representing the mapped object buffer memory. */ public static java.nio.ByteBuffer glMapObjectBufferATI(int buffer, int result_size, java.nio.ByteBuffer old_buffer) { Index: NVFragmentProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVFragmentProgram.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVFragmentProgram.java 2 Nov 2005 09:28:10 -0000 1.2 +++ NVFragmentProgram.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -7,7 +7,19 @@ import java.nio.*; public final class NVFragmentProgram extends NVProgram { + /** + * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the + * <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, + * and by the <target> parameter of BindProgramNV, LoadProgramNV, + * ProgramLocalParameter4dARB, ProgramLocalParameter4dvARB, + * ProgramLocalParameter4fARB, ProgramLocalParameter4fvARB, + * GetProgramLocalParameterdvARB, and GetProgramLocalParameterfvARB: + */ public static final int GL_FRAGMENT_PROGRAM_NV = 0x8870; + /** + * Accepted by the <pname> 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; Index: NVTextureExpandNormal.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVTextureExpandNormal.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVTextureExpandNormal.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVTextureExpandNormal.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,11 @@ import java.nio.*; public final class NVTextureExpandNormal { + /** + * Accepted by the <pname> parameters of TexParameteri, + * TexParameteriv, TexParameterf, TexParameterfv, GetTexParameteri, + * and GetTexParameteriv: + */ public static final int GL_TEXTURE_UNSIGNED_REMAP_MODE_NV = 0x888f; private NVTextureExpandNormal() { Index: NVPixelDataRange.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVPixelDataRange.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NVPixelDataRange.java 2 Nov 2005 09:28:10 -0000 1.2 +++ NVPixelDataRange.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -7,10 +7,22 @@ import java.nio.*; public final class NVPixelDataRange { + /** + * Accepted by the <target> parameter of PixelDataRangeNV and + * FlushPixelDataRangeNV, and by the <cap> 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; + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <pname> 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; Index: NVFragmentProgram2.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVFragmentProgram2.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVFragmentProgram2.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVFragmentProgram2.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,9 @@ import java.nio.*; public final class NVFragmentProgram2 { + /** + * Accepted by the <pname> 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; Index: IBMRasterposClip.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/IBMRasterposClip.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- IBMRasterposClip.java 29 Sep 2005 17:13:36 -0000 1.1 +++ IBMRasterposClip.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -8,7 +8,7 @@ public final class IBMRasterposClip { /** - * Accepted by the <target> parameter of Enable and Disable and the <value> + * Accepted by the <target> parameter of Enable and Disable and the <value> * parameter of IsEnabled, GetBooleanv, GetIntegerv, GetFloatv, GetDoublev: */ public static final int GL_RASTER_POSITION_UNCLIPPED_IBM = 0x19262; Index: ARBVertexProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBVertexProgram.java 2 Nov 2005 09:28:09 -0000 1.2 +++ ARBVertexProgram.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -7,21 +7,47 @@ import java.nio.*; public final class ARBVertexProgram extends ARBProgram { + /** + * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the + * <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev, + * and by the <target> parameter of ProgramStringARB, BindProgramARB, + * ProgramEnvParameter4[df][v]ARB, ProgramLocalParameter4[df][v]ARB, + * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB, + * GetProgramivARB, and GetProgramStringARB. + */ public static final int GL_VERTEX_PROGRAM_ARB = 0x8620; + /** + * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and by + * the <pname> 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; + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <pname> parameter of GetVertexAttribPointervARB: + */ public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869; private ARBVertexProgram() { Index: EXTDepthBoundsTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTDepthBoundsTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTDepthBoundsTest.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTDepthBoundsTest.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,7 +7,16 @@ import java.nio.*; public final class EXTDepthBoundsTest { + /** + * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, + * and by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_DEPTH_BOUNDS_EXT = 0x8891; private EXTDepthBoundsTest() { Index: EXTTextureMirrorClamp.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTTextureMirrorClamp.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTTextureMirrorClamp.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTTextureMirrorClamp.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,12 @@ import java.nio.*; public final class EXTTextureMirrorClamp { + /** + * Accepted by the <param> parameter of TexParameteri and TexParameterf, + * and by the <params> parameter of TexParameteriv and TexParameterfv, + * when their <pname> 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; Index: ARBPixelBufferObject.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBPixelBufferObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBPixelBufferObject.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBPixelBufferObject.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,8 +7,17 @@ import java.nio.*; public final class ARBPixelBufferObject extends ARBBufferObject { + /** + * Accepted by the <target> parameters of BindBuffer, BufferData, + * 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; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ed; public static final int GL_PIXEL_UNPACK_BUFFER_BINDING_ARB = 0x88ef; Index: ARBShaderObjects.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBShaderObjects.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBShaderObjects.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBShaderObjects.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,7 +7,13 @@ import java.nio.*; public final class ARBShaderObjects { + /** + * Accepted by the <pname> argument of GetHandleARB: + */ public static final int GL_PROGRAM_OBJECT_ARB = 0x8b40; + /** + * Accepted by the <pname> 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; @@ -19,7 +25,13 @@ 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; + /** + * Returned by the <params> parameter of GetObjectParameter{fi}vARB: + */ public static final int GL_SHADER_OBJECT_ARB = 0x8b48; + /** + * Returned by the <type> 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; @@ -82,8 +94,6 @@ * The ARB_shader_objects extension allows multiple, optionally null-terminated, source strings to define a shader program. * <p/> * This method uses just a single string, that should NOT be null-terminated. - * @param shaderObj - * @param string */ public static void glShaderSourceARB(int shader, ByteBuffer string) { long function_pointer = GLContext.getCapabilities().ARB_shader_objects_glShaderSourceARB_pointer; @@ -320,7 +330,6 @@ * Returns the location of the uniform with the specified name. The ByteBuffer should contain the uniform name as a <b>null-terminated</b> string. * @param programObj * @param name - * @return */ public static int glGetUniformLocationARB(int programObj, ByteBuffer name) { long function_pointer = GLContext.getCapabilities().ARB_shader_objects_glGetUniformLocationARB_pointer; Index: EXTTextureSRGB.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTTextureSRGB.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTTextureSRGB.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTTextureSRGB.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,10 @@ import java.nio.*; public final class EXTTextureSRGB { + /** + * Accepted by the <internalformat> parameter of TexImage1D, TexImage2D, + * TexImage3D, CopyTexImage1D, CopyTexImage2D. + */ public static final int GL_SRGB_EXT = 0x8c40; public static final int GL_SRGB8_EXT = 0x8c41; public static final int GL_SRGB_ALPHA_EXT = 0x8c42; @@ -19,6 +23,11 @@ public static final int GL_COMPRESSED_SRGB_ALPHA_EXT = 0x8c49; public static final int GL_COMPRESSED_SLUMINANCE_EXT = 0x8c4a; public static final int GL_COMPRESSED_SLUMINANCE_ALPHA_EXT = 0x8c4b; + /** + * Accepted by the <internalformat> parameter of TexImage2D, + * CopyTexImage2D, and CompressedTexImage2DARB and the <format> parameter + * of CompressedTexSubImage2DARB. + */ public static final int GL_COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8c4c; public static final int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8c4d; public static final int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8c4e; Index: NVProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVProgram.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVProgram.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVProgram.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,11 +7,24 @@ import java.nio.*; public class NVProgram { + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <pname> parameter of GetProgramStringNV: + */ public static final int GL_PROGRAM_STRING_NV = 0x8628; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_PROGRAM_ERROR_POSITION_NV = 0x864b; + /** + * Accepted by the <name> parameter of GetString: + */ public static final int GL_PROGRAM_ERROR_STRING_NV = 0x8874; Index: NVFloatBuffer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVFloatBuffer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVFloatBuffer.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVFloatBuffer.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,10 @@ import java.nio.*; public final class NVFloatBuffer { + /** + * Accepted by the <internalformat> 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; @@ -19,7 +23,15 @@ 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; + /** + * Accepted by the <pname> parameter of GetTexLevelParameterfv and + * GetTexLevelParameteriv: + */ public static final int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888c; + /** + * Accepted by the <pname> 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; Index: NVPrimitiveRestart.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVPrimitiveRestart.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVPrimitiveRestart.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVPrimitiveRestart.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,7 +7,17 @@ import java.nio.*; public final class NVPrimitiveRestart { + /** + * Accepted by the <array> parameter of EnableClientState and + * DisableClientState, by the <cap> parameter of IsEnabled, and by + * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and + * GetDoublev: + */ public static final int GL_PRIMITIVE_RESTART_NV = 0x8558; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559; private NVPrimitiveRestart() { Index: ARBColorBufferFloat.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBColorBufferFloat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBColorBufferFloat.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBColorBufferFloat.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,16 +7,30 @@ import java.nio.*; public final class ARBColorBufferFloat { + /** + * Accepted by the <pname> parameters of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_RGBA_FLOAT_MODE_ARB = 0x8820; + /** + * Accepted by the <target> parameter of ClampColorARB and the <pname> + * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev. + */ public static final int GL_CLAMP_VERTEX_COLOR_ARB = 0x891a; public static final int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891b; public static final int GL_CLAMP_READ_COLOR_ARB = 0x891c; + /** + * Accepted by the <clamp> parameter of ClampColorARB. + */ public static final int GL_FIXED_ONLY_ARB = 0x891d; private ARBColorBufferFloat() { } + /** + * Accepted as a bit set in the GLX_RENDER_TYPE variable + */ public static void glClampColorARB(int target, int clamp) { long function_pointer = GLContext.getCapabilities().ARB_color_buffer_float_glClampColorARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); Index: ATIFragmentShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ATIFragmentShader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ATIFragmentShader.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ATIFragmentShader.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -101,9 +101,9 @@ public static final int GL_RED_BIT_ATI = 0x1; public static final int GL_GREEN_BIT_ATI = 0x2; public static final int GL_BLUE_BIT_ATI = 0x4; - public static final int GL_X2_BIT_ATI = 0x1; - public static final int GL_X4_BIT_ATI = 0x2; - public static final int GL_X8_BIT_ATI = 0x4; + public static final int GL_2X_BIT_ATI = 0x1; + public static final int GL_4X_BIT_ATI = 0x2; + public static final int GL_8X_BIT_ATI = 0x4; public static final int GL_HALF_BIT_ATI = 0x8; public static final int GL_QUARTER_BIT_ATI = 0x10; public static final int GL_EIGHTH_BIT_ATI = 0x20; Index: ARBDepthTexture.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBDepthTexture.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBDepthTexture.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBDepthTexture.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,10 +7,22 @@ import java.nio.*; public final class ARBDepthTexture { + /** + * Accepted by the <internalFormat> 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; + /** + * Accepted by the <pname> parameter of GetTexLevelParameterfv and + * GetTexLevelParameteriv: + */ public static final int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884a; + /** + * Accepted by the <pname> parameter of TexParameterf, TexParameteri, + * TexParameterfv, TexParameteriv, GetTexParameterfv, and GetTexParameteriv: + */ public static final int GL_DEPTH_TEXTURE_MODE_ARB = 0x884b; private ARBDepthTexture() { Index: ARBFragmentShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBFragmentShader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBFragmentShader.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBFragmentShader.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,10 +7,22 @@ import java.nio.*; public final class ARBFragmentShader { + /** + * Accepted by the <shaderType> argument of CreateShaderObjectARB and + * returned by the <params> parameter of GetObjectParameter{fi}vARB: + */ public static final int GL_FRAGMENT_SHADER_ARB = 0x8b30; + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <target> parameter of Hint and the <pname> parameter of + * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: + */ public static final int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8b8b; private ARBFragmentShader() { Index: ARBTextureFloat.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureFloat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBTextureFloat.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBTextureFloat.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,9 @@ import java.nio.*; public final class ARBTextureFloat { + /** + * Accepted by the <value> parameter of GetTexLevelParameter: + */ public static final int GL_TEXTURE_RED_TYPE_ARB = 0x8c10; public static final int GL_TEXTURE_GREEN_TYPE_ARB = 0x8c11; public static final int GL_TEXTURE_BLUE_TYPE_ARB = 0x8c12; @@ -14,7 +17,14 @@ public static final int GL_TEXTURE_LUMINANCE_TYPE_ARB = 0x8c14; public static final int GL_TEXTURE_INTENSITY_TYPE_ARB = 0x8c15; public static final int GL_TEXTURE_DEPTH_TYPE_ARB = 0x8c16; + /** + * Returned by the <params> parameter of GetTexLevelParameter: + */ public static final int GL_UNSIGNED_NORMALIZED_ARB = 0x8c17; + /** + * Accepted by the <internalFormat> parameter of TexImage1D, + * TexImage2D, and TexImage3D: + */ public static final int GL_RGBA32F_ARB = 0x8814; public static final int GL_RGB32F_ARB = 0x8815; public static final int GL_ALPHA32F_ARB = 0x8816; Index: EXTPackedDepthStencil.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTPackedDepthStencil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTPackedDepthStencil.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTPackedDepthStencil.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,9 +7,32 @@ import java.nio.*; public final class EXTPackedDepthStencil { + /** + * Accepted by the <format> parameter of DrawPixels, ReadPixels, + * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, + * TexSubImage3D, and GetTexImage, by the <type> parameter of + * CopyPixels, by the <internalformat> parameter of TexImage1D, + * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and + * RenderbufferStorageEXT, and returned in the <data> parameter of + * GetTexLevelParameter and GetRenderbufferParameterivEXT. + */ public static final int GL_DEPTH_STENCIL_EXT = 0x84f9; + /** + * Accepted by the <type> parameter of DrawPixels, ReadPixels, + * TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, + * TexSubImage3D, and GetTexImage. + */ public static final int GL_UNSIGNED_INT_24_8_EXT = 0x84fa; + /** + * Accepted by the <internalformat> parameter of TexImage1D, + * TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and + * RenderbufferStorageEXT, and returned in the <data> parameter of + * GetTexLevelParameter and GetRenderbufferParameterivEXT. + */ public static final int GL_DEPTH24_STENCIL8_EXT = 0x88f0; + /** + * Accepted by the <value> parameter of GetTexLevelParameter. + */ public static final int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88f1; private EXTPackedDepthStencil() { Index: ARBPointSprite.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBPointSprite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBPointSprite.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBPointSprite.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,7 +7,18 @@ import java.nio.*; public final class ARBPointSprite { + /** + * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by + * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and + * GetDoublev, and by the <target> parameter of TexEnvi, TexEnviv, + * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv: + */ public static final int GL_POINT_SPRITE_ARB = 0x8861; + /** + * When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv, + * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE_ARB, then the value of + * <pname> may be: + */ public static final int GL_COORD_REPLACE_ARB = 0x8862; private ARBPointSprite() { Index: NVVertexProgram3.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram3.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVVertexProgram3.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVVertexProgram3.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,10 @@ import java.nio.*; public final class NVVertexProgram3 { + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ public static final int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8b4c; private NVVertexProgram3() { Index: ARBVertexShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBVertexShader.java 5 Nov 2005 18:57:25 -0000 1.2 +++ ARBVertexShader.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -7,7 +7,15 @@ import java.nio.*; public final class ARBVertexShader { + /** + * Accepted by the <shaderType> argument of CreateShaderObjectARB and + * returned by the <params> parameter of GetObjectParameter{if}vARB: + */ public static final int GL_VERTEX_SHADER_ARB = 0x8b31; + /** + * Accepted by the <pname> 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; @@ -15,17 +23,34 @@ 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; + /** + * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and + * by the <pname> 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; + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <pname> parameter of GetVertexAttribPointervARB: + */ public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645; + /** + * Returned by the <type> 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; Index: NVHalfFloat.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVHalfFloat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVHalfFloat.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVHalfFloat.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,13 @@ import java.nio.*; public final class NVHalfFloat { + /** + * Accepted by the <type> argument of VertexPointer, NormalPointer, + * ColorPointer, TexCoordPointer, FogCoordPointerEXT, + * SecondaryColorPointerEXT, VertexWeightPointerEXT, VertexAttribPointerNV, + * DrawPixels, ReadPixels, TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, + * TexSubImage2D, TexSubImage3D, and GetTexImage: + */ public static final int GL_HALF_FLOAT_NV = 0x140b; private NVHalfFloat() { Index: ARBProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBProgram.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBProgram.java 2 Nov 2005 09:28:09 -0000 1.2 +++ ARBProgram.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -7,7 +7,13 @@ import java.nio.*; public class ARBProgram { + /** + * Accepted by the <format> parameter of ProgramStringARB: + */ public static final int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875; + /** + * Accepted by the <pname> 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; @@ -30,14 +36,27 @@ 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; + /** + * Accepted by the <pname> parameter of GetProgramStringARB: + */ public static final int GL_PROGRAM_STRING_ARB = 0x8628; + /** + * Accepted by the <pname> 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; + /** + * Accepted by the <name> parameter of GetString: + */ public static final int GL_PROGRAM_ERROR_STRING_ARB = 0x8874; + /** + * Accepted by the <mode> 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; Index: ARBTextureRectangle.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureRectangle.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBTextureRectangle.java 13 Dec 2005 20:10:56 -0000 1.2 +++ ARBTextureRectangle.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -7,12 +7,42 @@ import java.nio.*; public final class ARBTextureRectangle { + /** + * Accepted by the <cap> parameter of Enable, Disable and IsEnabled; + * by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv + * and GetDoublev; and by the <target> parameter of BindTexture, + * GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri, + * TexParameterfv and TexParameteriv: + * Accepted by the <target> parameter of GetTexImage, + * GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D, + * CopyTexImage2D, TexSubImage2D and CopySubTexImage2D: + */ public static final int GL_TEXTURE_RECTANGLE_ARB = 0x84f5; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv and GetDoublev: + */ public static final int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84f6; + /** + * Accepted by the <target> parameter of GetTexLevelParameteriv, + * GetTexLevelParameterfv, GetTexParameteriv and TexImage2D: + */ public static final int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84f7; + /** + * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, + * GetIntegerv and GetFloatv: + */ public static final int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84f8; - public static final int GL_SAMPLER_2D_RECT_ARB = 0x8B63; - public static final int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64; + /** + * Returned by <type> parameter of GetActiveUniform when the location + * <index> for program object <program> is of type sampler2DRect: + */ + public static final int GL_SAMPLER_2D_RECT_ARB = 0x8b63; + /** + * Returned by <type> parameter of GetActiveUniform when the location + * <index> for program object <program> is of type sampler2DRectShadow: + */ + public static final int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8b64; private ARBTextureRectangle() { } Index: NVMultisampleFilterHint.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/NVMultisampleFilterHint.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NVMultisampleFilterHint.java 29 Sep 2005 17:13:36 -0000 1.1 +++ NVMultisampleFilterHint.java 24 Dec 2005 19:28:13 -0000 1.2 @@ -7,6 +7,10 @@ import java.nio.*; public final class NVMultisampleFilterHint { + /** + * Accepted by the <target> parameter of Hint and by the <pname> + * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: + */ public static final int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534; private NVMultisampleFilterHint() { Index: EXTPalettedTexture.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTPalettedTexture.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTPalettedTexture.java 2 Nov 2005 09:28:10 -0000 1.2 +++ EXTPalettedTexture.java 24 Dec 2005 19:28:13 -0000 1.3 @@ -7,12 +7,20 @@ import java.nio.*; public final class EXTPalettedTexture { + /** + * 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; + /** + * 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; @@ -21,6 +29,9 @@ 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_INTEN... [truncated message content] |
Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17233 Modified Files: ARB_buffer_object.java ARB_color_buffer_float.java ARB_depth_texture.java ARB_draw_buffers.java ARB_fragment_program.java ARB_fragment_program_shadow.java ARB_fragment_shader.java ARB_half_float_pixel.java ARB_imaging.java ARB_matrix_palette.java ARB_multisample.java ARB_multitexture.java ARB_occlusion_query.java ARB_pixel_buffer_object.java ARB_point_parameters.java ARB_point_sprite.java ARB_program.java ARB_shader_objects.java ARB_shading_language_100.java ARB_texture_compression.java ARB_texture_float.java ARB_texture_rectangle.java ARB_transpose_matrix.java ARB_vertex_blend.java ARB_vertex_buffer_object.java ARB_vertex_program.java ARB_vertex_shader.java ARB_window_pos.java ATI_draw_buffers.java ATI_element_array.java ATI_envmap_bumpmap.java ATI_fragment_shader.java ATI_map_object_buffer.java ATI_texture_compression_3dc.java ATI_texture_float.java ATI_vertex_array_object.java ATI_vertex_attrib_array_object.java ATI_vertex_streams.java EXT_bgra.java EXT_blend_equation_separate.java EXT_blend_subtract.java EXT_cg_shader.java EXT_depth_bounds_test.java EXT_draw_range_elements.java EXT_fog_coord.java EXT_framebuffer_object.java EXT_multi_draw_arrays.java EXT_packed_depth_stencil.java EXT_paletted_texture.java EXT_pixel_buffer_object.java EXT_point_parameters.java EXT_secondary_color.java EXT_stencil_clear_tag.java EXT_texture_compression_s3tc.java EXT_texture_env_combine.java EXT_texture_lod_bias.java EXT_texture_mirror_clamp.java EXT_texture_sRGB.java EXT_vertex_shader.java EXT_vertex_weighting.java GL11.java GL12.java GL13.java GL14.java GL15.java GL20.java HP_occlusion_test.java IBM_rasterpos_clip.java NV_evaluators.java NV_fence.java NV_float_buffer.java NV_fragment_program.java NV_fragment_program2.java NV_half_float.java NV_multisample_filter_hint.java NV_occlusion_query.java NV_pixel_data_range.java NV_point_sprite.java NV_primitive_restart.java NV_program.java NV_register_combiners.java NV_register_combiners2.java NV_texture_compression_vtc.java NV_texture_expand_normal.java NV_vertex_array_range.java NV_vertex_program.java NV_vertex_program2_option.java NV_vertex_program3.java SUN_slice_accum.java Log Message: Converted comments to javadoc, code cleanup Index: EXT_depth_bounds_test.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EXT_depth_bounds_test.java 20 Feb 2005 20:53:49 -0000 1.3 +++ EXT_depth_bounds_test.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -34,17 +34,18 @@ import org.lwjgl.util.generator.*; public interface EXT_depth_bounds_test { - /* - Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, - and by the <pname> parameter of GetBooleanv, GetIntegerv, - GetFloatv, and GetDoublev: - */ + + /** + Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, + and by the <pname> parameter of GetBooleanv, GetIntegerv, + GetFloatv, and GetDoublev: + */ int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890; - /* - Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, - GetFloatv, and GetDoublev: - */ + /** + Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + GetFloatv, and GetDoublev: + */ int GL_DEPTH_BOUNDS_EXT = 0x8891; void glDepthBoundsEXT(@GLclampd double zmin, @GLclampd double zmax); Index: ATI_element_array.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ATI_element_array.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ATI_element_array.java 21 Mar 2005 08:27:45 -0000 1.4 +++ ATI_element_array.java 24 Dec 2005 19:26:37 -0000 1.5 @@ -31,24 +31,23 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface ATI_element_array { int GL_ELEMENT_ARRAY_ATI = 0x8768; int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769; int GL_ELEMENT_ARRAY_POINTER_ATI = 0x876A; void glElementPointerATI(@AutoType("pPointer") @GLenum int type, - @CachedReference - @BufferObject(BufferKind.ArrayVBO) - @Check - @Const - @GLubyte - @GLushort - @GLuint - Buffer pPointer); + @CachedReference + @BufferObject(BufferKind.ArrayVBO) + @Check + @Const + @GLubyte + @GLushort + @GLuint Buffer pPointer); void glDrawElementArrayATI(@GLenum int mode, @GLsizei int count); Index: EXT_secondary_color.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_secondary_color.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- EXT_secondary_color.java 2 Nov 2005 09:28:12 -0000 1.6 +++ EXT_secondary_color.java 24 Dec 2005 19:26:37 -0000 1.7 @@ -31,10 +31,10 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface EXT_secondary_color { int GL_COLOR_SUM_EXT = 0x8458; int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459; @@ -47,19 +47,18 @@ void glSecondaryColor3bEXT(byte red, byte green, byte blue); void glSecondaryColor3fEXT(float red, float green, float blue); - + void glSecondaryColor3dEXT(double red, double green, double blue); void glSecondaryColor3ubEXT(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); void glSecondaryColorPointerEXT(int size, @AutoType("pPointer") @GLenum int type, @GLsizei int stride, - @CachedReference - @BufferObject(BufferKind.ArrayVBO) - @Check - @Const - @GLbyte - @GLubyte - @GLfloat - @GLdouble - Buffer pPointer); + @CachedReference + @BufferObject(BufferKind.ArrayVBO) + @Check + @Const + @GLbyte + @GLubyte + @GLfloat + @GLdouble Buffer pPointer); } Index: EXT_multi_draw_arrays.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EXT_multi_draw_arrays.java 20 Feb 2005 20:53:49 -0000 1.3 +++ EXT_multi_draw_arrays.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -31,13 +31,13 @@ */ package org.lwjgl.opengl; -import java.nio.IntBuffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface EXT_multi_draw_arrays { - @Code( " if (piFirst.remaining() != piCount.remaining()) {\n" + - " throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" + - " }") + @Code(" if (piFirst.remaining() != piCount.remaining()) {\n" + + " throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" + + " }") void glMultiDrawArraysEXT(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") int primcount); } Index: ARB_shading_language_100.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_shading_language_100.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARB_shading_language_100.java 15 Feb 2005 17:05:56 -0000 1.2 +++ ARB_shading_language_100.java 24 Dec 2005 19:26:37 -0000 1.3 @@ -32,8 +32,9 @@ package org.lwjgl.opengl; public interface ARB_shading_language_100 { + /** - * Accepted by the <name> parameter of GetString: - */ + * Accepted by the <name> parameter of GetString: + */ int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C; } Index: GL13.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL13.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GL13.java 2 Nov 2005 09:28:12 -0000 1.4 +++ GL13.java 24 Dec 2005 19:26:37 -0000 1.5 @@ -31,12 +31,10 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; -import java.nio.FloatBuffer; -import java.nio.DoubleBuffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + /** * $Id$ * <p/> @@ -151,106 +149,100 @@ void glActiveTexture(@GLenum int texture); 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 - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); 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 - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); 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 - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glCompressedTexSubImage1D(@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 - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); 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 - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble 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 - @GLdouble - Buffer data); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); // TODO: check buffer size valid void glGetCompressedTexImage(@GLenum int target, int lod, - @BufferObject(BufferKind.PackPBO) - @Check - @GLbyte - @GLshort - @GLint - Buffer img); + @BufferObject(BufferKind.PackPBO) + @Check + @GLbyte + @GLshort + @GLint Buffer img); void glMultiTexCoord1f(@GLenum int target, float s); void glMultiTexCoord1d(@GLenum int target, double s); void glMultiTexCoord2f(@GLenum int target, float s, float t); - + void glMultiTexCoord2d(@GLenum int target, double s, double t); void glMultiTexCoord3f(@GLenum int target, float s, float t, float r); - + void glMultiTexCoord3d(@GLenum int target, double s, double t, double r); void glMultiTexCoord4f(@GLenum int target, float s, float t, float r, float q); - + void glMultiTexCoord4d(@GLenum int target, double s, double t, double r, double q); @StripPostfix("m") void glLoadTransposeMatrixf(@Check("16") @Const FloatBuffer m); - + @StripPostfix("m") void glLoadTransposeMatrixd(@Check("16") @Const DoubleBuffer m); @StripPostfix("m") void glMultTransposeMatrixf(@Check("16") @Const FloatBuffer m); - + @StripPostfix("m") void glMultTransposeMatrixd(@Check("16") @Const DoubleBuffer m); Index: ARB_texture_rectangle.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rectangle.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARB_texture_rectangle.java 13 Dec 2005 20:10:56 -0000 1.3 +++ ARB_texture_rectangle.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -33,46 +33,46 @@ public interface ARB_texture_rectangle { - /* - Accepted by the <cap> parameter of Enable, Disable and IsEnabled; - by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv - and GetDoublev; and by the <target> parameter of BindTexture, - GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri, - TexParameterfv and TexParameteriv: - Accepted by the <target> parameter of GetTexImage, - GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D, - CopyTexImage2D, TexSubImage2D and CopySubTexImage2D: - */ + /** + Accepted by the <cap> parameter of Enable, Disable and IsEnabled; + by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv + and GetDoublev; and by the <target> parameter of BindTexture, + GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri, + TexParameterfv and TexParameteriv: + Accepted by the <target> parameter of GetTexImage, + GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D, + CopyTexImage2D, TexSubImage2D and CopySubTexImage2D: + */ int GL_TEXTURE_RECTANGLE_ARB = 0x84F5; - /* - Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, - GetFloatv and GetDoublev: - */ + /** + Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + GetFloatv and GetDoublev: + */ int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6; - /* - Accepted by the <target> parameter of GetTexLevelParameteriv, - GetTexLevelParameterfv, GetTexParameteriv and TexImage2D: - */ + /** + Accepted by the <target> parameter of GetTexLevelParameteriv, + GetTexLevelParameterfv, GetTexParameteriv and TexImage2D: + */ int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7; - /* - Accepted by the <pname> parameter of GetBooleanv, GetDoublev, - GetIntegerv and GetFloatv: - */ + /** + Accepted by the <pname> parameter of GetBooleanv, GetDoublev, + GetIntegerv and GetFloatv: + */ int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8; - /* - Returned by <type> parameter of GetActiveUniform when the location - <index> for program object <program> is of type sampler2DRect: - */ + /** + Returned by <type> parameter of GetActiveUniform when the location + <index> for program object <program> is of type sampler2DRect: + */ int GL_SAMPLER_2D_RECT_ARB = 0x8B63; - /* - Returned by <type> parameter of GetActiveUniform when the location - <index> for program object <program> is of type sampler2DRectShadow: - */ + /** + Returned by <type> parameter of GetActiveUniform when the location + <index> for program object <program> is of type sampler2DRectShadow: + */ int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64; } Index: ARB_buffer_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ARB_buffer_object.java 2 Nov 2005 09:28:12 -0000 1.6 +++ ARB_buffer_object.java 24 Dec 2005 19:26:36 -0000 1.7 @@ -35,10 +35,11 @@ import java.nio.*; -@Extension(postfix="ARB", isFinal=false) +@Extension(postfix = "ARB", isFinal = false) public interface ARB_buffer_object { - /* - * Accepted by the <usage> parameter of BufferDataARB: + + /** + * Accepted by the <usage> parameter of BufferDataARB: */ int GL_STREAM_DRAW_ARB = 0x88E0; int GL_STREAM_READ_ARB = 0x88E1; @@ -50,57 +51,57 @@ int GL_DYNAMIC_READ_ARB = 0x88E9; int GL_DYNAMIC_COPY_ARB = 0x88EA; - /* - * Accepted by the <access> parameter of MapBufferARB: - */ + /** + * Accepted by the <access> parameter of MapBufferARB: + */ int GL_READ_ONLY_ARB = 0x88B8; int GL_WRITE_ONLY_ARB = 0x88B9; int GL_READ_WRITE_ARB = 0x88BA; - /* - * Accepted by the <pname> parameter of GetBufferParameterivARB: - */ + /** + * Accepted by the <pname> parameter of GetBufferParameterivARB: + */ 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( " StateTracker.bindBuffer(target, buffer);") + @Code(" StateTracker.bindBuffer(target, buffer);") void glBindBufferARB(@GLenum int target, @GLuint int buffer); - @Code( " StateTracker.deleteBuffers(buffers);") + + @Code(" StateTracker.deleteBuffers(buffers);") 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 void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB int size, - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data, @GLenum int usage); + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data, @GLenum int usage); void glBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, - @Check - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @Check + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); /** * glMapBufferARB maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, @@ -116,7 +117,8 @@ * @return A ByteBuffer representing the mapped buffer memory. */ @CachedResult - @GLvoid ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access); + @GLvoid + ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access); boolean glUnmapBufferARB(@GLenum int target); Index: ARB_texture_compression.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ARB_texture_compression.java 2 Nov 2005 09:28:12 -0000 1.4 +++ ARB_texture_compression.java 24 Dec 2005 19:26:37 -0000 1.5 @@ -31,10 +31,10 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface ARB_texture_compression { int GL_COMPRESSED_ALPHA_ARB = 0x84E9; int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA; @@ -49,78 +49,71 @@ int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3; 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 - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble 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 - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble 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 - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble 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 - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pData); 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 - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble 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 - @GLdouble - Buffer pData); + @BufferObject(BufferKind.UnpackPBO) + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pData); void glGetCompressedTexImageARB(@GLenum int target, int lod, - @BufferObject(BufferKind.PackPBO) - @Check - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer pImg); + @BufferObject(BufferKind.PackPBO) + @Check + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer pImg); } Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL15.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- GL15.java 2 Nov 2005 09:28:12 -0000 1.5 +++ GL15.java 24 Dec 2005 19:26:37 -0000 1.6 @@ -72,41 +72,41 @@ int GL_BUFFER_MAPPED = 0x88BC; int GL_BUFFER_MAP_POINTER = 0x88BD; - @Code( " StateTracker.bindBuffer(target, buffer);") + @Code(" StateTracker.bindBuffer(target, buffer);") void glBindBuffer(@GLenum int target, @GLuint int buffer); - @Code( " StateTracker.deleteBuffers(buffers);") + + @Code(" StateTracker.deleteBuffers(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); @GenerateAutos void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr int size, - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data, @GLenum int usage); + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data, @GLenum int usage); + void glBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, - @Check - @Const - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @Check + @Const + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); void glGetBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, - @Check - @GLbyte - @GLshort - @GLint - @GLfloat - @GLdouble - Buffer data); + @Check + @GLbyte + @GLshort + @GLint + @GLfloat + @GLdouble Buffer data); /** * glMapBuffer maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, in which case a new @@ -124,7 +124,8 @@ * @return A ByteBuffer representing the mapped buffer memory. */ @CachedResult - @GLvoid ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access); + @GLvoid + ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access); boolean glUnmapBuffer(@GLenum int target); @@ -138,30 +139,33 @@ // ---------------------- ARB_occlusion_query ---------------------- // ----------------------------------------------------------------- - /* - * Accepted by the <target> parameter of BeginQuery, EndQuery, - * and GetQueryiv: - */ + /** + * Accepted by the <target> parameter of BeginQuery, EndQuery, + * and GetQueryiv: + */ int GL_SAMPLES_PASSED = 0x8914; - /* - Accepted by the <pname> parameter of GetQueryiv: - */ + /** + Accepted by the <pname> parameter of GetQueryiv: + */ int GL_QUERY_COUNTER_BITS = 0x8864; int GL_CURRENT_QUERY = 0x8865; - /* - Accepted by the <pname> parameter of GetQueryObjectiv and - GetQueryObjectuiv: - */ + /** + Accepted by the <pname> parameter of GetQueryObjectiv and + GetQueryObjectuiv: + */ int GL_QUERY_RESULT = 0x8866; int GL_QUERY_RESULT_AVAILABLE = 0x8867; 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); void glBeginQuery(@GLenum int target, @GLuint int id); + void glEndQuery(@GLenum int target); @StripPostfix("params") Index: EXT_framebuffer_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- EXT_framebuffer_object.java 13 Dec 2005 20:12:39 -0000 1.6 +++ EXT_framebuffer_object.java 24 Dec 2005 19:26:37 -0000 1.7 @@ -33,7 +33,7 @@ import org.lwjgl.util.generator.*; -import java.nio.IntBuffer; +import java.nio.*; public interface EXT_framebuffer_object { @@ -61,8 +61,8 @@ int GL_STENCIL_INDEX16_EXT = 0x8D49; /** - * Accepted by the <pname> parameter of GetRenderbufferParameterivEXT: - */ + * Accepted by the <pname> parameter of GetRenderbufferParameterivEXT: + */ int GL_RENDERBUFFER_WIDTH_EXT = 0x8D42; int GL_RENDERBUFFER_HEIGHT_EXT = 0x8D43; int GL_RENDERBUFFER_INTERNAL_FORMAT_EXT = 0x8D44; @@ -137,6 +137,7 @@ void glBindRenderbufferEXT(@GLenum int target, @GLuint int renderbuffer); void glDeleteRenderbuffersEXT(@AutoSize("renderbuffers") int n, @Const @GLuint IntBuffer renderbuffers); + void glGenRenderbuffersEXT(@AutoSize("renderbuffers") int n, @GLuint IntBuffer renderbuffers); void glRenderbufferStorageEXT(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height); @@ -149,9 +150,11 @@ void glBindFramebufferEXT(@GLenum int target, @GLuint int framebuffer); void glDeleteFramebuffersEXT(@AutoSize("framebuffers") int n, @Const @GLuint IntBuffer framebuffers); + void glGenFramebuffersEXT(@AutoSize("framebuffers") int n, @Const @GLuint IntBuffer framebuffers); - @GLenum int glCheckFramebufferStatusEXT(@GLenum int target); + @GLenum + int glCheckFramebufferStatusEXT(@GLenum int target); void glFramebufferTexture1DEXT(@GLenum int target, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level); Index: ARB_half_float_pixel.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_pixel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARB_half_float_pixel.java 9 Jun 2005 18:08:05 -0000 1.3 +++ ARB_half_float_pixel.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -32,13 +32,14 @@ package org.lwjgl.opengl; public interface ARB_half_float_pixel { - /* - * Accepted by the <type> parameter of DrawPixels, ReadPixels, - * TexImage1D, TexImage2D, TexImage3D, GetTexImage, TexSubImage1D, - * TexSubImage2D, TexSubImage3D, GetHistogram, GetMinmax, - * ConvolutionFilter1D, ConvolutionFilter2D, GetConvolutionFilter, - * SeparableFilter2D, GetSeparableFilter, ColorTable, ColorSubTable, - * and GetColorTable: - */ + + /** + * Accepted by the <type> parameter of DrawPixels, ReadPixels, + * TexImage1D, TexImage2D, TexImage3D, GetTexImage, TexSubImage1D, + * TexSubImage2D, TexSubImage3D, GetHistogram, GetMinmax, + * ConvolutionFilter1D, ConvolutionFilter2D, GetConvolutionFilter, + * SeparableFilter2D, GetSeparableFilter, ColorTable, ColorSubTable, + * and GetColorTable: + */ int GL_HALF_FLOAT_ARB = 0x140B; } Index: EXT_pixel_buffer_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_pixel_buffer_object.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXT_pixel_buffer_object.java 15 Feb 2005 17:06:00 -0000 1.2 +++ EXT_pixel_buffer_object.java 24 Dec 2005 19:26:37 -0000 1.3 @@ -32,18 +32,19 @@ package org.lwjgl.opengl; public interface EXT_pixel_buffer_object extends ARB_buffer_object { - /* - * Accepted by the <target> parameters of BindBuffer, BufferData, - * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, - * GetBufferParameteriv, and GetBufferPointerv: - */ + + /** + * Accepted by the <target> parameters of BindBuffer, BufferData, + * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData, + * GetBufferParameteriv, and GetBufferPointerv: + */ int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB; int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC; - /* - * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: - */ + */ int PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED; int PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88EF; } Index: GL14.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL14.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- GL14.java 2 Nov 2005 09:28:12 -0000 1.6 +++ GL14.java 24 Dec 2005 19:26:37 -0000 1.7 @@ -31,12 +31,10 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + /** * $Id$ * <p/> @@ -91,53 +89,63 @@ void glBlendColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha); void glFogCoordf(float coord); - + void glFogCoordd(double coord); void glFogCoordPointer(@AutoType("data") @GLenum int type, @GLsizei int stride, - @CachedReference - @BufferObject(BufferKind.ArrayVBO) - @Check - @Const - @GLfloat - @GLdouble - Buffer data); + @CachedReference + @BufferObject(BufferKind.ArrayVBO) + @Check + @Const + @GLfloat + @GLdouble Buffer data); - @Code( " if (piFirst.remaining() != piCount.remaining()) {\n" + - " throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" + - " }") + @Code(" if (piFirst.remaining() != piCount.remaining()) {\n" + + " throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" + + " }") void glMultiDrawArrays(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") @GLsizei int primcount); //void glMultiDrawElements(int mode, int piCount, int type, int pIndices, int primcount); void glPointParameteri(@GLenum int pname, int param); + void glPointParameterf(@GLenum int pname, float param); + @StripPostfix("params") void glPointParameteriv(@GLenum int pname, @Check("4") @Const IntBuffer params); + @StripPostfix("params") void glPointParameterfv(@GLenum int pname, @Check("4") @Const FloatBuffer params); void glSecondaryColor3b(byte red, byte green, byte blue); + void glSecondaryColor3f(float red, float green, float blue); + void glSecondaryColor3d(double red, double green, double blue); + void glSecondaryColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue); void glSecondaryColorPointer(int size, @AutoType("data") @GLenum int type, @GLsizei int stride, - @BufferObject(BufferKind.ArrayVBO) - @Check - @Const - @GLbyte - @GLubyte - @GLfloat - @GLdouble - Buffer data); + @BufferObject(BufferKind.ArrayVBO) + @Check + @Const + @GLbyte + @GLubyte + @GLfloat + @GLdouble Buffer data); void glBlendFuncSeparate(@GLenum int sfactorRGB, @GLenum int dfactorRGB, @GLenum int sfactorAlpha, @GLenum int dfactorAlpha); + void glWindowPos2f(float x, float y); + void glWindowPos2d(double x, double y); + void glWindowPos2i(int x, int y); + void glWindowPos3f(float x, float y, float z); + void glWindowPos3d(double x, double y, double z); + void glWindowPos3i(int x, int y, int z); } Index: ARB_fragment_shader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_fragment_shader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARB_fragment_shader.java 15 Feb 2005 17:05:55 -0000 1.2 +++ ARB_fragment_shader.java 24 Dec 2005 19:26:37 -0000 1.3 @@ -32,23 +32,24 @@ package org.lwjgl.opengl; public interface ARB_fragment_shader { - /* - * Accepted by the <shaderType> argument of CreateShaderObjectARB and - * returned by the <params> parameter of GetObjectParameter{fi}vARB: - */ + + /** + * Accepted by the <shaderType> argument of CreateShaderObjectARB and + * returned by the <params> parameter of GetObjectParameter{fi}vARB: + */ int GL_FRAGMENT_SHADER_ARB = 0x8B30; - /* - * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, * GetFloatv, and GetDoublev: - */ + */ 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 <target> parameter of Hint and the <pname> parameter of + /** + * Accepted by the <target> parameter of Hint and the <pname> parameter of * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev: - */ + */ int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8B8B; } Index: ATI_draw_buffers.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ATI_draw_buffers.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ATI_draw_buffers.java 20 Feb 2005 20:53:49 -0000 1.3 +++ ATI_draw_buffers.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -31,15 +31,16 @@ */ package org.lwjgl.opengl; -import java.nio.IntBuffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface ATI_draw_buffers { - /* - * Accepted by the <pname> parameters of GetIntegerv, GetFloatv, + + /** + * Accepted by the <pname> parameters of GetIntegerv, GetFloatv, * and GetDoublev: - */ + */ int GL_MAX_DRAW_BUFFERS_ATI = 0x8824; int GL_DRAW_BUFFER0_ATI = 0x8825; int GL_DRAW_BUFFER1_ATI = 0x8826; Index: EXT_point_parameters.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/EXT_point_parameters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EXT_point_parameters.java 20 Feb 2005 20:53:49 -0000 1.3 +++ EXT_point_parameters.java 24 Dec 2005 19:26:37 -0000 1.4 @@ -31,10 +31,10 @@ */ package org.lwjgl.opengl; -import java.nio.FloatBuffer; - import org.lwjgl.util.generator.*; +import java.nio.*; + public interface EXT_point_parameters { int GL_POINT_SIZE_MIN_EXT = 0x8126; int GL_POINT_SIZE_MAX_EXT = 0x8127; Index: ARB_color_buffer_float.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ARB_color_buffer_float.java 20 Feb 2005 20:53:49 -0000 1.4 +++ ARB_color_buffer_float.java 24 Dec 2005 19:26:37 -0000 1.5 @@ -34,40 +34,40 @@ import org.lwjgl.util.generator.*; public interface ARB_color_buffer_float { - /* - * Accepted by the <pname> parameters of GetBooleanv, GetIntegerv, - * GetFloatv, and GetDoublev: - */ + /** + * Accepted by the <pname> parameters of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ int GL_RGBA_FLOAT_MODE_ARB = 0x8820; - /* - * Accepted by the <target> parameter of ClampColorARB and the <pname> - * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev. + /** + * Accepted by the <target> parameter of ClampColorARB and the <pname> + * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev. */ int GL_CLAMP_VERTEX_COLOR_ARB = 0x891A; int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B; int GL_CLAMP_READ_COLOR_ARB = 0x891C; - /* - * Accepted by the <clamp> parameter of ClampColorARB. + /** + * Accepted by the <clamp> parameter of ClampColorARB. */ int GL_FIXED_ONLY_ARB = 0x891D; - /* - * Accepted as a value in the <piAttribIList> and <pfAttribFList> + /** + * Accepted as a value in the <piAttribIList> and <pfAttribFList> * parameter arrays of wglChoosePixelFormatARB, and returned in the - * <piValues> parameter array of wglGetPixelFormatAttribivARB, and the - * <pfValues> parameter array of wglGetPixelFormatAttribfvARB: + * <piValues> parameter array of wglGetPixelFormatAttribivARB, and the + * <pfValues> parameter array of wglGetPixelFormatAttribfvARB: */ //int WGL_TYPE_RGBA_FLOAT_ARB = 0x21A0; - /* - * Accepted as values of the <render_type> arguments in the + /** + * Accepted as values of the <render_type> arguments in the * glXCreateNewContext and glXCreateContext functions */ //int GLX_RGBA_FLOAT_TYPE = 0x20B9; - /* + /** * Accepted as a bit set in the GLX_RENDER_TYPE variable */ //int GLX_RGBA_FLOAT_BIT = 0x00000004; Index: ARB_point_sprite.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_point_sprite.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARB_point_sprite.java 15 Feb 2005 17:05:55 -0000 1.2 +++ ARB_point_sprite.java 24 Dec 2005 19:26:37 -0000 1.3 @@ -32,18 +32,19 @@ package org.lwjgl.opengl; public interface ARB_point_sprite { - /* - * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by - * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and - * GetDoublev, and by the <target> parameter of TexEnvi, TexEnviv, + + /** + * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by + * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and + * GetDoublev, and by the <target> parameter of TexEnvi, TexEnviv, * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv: - */ + */ int GL_POINT_SPRITE_ARB = 0x8861; - /* - * When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv, - * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE_ARB, then the value of - * <pname> may be: - */ + /** + * When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv, + * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE_ARB, then the value of + * <pname> may be: + */ int GL_COORD_REPLACE_ARB = 0x8862; } Index: ARB_program.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_program.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ARB_program.java 2 Nov 2005 09:28:12 -0000 1.4 +++ ARB_program.java 24 Dec 2005 19:26:37 -0000 1.5 @@ -31,23 +31,21 @@ */ package org.lwjgl.opengl; -import java.nio.Buffer; -import java.nio.FloatBuffer; -import java.nio.DoubleBuffer; -import java.nio.IntBuffer; - import org.lwjgl.util.generator.*; -@Extension(postfix="ARB", isFinal=false) +import java.nio.*; + +@Extension(postfix = "ARB", isFinal = false) public interface ARB_program { - /* - * Accepted by the <format> parameter of ProgramStringARB: - */ + + /** + * Accepted by the <format> parameter of ProgramStringARB: + */ int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875; - /* - * Accepted by the <pname> parameter of GetProgramivARB: - */ + /** + * Accepted by the <pname> parameter of GetProgramivARB: + */ int GL_PROGRAM_LENGTH_ARB = 0x8627; int GL_PROGRAM_FORMAT_ARB = 0x8876; int GL_PROGRAM_BINDING_ARB = 0x8677; @@ -71,15 +69,15 @@ int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5; int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6; - /* - * Accepted by the <pname> parameter of GetProgramStringARB: - */ + /** + * Accepted by the <pname> parameter of GetProgramStringARB: + */ int GL_PROGRAM_STRING_ARB = 0x8628; - /* - * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, - * GetFloatv, and GetDoublev: - */ + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B; int GL_CURRENT_MATRIX_ARB = 0x8641; int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88B7; @@ -87,14 +85,14 @@ int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F; int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E; - /* - * Accepted by the <name> parameter of GetString: - */ + /** + * Accepted by the <name> parameter of GetString: + */ int GL_PROGRAM_ERROR_STRING_ARB = 0x8874; - /* - * Accepted by the <mode> parameter of MatrixMode: - */ + /** + * Accepted by the <mode> parameter of MatrixMode: + */ int GL_MATRIX0_ARB = 0x88C0; int GL_MATRIX1_ARB = 0x88C1; int GL_MATRIX2_ARB = 0x88C2; @@ -133,6 +131,7 @@ void glBindProgramARB(@GLenum int target, @GLuint int program); void glDeleteProgramsARB(@AutoSize("programs") @GLsizei int n, @Const @GLuint IntBuffer programs); + void glGenProgramsARB(@AutoSize("programs") @GLsizei int n, @GLuint IntBuffer programs); void glProgramEnvParameter4fARB(int target, int index, float x, float y, float z, float w); @@ -141,7 +140,7 @@ @StripPostfix("params") void glProgramEnvParameter4fvARB(@GLenum int target, @GLuint int index, @Check("4") @Const FloatBuffer params); - + @StripPostfix("params") void glProgramEnvParameter4dvARB(@GLenum int target, @GLuint int index, @Check("4") @Const DoubleBuffer params); @@ -151,19 +150,19 @@ @StripPostfix("params") void glProgramLocalParameter4fvARB(@GLenum int target, @GLuint int index, @Check("4") @Const FloatBuffer params); - + @StripPostfix("params") void glProgramLocalParameter4dvARB(@GLenum int target, @GLuint int index, @Check("4") @Const DoubleBuffer params); @StripPostfix("params") void glGetProgramEnvParameterfvARB(@GLenum int target, @GLuint int index, @Check("4") FloatBuffer params); - + @StripPostfix("params") void glGetProgramEnvParameterdvARB(@GLenum int target, @GLuint int index, @Check("4") DoubleBuffer params); @StripPostfix("params") void glGetProgramLocalParameterfvARB(@GLenum int target, @GLuint int index, @Check("4") FloatBuffer params); - + @StripPostfix("params") void glGetProgramLocalParameterdvARB(@GLenum int target, @GLuint int index, @Check("4") DoubleBuffer params); Index: GL20.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL20.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- GL20.java 2 Nov 2005 09:28:12 -0000 1.6 +++ GL20.java 24 Dec 2005 19:26:37 -0000 1.7 @@ -40,23 +40,23 @@ // ----------------------[ ARB_shading_language_100 ]---------------------- // ------------------------------------------------------------------ - /* - * Accepted by the <name> parameter of GetString: - */ + /** + * Accepted by the <name> parameter of GetString: + */ int GL_SHADING_LANGUAGE_VERSION = 0x8B8C; // ------------------------------------------------------------------ // ----------------------[ ARB_shader_objects ]---------------------- // ------------------------------------------------------------------ - /* - * Accepted by the <pname> argument of GetInteger: - */ + /** + * Accepted by the <pname> argument of GetInteger: + */ int GL_CURRENT_PROGRAM = 0x8B8D; - /* - * Accepted by the <pname> parameter of GetObjectParameter{fi}vARB: - */ + /** + * Accepted by the <pname> parameter of GetObjectParameter{fi}vARB: + */ int GL_SHADER_TYPE = 0x8B4F; int GL_DELETE_STATUS = 0x8B80; int GL_COMPILE_STATUS = 0x8B81; @@ -70,14 +70,14 @@ int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A; int GL_SHADER_SOURCE_LENGTH = 0x8B88; - /* - * Returned by the <params> parameter of GetObjectParameter{fi}vARB: - */ + /** + * Returned by the <params> parameter of GetObjectParameter{fi}vARB: + */ int GL_SHADER_OBJECT = 0x8B48; - /* - * Returned by the <type> parameter of GetActiveUniformARB: - */ + /** + * Returned by the <type> parameter of GetActiveUniformARB: + */ int GL_FLOAT_VEC2 = 0x8B50; int GL_FLOAT_VEC3 = 0x8B51; int GL_FLOAT_VEC4 = 0x8B52; @@ -107,16 +107,14 @@ * @param string */ void glShaderSource(@GLuint int shader, @Constant("1") @GLsizei int count, - @Indirect - @Check - @Const - @GLchar - ByteBuffer string, - @AutoSize("string") - @Indirect - @Const - @GLint - int length); + @Indirect + @Check + @Const + @GLchar ByteBuffer string, + @AutoSize("string") + @Indirect + @Const + @GLint int length); int glCreateShader(@GLuint int type); @@ -160,31 +158,39 @@ @StripPostfix("values") void glUniform1fv(int location, @AutoSize("values") @GLsizei int count, FloatBuffer values); + @StripPostfix("values") - void glUniform2fv(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, FloatBuffer values); + void glUniform2fv(int location, @AutoSize(value = "values", expression = " >> 1") @GLsizei int count, FloatBuffer values); + @StripPostfix("values") - void glUniform3fv(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, FloatBuffer values); + void glUniform3fv(int location, @AutoSize(value = "values", expression = " / 3") @GLsizei int count, FloatBuffer values); + @StripPostfix("values") - void glUniform4fv(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, FloatBuffer 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); + 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); + 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); + void glUniform4iv(int location, @AutoSize(value = "values", expression = " >> 2") @GLsizei int count, IntBuffer values); @StripPostfix("matrices") - void glUniformMatrix2fv(int location, @AutoSize(value="matrices", expression=" >> 2") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + void glUniformMatrix2fv(int location, @AutoSize(value = "matrices", expression = " >> 2") @GLsizei int count, + boolean transpose, FloatBuffer matrices); + @StripPostfix("matrices") - void glUniformMatrix3fv(int location, @AutoSize(value="matrices", expression=" / (3 * 3)") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + void glUniformMatrix3fv(int location, @AutoSize(value = "matrices", expression = " / (3 * 3)") @GLsizei int count, + boolean transpose, FloatBuffer matrices); + @StripPostfix("matrices") - void glUniformMatrix4fv(int location, @AutoSize(value="matrices", expression=" >> 4") @GLsizei int count, - boolean transpose, FloatBuffer matrices); + void glUniformMatrix4fv(int location, @AutoSize(value = "matrices", expression = " >> 4") @GLsizei int count, + boolean transpose, FloatBuffer matrices); @StripPostfix("params") void glGetShaderiv(@GLuint int shader, @GLenum int pname, @Check IntBuffer params); @@ -193,25 +199,19 @@ 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); + @GLsizei + @Check(value = "1", canBeNull = true) IntBuffer length, + @GLchar ByteBuffer infoLog); void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int maxLength, - @GLsizei - @Check(value="1", canBeNull=true) - IntBuffer length, - @GLchar - ByteBuffer infoLog); + @GLsizei + @Check(value = "1", canBeNull = true) IntBuffer length, + @GLchar ByteBuffer infoLog); void glGetAttachedShaders(@GLuint int program, @AutoSize("shaders") @GLsizei int maxCount, - @GLsizei - @Check(value="1", canBeNull=true) - IntBuffer count, - @GLuint - IntBuffer shaders); + @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 @@ -225,29 +225,24 @@ int glGetUniformLocation(@GLuint int program, @NullTerminated @Check("1") @Const @GLchar ByteBuffer name); void glGetActiveUniform(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int maxLength, - @Check(value="1", canBeNull=true) - @GLsizei - IntBuffer length, - @Check - @GLsizei - IntBuffer size, - @Check - @GLenum - IntBuffer type, - @GLchar - ByteBuffer name); + @Check(value = "1", canBeNull = true) + @GLsizei IntBuffer length, + @Check + @GLsizei IntBuffer size, + @Check + @GLenum IntBuffer type, + @GLchar ByteBuffer name); @StripPostfix("params") void glGetUniformfv(@GLuint int program, int location, @Check FloatBuffer params); + @StripPostfix("params") 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, - @GLchar - ByteBuffer source); + @Check(value = "1", canBeNull = true) + @GLsizei IntBuffer length, + @GLchar ByteBuffer source); // ------------------------------------------------------------------ // ----------------------[ ARB_vertex_program ]---------------------- @@ -256,7 +251,7 @@ void glVertexAttrib1s(@GLuint int index, short x); void glVertexAttrib1f(@GLuint int index, float x); - + void glVertexAttrib1d(@GLuint int index, double x); void glVertexAttrib2s(@GLuint int index, short x, short y); @@ -274,33 +269,35 @@ void glVertexAttrib4s(@GLuint int index, short x, short y, short z, short w); void glVertexAttrib4f(@GLuint int index, float x, float y, float z, float w); - + void glVertexAttrib4d(@GLuint int index, double x, double y, double z, double w); void glVertexAttrib4Nub(@GLuint int index, @GLubyte byte x, @GLubyte byte y, @GLubyte byte z, @GLubyte byte w); void glVertexAttribPointer(@GLuint int index, int size, @AutoType("buffer") @GLenum int type, boolean normalized, @GLsizei int stride, - @CachedReference - @BufferObject(BufferKind.ArrayVBO) - @Check - @Const - @GLubyte - @GLbyte - @GLshort - @GLushort - @GLint - @GLuint - @GLfloat - @GLdouble - Buffer buffer); + @CachedReference + @BufferObject(BufferKind.ArrayVBO) + @Check + @Const + @GLubyte + @GLbyte + @GLshort + @GLushort + @GLint + @GLuint + @GLfloat + @GLdouble Buffer buffer); void glEnableVertexAttribArray(@GLuint int index); + void glDisableVertexAttribArray(@GLuint int index); @StripPostfix("params") void glGetVertexAttribfv(@GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params); + @StripPostfix("params") void glGetVertexAttribdv(@GLuint int index, @GLenum int pname, @Check("4") DoubleBuffer params); + @StripPostfix("params") void glGetVertexAttribiv(@GLuint int index, @GLenum int pname, @Check("4") IntBuffer params); @@ -311,16 +308,16 @@ // ----------------------[ ARB_vertex_shader ]---------------------- // ----------------------------------------------------------------- - /* - * Accepted by the <shaderType> argument of CreateShader and - * returned by the <params> parameter of GetShader{if}v: - */ + /** + * Accepted by the <shaderType> argument of CreateShader and + * returned by the <params> parameter of GetShader{if}v: + */ int GL_VERTEX_SHADER = 0x8B31; - /* - * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, - * GetFloatv, and GetDoublev: - */ + /** + * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, + * GetFloatv, and GetDoublev: + */ int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A; int GL_MAX_VARYING_FLOATS = 0x8B4B; int GL_MAX_VERTEX_ATTRIBS = 0x8869; @@ -329,17 +326,17 @@ int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D; int GL_MAX_TEXTURE_COORDS = 0x8871; - /* - * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and - * by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and - * GetDoublev: - */ + /** + * Accepted by the <cap> parameter of Disable, Ena... [truncated message content] |
|
From: Brian M. <ma...@us...> - 2005-12-20 22:37:27
|
Update of /cvsroot/java-game-lib/LWJGL/www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22005 Modified Files: donations.php Log Message: updated to latest donors Index: donations.php =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/www/donations.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- donations.php 10 Nov 2005 21:57:11 -0000 1.2 +++ donations.php 20 Dec 2005 22:37:19 -0000 1.3 @@ -13,7 +13,7 @@ </p> <ul> <? - $donations[] = array("Brian Matzon", "mailto:br...@ma..."); + $donations[] = array("Brian Matzon", "http://echelog.matzon.dk/"); $donations[] = array("Anthony Rogers [tomato.co.uk]", "http://www.tomato.co.uk/"); $donations[] = array("Anthony Lovell", ""); $donations[] = array("Shane Essary", ""); @@ -31,7 +31,11 @@ $donations[] = array("Benoit Hambucken", ""); $donations[] = array("John Watson", ""); $donations[] = array("Elias Naur [oddlabs.com]", "http://oddlabs.com"); - $donations[] = array("Andrew Kelly", "http://games.swizel-studios.com/"); + $donations[] = array("Andrew Kelly [games.swizel-studios.com]", "http://games.swizel-studios.com/"); + $donations[] = array("Gregory Pierce", ""); + $donations[] = array("Shannon Smith", ""); + $donations[] = array("Franz Bartlechner", ""); + shuffle($donations); |