java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input
In directory sc8-pr-cvs1:/tmp/cvs-serv16619/java/org/lwjgl/test/input

Modified Files:
	ControllerCreationTest.java ControllerTest.java 
	HWCursorTest.java KeyboardTest.java MouseCreationTest.java 
	MouseTest.java 
Log Message:
fix: static method usage

Index: ControllerCreationTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/ControllerCreationTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/ControllerCreationTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ControllerCreationTest.java	18 Jul 2003 19:02:48 -0000	1.8
+++ ControllerCreationTest.java	2 Aug 2003 20:52:48 -0000	1.9
@@ -34,6 +34,7 @@
 import org.lwjgl.Sys;
 import org.lwjgl.Display;
 import org.lwjgl.DisplayMode;
+import org.lwjgl.Window;
 import org.lwjgl.input.Controller;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GLWindow;
@@ -165,7 +166,7 @@
 
     while (Sys.getTime() < endtime) {
 
-      gl.tick();
+      Window.tick();
       
       Controller.poll();
 
@@ -183,7 +184,7 @@
 
       render();
 
-      gl.paint();
+      Window.paint();
 
       if (Sys.getTime() - statustime > Sys.getTimerResolution()) {
         System.out.print(".");

Index: ControllerTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/ControllerTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/ControllerTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ControllerTest.java	18 Jul 2003 19:02:48 -0000	1.6
+++ ControllerTest.java	2 Aug 2003 20:52:48 -0000	1.7
@@ -32,6 +32,7 @@
 package org.lwjgl.test.input;
 
 import org.lwjgl.DisplayMode;
+import org.lwjgl.Window;
 import org.lwjgl.input.Controller;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL;
@@ -116,10 +117,10 @@
   }
 
   private void wiggleController() {
-    while (!gl.isCloseRequested()) {
-      gl.tick();
+    while (!Window.isCloseRequested()) {
+      Window.tick();
       
-      if(gl.isMinimized()) {
+      if(Window.isMinimized()) {
         try {
           Thread.sleep(100);
         } catch (InterruptedException inte) {
@@ -166,7 +167,7 @@
 
       render();
 
-      gl.paint();
+      Window.paint();
     }
   }
   

Index: HWCursorTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- HWCursorTest.java	28 Jul 2003 10:09:56 -0000	1.8
+++ HWCursorTest.java	2 Aug 2003 20:52:48 -0000	1.9
@@ -151,24 +151,24 @@
    */
   private void mainLoop() {
     while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
-      && !gl.isCloseRequested()) {
+      && !Window.isCloseRequested()) {
       // allow subsystem to get a chance to run too
-      gl.tick();
+      Window.tick();
 
-      if (!gl.isMinimized()) {
+      if (!Window.isMinimized()) {
         // check keyboard input
         processKeyboard();
 
         render();
 
         // paint window
-        gl.paint();
+        Window.paint();
       } else {
 
         // no need to render/paint if nothing has changed (ie. window dragged over)
-        if (gl.isDirty()) {
+        if (Window.isDirty()) {
           render();
-          gl.paint();
+          Window.paint();
         }
 
         // don't waste cpu time, sleep more

Index: KeyboardTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- KeyboardTest.java	18 Jul 2003 19:02:48 -0000	1.3
+++ KeyboardTest.java	2 Aug 2003 20:52:48 -0000	1.4
@@ -32,6 +32,7 @@
 package org.lwjgl.test.input;
 
 import org.lwjgl.DisplayMode;
+import org.lwjgl.Window;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GLWindow;
@@ -122,10 +123,10 @@
     Keyboard.enableBuffer();
     Keyboard.enableTranslation();
 
-    while (!gl.isCloseRequested()) {
-      gl.tick();
+    while (!Window.isCloseRequested()) {
+      Window.tick();
       
-      if(gl.isMinimized()) {
+      if(Window.isMinimized()) {
         try {
           Thread.sleep(100);
         } catch (InterruptedException inte) {
@@ -185,7 +186,7 @@
 
       render();
 
-      gl.paint();
+      Window.paint();
       
       try {
         Thread.sleep(0);

Index: MouseCreationTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/MouseCreationTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- MouseCreationTest.java	18 Jul 2003 19:02:48 -0000	1.11
+++ MouseCreationTest.java	2 Aug 2003 20:52:48 -0000	1.12
@@ -34,6 +34,7 @@
 import org.lwjgl.Sys;
 import org.lwjgl.Display;
 import org.lwjgl.DisplayMode;
+import org.lwjgl.Window;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GLWindow;
@@ -167,7 +168,7 @@
 		long endtime = Sys.getTime() + Sys.getTimerResolution() * 5;
 
 		while (Sys.getTime() < endtime) {
-      gl.tick();
+      Window.tick();
 
 			Mouse.poll();
 
@@ -188,7 +189,7 @@
 
 			render();
 
-			gl.paint();
+			Window.paint();
 
 			if (Sys.getTime() - statustime > Sys.getTimerResolution()) {
 				System.out.print(".");

Index: MouseTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- MouseTest.java	18 Jul 2003 19:02:48 -0000	1.13
+++ MouseTest.java	2 Aug 2003 20:52:48 -0000	1.14
@@ -32,6 +32,7 @@
 package org.lwjgl.test.input;
 
 import org.lwjgl.DisplayMode;
+import org.lwjgl.Window;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL;
@@ -117,10 +118,10 @@
   }
 
   private void wiggleMouse() {
-    while (!gl.isCloseRequested()) {
-      gl.tick();
+    while (!Window.isCloseRequested()) {
+      Window.tick();
       
-      if(gl.isMinimized()) {
+      if(Window.isMinimized()) {
         try {
 					Thread.sleep(100);
 				} catch (InterruptedException inte) {
@@ -154,7 +155,7 @@
 
       render();
 
-      gl.paint();
+      Window.paint();
     }
   }
   

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv16619/java/org/lwjgl/test/opengl

Modified Files:
	FullScreenWindowedTest.java Game.java Grass.java 
	PbufferTest.java VBOTest.java 
Log Message:
fix: static method usage

Index: FullScreenWindowedTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FullScreenWindowedTest.java	2 Aug 2003 13:22:24 -0000	1.10
+++ FullScreenWindowedTest.java	2 Aug 2003 20:52:48 -0000	1.11
@@ -115,11 +115,11 @@
    */
   private void mainLoop() {
     while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
-      && !gl.isCloseRequested()) {
+      && !Window.isCloseRequested()) {
       // allow subsystem to get a chance to run too
-      gl.tick();
+      Window.tick();
 
-      if (!gl.isMinimized()) {
+      if (!Window.isMinimized()) {
         // check keyboard input
         processKeyboard();
 
@@ -128,13 +128,13 @@
         render();
 
         // paint window
-        gl.paint();
+        Window.paint();
       } else {
 
         // no need to render/paint if nothing has changed (ie. window dragged over)
-        if (gl.isDirty()) {
+        if (Window.isDirty()) {
           render();
-          gl.paint();
+          Window.paint();
         }
 
         // don't waste cpu time, sleep more

Index: Game.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Game.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Game.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Game.java	2 Aug 2003 13:22:25 -0000	1.16
+++ Game.java	2 Aug 2003 20:52:48 -0000	1.17
@@ -99,17 +99,17 @@
          try {
              init();
              while (!finished) {
-             	 gl.tick();
+             	 Window.tick();
              	 
-             	 if (gl.isMinimized())
+             	 if (Window.isMinimized())
              	 	Thread.sleep(200);
-             	 else if (gl.isCloseRequested())
+             	 else if (Window.isCloseRequested())
              	 	System.exit(0);
              	 
                  Keyboard.poll();
                  mainLoop();
                  render();
-                 gl.paint();
+                 Window.paint();
              }   
          } catch (Throwable t) {
              t.printStackTrace();

Index: Grass.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Grass.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Grass.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Grass.java	2 Aug 2003 15:21:55 -0000	1.17
+++ Grass.java	2 Aug 2003 20:52:48 -0000	1.18
@@ -201,7 +201,7 @@
 
 			grsDraw();
 
-			gl.paint();
+			Window.paint();
 		}
 		Mouse.destroy();
 		Keyboard.destroy();

Index: PbufferTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PbufferTest.java	2 Aug 2003 15:21:55 -0000	1.8
+++ PbufferTest.java	2 Aug 2003 20:52:48 -0000	1.9
@@ -124,11 +124,11 @@
    */
   private void mainLoop() {
     while (!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)
-      && !gl.isCloseRequested()) {
+      && !Window.isCloseRequested()) {
       // allow subsystem to get a chance to run too
-      gl.tick();
+      Window.tick();
 
-      if (!gl.isMinimized()) {
+      if (!Window.isMinimized()) {
         // check keyboard input
         processKeyboard();
 
@@ -137,13 +137,13 @@
         render();
 
         // paint window
-        gl.paint();
+        Window.paint();
       } else {
 
         // no need to render/paint if nothing has changed (ie. window dragged over)
-        if (gl.isDirty()) {
+        if (Window.isDirty()) {
           render();
-          gl.paint();
+          Window.paint();
         }
 
         // don't waste cpu time, sleep more

Index: VBOTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VBOTest.java	2 Aug 2003 15:21:55 -0000	1.4
+++ VBOTest.java	2 Aug 2003 20:52:49 -0000	1.5
@@ -97,17 +97,17 @@
          try {
              init();
              while (!finished) {
-             	 gl.tick();
+             	 Window.tick();
              	 
-             	 if (gl.isMinimized())
+             	 if (Window.isMinimized())
              	 	Thread.sleep(200);
-             	 else if (gl.isCloseRequested())
+             	 else if (Window.isCloseRequested())
              	 	System.exit(0);
              	 
                  Keyboard.poll();
                  mainLoop();
                  render();
-                 gl.paint();
+                 Window.paint();
              }   
          } catch (Throwable t) {
              t.printStackTrace();

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal
In directory sc8-pr-cvs1:/tmp/cvs-serv16619/java/org/lwjgl/test/openal

Modified Files:
	MovingSoundTest.java 
Log Message:
fix: static method usage

Index: MovingSoundTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/MovingSoundTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/MovingSoundTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- MovingSoundTest.java	26 Jul 2003 02:01:54 -0000	1.14
+++ MovingSoundTest.java	2 Aug 2003 20:52:48 -0000	1.15
@@ -31,6 +31,7 @@
  */
 package org.lwjgl.test.openal;
 
+import org.lwjgl.Window;
 import org.lwjgl.openal.AL;
 import org.lwjgl.openal.eax.*;
 import org.lwjgl.input.Keyboard;
@@ -155,7 +156,7 @@
     System.out.println("Move source with arrow keys\nMove listener with right shift and arrowkeys\nEnable EAX effect by pressing e (if available)\nExit with ESC");
 
 		while(!Keyboard.isKeyDown(Keyboard.KEY_ESCAPE)) {
-      gl.tick();
+      Window.tick();
       
       Keyboard.poll();
       if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
@@ -192,7 +193,7 @@
           eaxApplied = !eaxApplied;
       }
       
-      if(gl.isCloseRequested()) {
+      if(Window.isCloseRequested()) {
         break;
       }
      

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test
In directory sc8-pr-cvs1:/tmp/cvs-serv16619/java/org/lwjgl/test

Modified Files:
	WindowCreationTest.java 
Log Message:
fix: static method usage

Index: WindowCreationTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/WindowCreationTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/WindowCreationTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- WindowCreationTest.java	26 Jul 2003 02:01:53 -0000	1.6
+++ WindowCreationTest.java	2 Aug 2003 20:52:48 -0000	1.7
@@ -29,8 +29,8 @@
     
     System.out.println("Display created");
 
-    while(!gl.isCloseRequested()) {    
-      gl.tick();
+    while(!Window.isCloseRequested()) {    
+      Window.tick();
       try {
         Thread.sleep(100);
       } catch (Exception e) {

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv16270/src/java/org/lwjgl/opengl

Modified Files:
	CoreGL11.java 
Log Message:
Now static

Index: CoreGL11.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CoreGL11.java	2 Aug 2003 16:18:04 -0000	1.11
+++ CoreGL11.java	2 Aug 2003 17:11:33 -0000	1.12
@@ -47,7 +47,7 @@
  * @author cix_foo <ci...@us...>
  * @version $Revision$
  */
-public class CoreGL11 implements CoreGL11Constants {
+public abstract class CoreGL11 implements CoreGL11Constants {
 	
 	public static native void glAccum(int op, float value);
 	public static native void glAlphaFunc(int func, float ref);

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv15868/src/java/org/lwjgl/opengl

Modified Files:
	CoreGL13.java CoreGL12.java GL.java GLU.java GLCaps.java 
	CoreGL14.java 
Log Message:
Classes now abstract

Index: CoreGL13.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL13.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL13.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CoreGL13.java	1 Aug 2003 17:05:36 -0000	1.5
+++ CoreGL13.java	2 Aug 2003 17:09:56 -0000	1.6
@@ -42,7 +42,7 @@
  * @author cix_foo <ci...@us...>
  * @version $Revision$
  */
-public class CoreGL13 extends CoreGL12 implements CoreGL13Constants {
+public abstract class CoreGL13 extends CoreGL12 implements CoreGL13Constants {
 	public static native void glActiveTexture(int texture);
 	public static native void glClientActiveTexture(int texture);
 	public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer data) {

Index: CoreGL12.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL12.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL12.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CoreGL12.java	2 Aug 2003 15:44:03 -0000	1.8
+++ CoreGL12.java	2 Aug 2003 17:09:56 -0000	1.9
@@ -45,7 +45,7 @@
  * @author cix_foo <ci...@us...>
  * @version $Revision$
  */
-public class CoreGL12 extends CoreGL11 implements CoreGL12Constants {
+public abstract class CoreGL12 extends CoreGL11 implements CoreGL12Constants {
 	
 	public static void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) {
 		nglColorTable(target, internalFormat, width, format, type, data, data.position());

Index: GL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- GL.java	2 Aug 2003 15:21:54 -0000	1.35
+++ GL.java	2 Aug 2003 17:09:56 -0000	1.36
@@ -46,7 +46,7 @@
  * @author cix_foo <ci...@us...>
  * @version $Revision$
  */
-public class GL extends CoreGL14 implements GLConstants {
+public abstract class GL extends CoreGL14 implements GLConstants {
 	public static native void glActiveStencilFaceEXT(int face);
 
 	public static native void glActiveTextureARB(int texture);

Index: GLU.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLU.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLU.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- GLU.java	2 Aug 2003 12:53:24 -0000	1.14
+++ GLU.java	2 Aug 2003 17:09:56 -0000	1.15
@@ -46,16 +46,10 @@
  * @author cix_foo <ci...@us...>
  * @version $Revision$
  */
-public class GLU implements GLUConstants {
+public abstract class GLU implements GLUConstants {
 
 	static {
 		System.loadLibrary(Sys.getLibraryName());
-	}
-
-	/**
-	 * Private constructor for GLU.
-	 */
-	private GLU() {
 	}
 
 	public static native String gluErrorString(int errCode);

Index: GLCaps.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLCaps.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLCaps.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GLCaps.java	2 Aug 2003 10:54:59 -0000	1.2
+++ GLCaps.java	2 Aug 2003 17:09:56 -0000	1.3
@@ -48,7 +48,7 @@
  * @author elias_naur <eli...@us...>
  * @version $Revision$
  */
-public class GLCaps {
+public abstract class GLCaps {
 	/*
 	 * Available extensions
 	 */
@@ -249,7 +249,7 @@
 		final String exts;
 
 		if (WGL_ARB_extensions_string)
-			exts = GL.wglGetExtensionsStringARB(Window.getCurrentWindow().getHandle());
+			exts = GL.wglGetExtensionsStringARB(Window.getHandle());
 		// Remember - this is an HWND not an HDC, which is what's required. The native
 		// code on the other side of wglGetExtensionsStringARB gets the HDC from the HWND
 		// behind the scenes.

Index: CoreGL14.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL14.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL14.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CoreGL14.java	2 Aug 2003 15:21:54 -0000	1.10
+++ CoreGL14.java	2 Aug 2003 17:09:56 -0000	1.11
@@ -45,7 +45,7 @@
  * @author cix_foo <ci...@us...>
  * @version $Revision$
  */
-public class CoreGL14 extends CoreGL13 implements CoreGL14Constants {
+public abstract class CoreGL14 extends CoreGL13 implements CoreGL14Constants {
 	public static native void glFogCoordf (float coord);
 	public static void glFogCoordPointer (int stride, FloatBuffer data) {
 		nglFogCoordPointer(GL_FLOAT, stride, data, data.position() << 2);

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv15825/src/java/org/lwjgl

Modified Files:
	Window.java 
Log Message:
Now static

Index: Window.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Window.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Window.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Window.java	28 Jul 2003 10:09:56 -0000	1.14
+++ Window.java	2 Aug 2003 17:09:40 -0000	1.15
@@ -12,7 +12,7 @@
  * 
  * - width and height are always fixed and cannot be changed
  * - the position of the window may or may not be programmable but once specified
- * cannot be changed
+ * cannot be changed programmatically
  * - the window may be closeable by the user or operating system, and may be minimized
  * by the user or operating system
  * - only one window may ever be open at once
@@ -30,40 +30,40 @@
 	private static Window currentWindow;
 	
 	/** Whether the window is currently created, ie. has a native peer */
-	private boolean created;
+	private static boolean created;
 
 	/** The window's native data structure. On Win32 this is an HWND. */
-	private int handle;
+	private static int handle;
 
 	/** Whether the window is currently minimized */
-	private boolean minimized;
+	private static boolean minimized;
   
 	/** Whether the window has focus */
-	private boolean focused = true;
+	private static boolean focused = true;
 	
 	/** Whether the window has been asked to close by the user or underlying OS */
-	private boolean closeRequested;
+	private static boolean closeRequested;
 	
 	/** Whether the window is dirty, ie. needs painting */
-	private boolean dirty;
+	private static boolean dirty;
 	
 	/** X coordinate of the window */
-	private int x;
+	private static int x;
 	
 	/**
 	 * Y coordinate of the window. Y in window coordinates is from the top of the display down,
 	 * unlike GL, where it is typically at the bottom of the display.
 	 */
-	private int y;
+	private static int y;
 	
 	/** Width of the window */
-	private int width;
+	private static int width;
 	
 	/** Height of the window */
-	private int height;
+	private static int height;
 	
 	/** Title of the window */
-	private String title;
+	private static String title;
 	
 	/**
 	 * Construct a Window. Some OSs may not support non-fullscreen windows; in
@@ -89,32 +89,32 @@
 	 * @throws RuntimeException if you attempt to create more than one window at the same time
 	 */
 	protected Window(String title, int x, int y, int width, int height) {
-		this.title = title;
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
+		Window.title = title;
+		Window.x = x;
+		Window.y = y;
+		Window.width = width;
+		Window.height = height;
 		
 	}
 
 	/**
 	 * @return the width of the window
 	 */
-	public final int getWidth() {
+	public static int getWidth() {
 		return width;
 	}
 	
 	/**
 	 * @return the height of the window
 	 */
-	public final int getHeight() {
+	public static int getHeight() {
 		return height;
 	}
 	
 	/**
 	 * @return the title of the window
 	 */
-	public final String getTitle() {
+	public static String getTitle() {
 		return title;
 	}
 	
@@ -122,7 +122,7 @@
 	 * Set the title of the window. This may be ignored by the underlying OS.
 	 * @param newTitle The new window title
 	 */
-	public final void setTitle(String newTitle) {
+	public static void setTitle(String newTitle) {
 		assert isCreated();
 		title = newTitle;
 		nSetTitle(title);
@@ -132,12 +132,12 @@
 	 * Native implementation of setTitle(). This will read the window's title member
 	 * and stash it in the native title of the window.
 	 */
-	private native void nSetTitle(String title);
+	private static native void nSetTitle(String title);
 
 	/**
 	 * @return true if the user or operating system has asked the window to close
 	 */
-	public final boolean isCloseRequested() {
+	public static boolean isCloseRequested() {
 		assert isCreated();
 
 		boolean currentValue = closeRequested;
@@ -148,7 +148,7 @@
 	/**
 	 * @return true if the window is minimized or otherwise not visible
 	 */
-	public final boolean isMinimized() {
+	public static boolean isMinimized() {
 		assert isCreated();
 		return minimized;
 	}
@@ -156,7 +156,7 @@
 	/**
 	 * @return true if window is focused
 	 */
-	public final boolean isFocused() {
+	public static boolean isFocused() {
 		assert isCreated();
 		return focused;
 	}
@@ -168,7 +168,7 @@
 	 * 
 	 * If the display is already minimized then this is a no-op.
 	 */
-	public final native void minimize();
+	public static native void minimize();
 	
 	/**
 	 * Restore the game and hide the operating system away. It is the responsibility of
@@ -176,7 +176,7 @@
 	 * 
 	 * If the display is not minimized then this is a no-op/
 	 */
-	public final native void restore();
+	public static native void restore();
 	
 	/**
 	 * Determine if the window's contents have been damaged by external events.
@@ -188,7 +188,7 @@
 	 * @return true if the window has been damaged by external changes
 	 * and needs to repaint itself
 	 */
-	public final boolean isDirty() {
+	public static boolean isDirty() {
 		assert isCreated();
 		return dirty;
 	}
@@ -196,10 +196,10 @@
 	/**
 	 * Paint the window. This clears the dirty flag and swaps the buffers.
 	 */
-	public final void paint() {
+	public static void paint() {
 		assert isCreated();
 		dirty = false;
-		doPaint();
+		currentWindow.doPaint();
 	}
 
 	protected abstract void doPaint();
@@ -213,7 +213,6 @@
 		doCreate();
 		currentWindow = this;
 		created = true;
-		
   	}
 	
 	/**
@@ -242,14 +241,14 @@
 	/**
 	 * @return the native window handle
 	 */
-	public final int getHandle() {
+	public static int getHandle() {
 		return handle;
 	}
 	
 	/**
 	 * @return true if the window's native peer has been created
 	 */
-	public final boolean isCreated() {
+	public static boolean isCreated() {
 		return created;
 	}
 	
@@ -257,7 +256,7 @@
 	 * 'Tick' the window. This must be called at least once per video frame
 	 * to handle window close requests, moves, paints, etc.
 	 */
-	public native void tick();
+	public static native void tick();
 
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal
In directory sc8-pr-cvs1:/tmp/cvs-serv15776/src/java/org/lwjgl/openal

Modified Files:
	CoreAL.java AL.java 
Log Message:
Classes now abstract

Index: CoreAL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/CoreAL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/CoreAL.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CoreAL.java	6 Jul 2003 19:59:57 -0000	1.16
+++ CoreAL.java	2 Aug 2003 17:09:26 -0000	1.17
@@ -46,7 +46,7 @@
  * @author Brian Matzon <br...@ma...>
  * @version $Revision$
  */
-public class CoreAL extends BaseAL implements BaseALConstants {
+public abstract class CoreAL extends BaseAL implements BaseALConstants {
 
 	/**
 	 * Enables a feature of the OpenAL driver.

Index: AL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- AL.java	2 Aug 2003 10:57:05 -0000	1.10
+++ AL.java	2 Aug 2003 17:09:26 -0000	1.11
@@ -39,7 +39,7 @@
  * @author Brian Matzon <br...@ma...>
  * @version $Revision$
  */
-public class AL extends CoreAL {
+public abstract class AL extends CoreAL {
 
 	/** ALC instance. */
 	protected static ALC alc;

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv8383/src/native/common

Modified Files:
	org_lwjgl_opengl_CoreGL11.cpp org_lwjgl_opengl_CoreGL11.h 
Log Message:
glTexGeni* fix

Index: org_lwjgl_opengl_CoreGL11.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_CoreGL11.cpp	2 Aug 2003 16:04:49 -0000	1.5
+++ org_lwjgl_opengl_CoreGL11.cpp	2 Aug 2003 16:18:04 -0000	1.6
@@ -1953,7 +1953,7 @@
  * Class:     org_lwjgl_opengl_CoreGL11
  * Method:    glTexGeni
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGenf(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGeni(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2)
 {
 	glTexGeni((GLint) p0, (GLint) p1, (GLint) p2);
 	CHECK_GL_ERROR
@@ -1962,9 +1962,9 @@
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
- * Method:    glTexGeniv
+ * Method:    nglTexGeniv
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGeniv(JNIEnv * env, jclass clazz, jint p0, jint p1, jobject buffer, jint offset)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGeniv(JNIEnv * env, jclass clazz, jint p0, jint p1, jobject buffer, jint offset)
 {
 	const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer);
 	glTexGeniv((GLint) p0, (GLint) p1, address);

Index: org_lwjgl_opengl_CoreGL11.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_CoreGL11.h	2 Aug 2003 16:07:49 -0000	1.6
+++ org_lwjgl_opengl_CoreGL11.h	2 Aug 2003 16:18:04 -0000	1.7
@@ -1473,10 +1473,10 @@
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
- * Method:    nglTexGenfi
+ * Method:    nglTexGeniv
  * Signature: (IILjava/nio/IntBuffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGenfi
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGeniv
   (JNIEnv *, jclass, jint, jint, jobject, jint);
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv8383/src/java/org/lwjgl/opengl

Modified Files:
	CoreGL11.java 
Log Message:
glTexGeni* fix

Index: CoreGL11.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CoreGL11.java	2 Aug 2003 15:58:05 -0000	1.10
+++ CoreGL11.java	2 Aug 2003 16:18:04 -0000	1.11
@@ -495,9 +495,9 @@
 	private static native void nglTexGenfv(int coord, int pname, FloatBuffer params, int params_offset);
 	public static native void glTexGeni(int coord, int pname, int param);
 	public static void glTexGen(int coord, int pname, IntBuffer params) {
-		nglTexGenfi(coord, pname, params, params.position());
+		nglTexGeniv(coord, pname, params, params.position());
 	}
-	private static native void nglTexGenfi(int coord, int pname, IntBuffer params, int params_offset);
+	private static native void nglTexGeniv(int coord, int pname, IntBuffer params, int params_offset);
 	public static native void glTexEnvf(int target, int pname, float param);
 	public static native void glTexEnvi(int target, int pname, int param);
 	public static void glTexEnv(int target, int pname, FloatBuffer params) {

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv7095/src/native/common

Modified Files:
	org_lwjgl_opengl_CoreGL11.h 
Log Message:


Index: org_lwjgl_opengl_CoreGL11.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_CoreGL11.h	2 Aug 2003 12:53:25 -0000	1.5
+++ org_lwjgl_opengl_CoreGL11.h	2 Aug 2003 16:07:49 -0000	1.6
@@ -1465,6 +1465,22 @@
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
+ * Method:    glTexGeni
+ * Signature: (III)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGeni
+  (JNIEnv *, jclass, jint, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_CoreGL11
+ * Method:    nglTexGenfi
+ * Signature: (IILjava/nio/IntBuffer;I)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGenfi
+  (JNIEnv *, jclass, jint, jint, jobject, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_CoreGL11
  * Method:    glTexEnvf
  * Signature: (IIF)V
  */

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv6870/src/native/common

Modified Files:
	org_lwjgl_opengl_GLU.cpp 
Log Message:


Index: org_lwjgl_opengl_GLU.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_opengl_GLU.cpp	2 Aug 2003 12:53:25 -0000	1.10
+++ org_lwjgl_opengl_GLU.cpp	2 Aug 2003 16:05:53 -0000	1.11
@@ -43,7 +43,6 @@
 #include "extgl.h"
 #include "checkGLerror.h"
 
-//#include "callbacks/GLUQuadricCallbacks.h"
 
 /*
  * Class:     org_lwjgl_opengl_GLU

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv6729/src/native/common

Modified Files:
	org_lwjgl_opengl_CoreGL11.cpp 
Log Message:


Index: org_lwjgl_opengl_CoreGL11.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_CoreGL11.cpp	2 Aug 2003 12:53:25 -0000	1.4
+++ org_lwjgl_opengl_CoreGL11.cpp	2 Aug 2003 16:04:49 -0000	1.5
@@ -1949,6 +1949,28 @@
 	CHECK_GL_ERROR
 }
 
+/*
+ * Class:     org_lwjgl_opengl_CoreGL11
+ * Method:    glTexGeni
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGenf(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2)
+{
+	glTexGeni((GLint) p0, (GLint) p1, (GLint) p2);
+	CHECK_GL_ERROR
+}
+
+
+/*
+ * Class:     org_lwjgl_opengl_CoreGL11
+ * Method:    glTexGeniv
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGeniv(JNIEnv * env, jclass clazz, jint p0, jint p1, jobject buffer, jint offset)
+{
+	const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer);
+	glTexGeniv((GLint) p0, (GLint) p1, address);
+	CHECK_GL_ERROR
+}
+
 
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv5571/src/java/org/lwjgl/opengl

Modified Files:
	CoreGL11.java 
Log Message:
Fixes

Index: CoreGL11.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CoreGL11.java	2 Aug 2003 15:21:54 -0000	1.9
+++ CoreGL11.java	2 Aug 2003 15:58:05 -0000	1.10
@@ -493,6 +493,11 @@
 		nglTexGenfv(coord, pname, params, params.position());
 	}
 	private static native void nglTexGenfv(int coord, int pname, FloatBuffer params, int params_offset);
+	public static native void glTexGeni(int coord, int pname, int param);
+	public static void glTexGen(int coord, int pname, IntBuffer params) {
+		nglTexGenfi(coord, pname, params, params.position());
+	}
+	private static native void nglTexGenfi(int coord, int pname, IntBuffer params, int params_offset);
 	public static native void glTexEnvf(int target, int pname, float param);
 	public static native void glTexEnvi(int target, int pname, int param);
 	public static void glTexEnv(int target, int pname, FloatBuffer params) {

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv3312/src/java/org/lwjgl/opengl

Modified Files:
	CoreGL12.java 
Log Message:
Fixes

Index: CoreGL12.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL12.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL12.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CoreGL12.java	2 Aug 2003 15:21:54 -0000	1.7
+++ CoreGL12.java	2 Aug 2003 15:44:03 -0000	1.8
@@ -190,14 +190,14 @@
 		nglGetSeparableFilter(target, format, type, row, Util.getOffset(row), column, Util.getOffset(column), span, Util.getOffset(span));
 	}
 	private static native void nglGetSeparableFilter(int target, int format, int type, Buffer row, int row_offset, Buffer column, int column_offset, Buffer span, int span_offset);
-	public static void glDrawRangeElements(int mode, int start, int end, int type, ByteBuffer indices) {
-		nglDrawRangeElements(mode, start, end, indices.remaining(), type, indices, indices.position());
+	public static void glDrawRangeElements(int mode, int start, int end, ByteBuffer indices) {
+		nglDrawRangeElements(mode, start, end, indices.remaining(), GL_UNSIGNED_BYTE, indices, indices.position());
 	}
-	public static void glDrawRangeElements(int mode, int start, int end, int type, ShortBuffer indices) {
-		nglDrawRangeElements(mode, start, end, indices.remaining(), type, indices, indices.position() << 1);
+	public static void glDrawRangeElements(int mode, int start, int end, ShortBuffer indices) {
+		nglDrawRangeElements(mode, start, end, indices.remaining(), GL_UNSIGNED_SHORT, indices, indices.position() << 1);
 	}
-	public static void glDrawRangeElements(int mode, int start, int end, int type, IntBuffer indices) {
-		nglDrawRangeElements(mode, start, end, indices.remaining(), type, indices, indices.position() << 2);
+	public static void glDrawRangeElements(int mode, int start, int end, IntBuffer indices) {
+		nglDrawRangeElements(mode, start, end, indices.remaining(), GL_UNSIGNED_INT, indices, indices.position() << 2);
 	}
 	private static native void nglDrawRangeElements(int mode, int start, int end, int count, int type, Buffer indices, int indices_offset);
 	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ByteBuffer pixels) {

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv32676/src/native/linux

Modified Files:
	org_lwjgl_Sys.cpp 
Log Message:
Converted various GL sizes to buffer.remaining()

Index: org_lwjgl_Sys.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_Sys.cpp	29 Jul 2003 11:09:44 -0000	1.10
+++ org_lwjgl_Sys.cpp	2 Aug 2003 15:21:55 -0000	1.11
@@ -53,12 +53,12 @@
  * Method:    nGetNULLValue
  * Signature: ()I
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue
+/*JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue
   (JNIEnv *env, jclass clazz)
 {
 	return env->NewDirectByteBuffer(NULL, 0);
 }
-
+*/
 /*
  * Class:     org_lwjgl_Sys
  * Method:    createIndexBuffer

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv32676/src/native/common

Modified Files:
	org_lwjgl_Sys.h org_lwjgl_opengl_CoreGL14.h 
	org_lwjgl_opengl_GL.cpp org_lwjgl_opengl_GL.h 
Log Message:
Converted various GL sizes to buffer.remaining()

Index: org_lwjgl_Sys.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Sys.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Sys.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_Sys.h	29 Jul 2003 11:09:44 -0000	1.9
+++ org_lwjgl_Sys.h	2 Aug 2003 15:21:55 -0000	1.10
@@ -18,17 +18,8 @@
 #define org_lwjgl_Sys_REALTIME_PRIORITY 2L
 /* Inaccessible static: LIBRARY_NAME */
 /* Inaccessible static: DEBUG */
-/* Inaccessible static: NULL */
 /* Inaccessible static: _debug */
 /* Inaccessible static: class_00024org_00024lwjgl_00024Sys */
-/*
- * Class:     org_lwjgl_Sys
- * Method:    nGetNULLValue
- * Signature: ()Ljava/nio/ByteBuffer;
- */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue
-  (JNIEnv *, jclass);
-
 /*
  * Class:     org_lwjgl_Sys
  * Method:    createIndexBuffer

Index: org_lwjgl_opengl_CoreGL14.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL14.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL14.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_CoreGL14.h	2 Aug 2003 12:53:25 -0000	1.6
+++ org_lwjgl_opengl_CoreGL14.h	2 Aug 2003 15:21:55 -0000	1.7
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+/* Inaccessible static: _00024assertionsDisabled */
+/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024CoreGL14 */
 /*
  * Class:     org_lwjgl_opengl_CoreGL14
  * Method:    glFogCoordf

Index: org_lwjgl_opengl_GL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_opengl_GL.cpp	2 Aug 2003 13:22:25 -0000	1.13
+++ org_lwjgl_opengl_GL.cpp	2 Aug 2003 15:21:55 -0000	1.14
@@ -47,7 +47,14 @@
 #include "extgl.h"
 #include "checkGLerror.h"
 
-static inline jobject newBuffer(JNIEnv *env, void *p, int size) {
+static inline void * safeGetBufferAddress(JNIEnv *env, jobject buffer) {
+	if (buffer == NULL)
+		return NULL;
+	else
+		return env->GetDirectBufferAddress(buffer);
+}
+
+static inline jobject safeNewBuffer(JNIEnv *env, void *p, int size) {
 	if (p == NULL)
 		return NULL;
 	else
@@ -1368,7 +1375,7 @@
 	void *address;
 	glGetVariantPointervEXT((GLuint) p0, (GLuint) p1, &address);
 	CHECK_GL_ERROR
-	return newBuffer(env, address, size);
+	return safeNewBuffer(env, address, size);
 }
 
 /*
@@ -1429,7 +1436,7 @@
 	void *address;
 	glGetVertexAttribPointervARB((GLuint) p0, (GLuint) p1, &address);
 	CHECK_GL_ERROR
-	return newBuffer(env, address, size);
+	return safeNewBuffer(env, address, size);
 }
 
 /*
@@ -1442,7 +1449,7 @@
 	void *address;
 	glGetVertexAttribPointervNV((GLuint) p0, (GLuint) p1, &address);
 	CHECK_GL_ERROR
-	return newBuffer(env, address, size);
+	return safeNewBuffer(env, address, size);
 }
 
 /*
@@ -1812,7 +1819,7 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GL_nglNewObjectBufferATI(JNIEnv * env, jclass clazz, jint p0, jobject buffer, jint buffer_offset, jint p2)
 {
 	CHECK_EXISTS(glNewObjectBufferATI)
-	const GLubyte *address = (const GLubyte *)env->GetDirectBufferAddress(buffer);
+	const GLubyte *address = (const GLubyte *)safeGetBufferAddress(env, buffer);
 	jint ret = (jint) glNewObjectBufferATI((GLint) p0, address + buffer_offset, (GLuint) p2);
 	CHECK_GL_ERROR
 	return ret;
@@ -3063,7 +3070,7 @@
 #ifdef _X11
 	CHECK_EXISTS(glXAllocateMemoryNV)
 	void *mem_address = glXAllocateMemoryNV((GLint) size, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3);
-	return newBuffer(env, mem_address, size);
+	return safeNewBuffer(env, mem_address, size);
 #else
 	CHECK_EXISTS(NULL)
 	return 0;
@@ -3093,7 +3100,7 @@
 #ifdef _WIN32
 	CHECK_EXISTS(wglAllocateMemoryNV)
 	void *mem_address = wglAllocateMemoryNV((GLint) size, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3);
-	return newBuffer(env, mem_address, size);
+	return safeNewBuffer(env, mem_address, size);
 #else
 	CHECK_EXISTS(NULL)
 	return 0;
@@ -3590,7 +3597,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglBufferDataARB(JNIEnv *env, jclass clazz, jint target, jint size, jobject buffer, jint usage, jint buffer_offset)
 {
 	CHECK_EXISTS(glBufferDataARB)
-	const GLvoid *address = (const GLvoid *)env->GetDirectBufferAddress(buffer);
+	const GLvoid *address = (const GLvoid *)safeGetBufferAddress(env, buffer);
 	glBufferDataARB((GLenum)target, (GLsizeiptrARB)size, address, (GLenum)usage + buffer_offset);
 	CHECK_GL_ERROR
 }
@@ -3636,7 +3643,7 @@
 		if (old_buffer_address == buffer_address)
 			return old_buffer;
 	}
-	return newBuffer(env, buffer_address, size);
+	return safeNewBuffer(env, buffer_address, size);
 }
 
 /*
@@ -3676,5 +3683,5 @@
 	void *pointer;
 	glGetBufferPointervARB((GLenum)target, (GLenum)pname, &pointer);
 	CHECK_GL_ERROR
-	return newBuffer(env, pointer, size);
+	return safeNewBuffer(env, pointer, size);
 }

Index: org_lwjgl_opengl_GL.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_opengl_GL.h	2 Aug 2003 13:22:25 -0000	1.10
+++ org_lwjgl_opengl_GL.h	2 Aug 2003 15:21:55 -0000	1.11
@@ -7,6 +7,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+/* Inaccessible static: _00024assertionsDisabled */
+/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL */
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    glActiveStencilFaceEXT

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv32676/src/native/win32

Modified Files:
	org_lwjgl_Sys.cpp 
Log Message:
Converted various GL sizes to buffer.remaining()

Index: org_lwjgl_Sys.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Sys.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Sys.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_Sys.cpp	29 Jul 2003 11:09:44 -0000	1.10
+++ org_lwjgl_Sys.cpp	2 Aug 2003 15:21:55 -0000	1.11
@@ -54,12 +54,12 @@
  * Method:    nGetNULLValue
  * Signature: ()I
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue
+/*JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue
   (JNIEnv *env, jclass clazz)
 {
 	return env->NewDirectByteBuffer(NULL, 0);
 }
-
+*/
 /*
  * Class:     org_lwjgl_Sys
  * Method:    createIndexBuffer

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv32676/src/java/org/lwjgl/opengl

Modified Files:
	CoreGL11.java CoreGL12.java CoreGL14.java GL.java 
Log Message:
Converted various GL sizes to buffer.remaining()

Index: CoreGL11.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CoreGL11.java	2 Aug 2003 12:53:24 -0000	1.8
+++ CoreGL11.java	2 Aug 2003 15:21:54 -0000	1.9
@@ -54,14 +54,14 @@
 	public static native void glClearColor(float red, float green, float blue, float alpha);
 	public static native void glClearAccum(float red, float green, float blue, float alpha);
 	public static native void glClear(int mask);
-	public static void glCallLists(int n, ByteBuffer lists) {
-		nglCallLists(n, GL_UNSIGNED_BYTE, lists, lists.position());
+	public static void glCallLists(ByteBuffer lists) {
+		nglCallLists(lists.remaining(), GL_UNSIGNED_BYTE, lists, lists.position());
 	}
-	public static void glCallLists(int n, ShortBuffer lists) {
-		nglCallLists(n, GL_UNSIGNED_SHORT, lists, lists.position() << 1);
+	public static void glCallLists(ShortBuffer lists) {
+		nglCallLists(lists.remaining(), GL_UNSIGNED_SHORT, lists, lists.position() << 1);
 	}
 	public static void glCallLists(int n, IntBuffer lists) {
-		nglCallLists(n, GL_UNSIGNED_INT, lists, lists.position() << 2);
+		nglCallLists(lists.remaining(), GL_UNSIGNED_INT, lists, lists.position() << 2);
 	}
 	private static native void nglCallLists(int n, int type, Buffer lists, int lists_offset);
 	public static native void glCallList(int list);
@@ -76,8 +76,8 @@
 	public static native void glArrayElement(int i);
 	public static native void glClearDepth(double depth);
 	public static native void glDeleteLists(int list, int range);
-	public static void glDeleteTextures(int n, IntBuffer textures) {
-		nglDeleteTextures(n, textures, textures.position());
+	public static void glDeleteTextures(IntBuffer textures) {
+		nglDeleteTextures(textures.remaining(), textures, textures.position());
 	}
 	private static native void nglDeleteTextures(int n, IntBuffer textures, int textures_offset);
 	public static native void glCullFace(int mode);
@@ -132,14 +132,14 @@
 		nglDrawPixels(width, height, format, type, pixels, pixels.position() << 2);
 	}
 	private static native void nglDrawPixels(int width, int height, int format, int type, Buffer pixels, int pixels_offset);
-	public static void glDrawElements(int mode, int count, ByteBuffer indices) {
-		nglDrawElements(mode, count, GL_UNSIGNED_BYTE, indices, indices.position());
+	public static void glDrawElements(int mode, ByteBuffer indices) {
+		nglDrawElements(mode, indices.remaining(), GL_UNSIGNED_BYTE, indices, indices.position());
 	}
-	public static void glDrawElements(int mode, int count, ShortBuffer indices) {
-		nglDrawElements(mode, count, GL_UNSIGNED_SHORT, indices, indices.position() << 1);
+	public static void glDrawElements(int mode, ShortBuffer indices) {
+		nglDrawElements(mode, indices.remaining(), GL_UNSIGNED_SHORT, indices, indices.position() << 1);
 	}
-	public static void glDrawElements(int mode, int count, IntBuffer indices) {
-		nglDrawElements(mode, count, GL_UNSIGNED_INT, indices, indices.position() << 2);
+	public static void glDrawElements(int mode, IntBuffer indices) {
+		nglDrawElements(mode, indices.remaining(), GL_UNSIGNED_INT, indices, indices.position() << 2);
 	}
 	private static native void nglDrawElements(int mode, int count, int type, Buffer indices, int indices_offset);
 	public static native void glDrawBuffer(int mode);
@@ -147,8 +147,8 @@
 	public static native void glDepthRange(double zNear, double zFar);
 	public static native void glDepthMask(boolean flag);
 	public static native void glDepthFunc(int func);
-	public static void glFeedbackBuffer(int size, int type, FloatBuffer buffer) {
-		nglFeedbackBuffer(size, type, buffer, buffer.position());
+	public static void glFeedbackBuffer(int type, FloatBuffer buffer) {
+		nglFeedbackBuffer(buffer.remaining(), type, buffer, buffer.position());
 	}
 	private static native void nglFeedbackBuffer(int size, int type, FloatBuffer buffer, int buffer_offset);
 	public static void glGetPixelMap(int map, FloatBuffer values) {
@@ -208,8 +208,8 @@
 		nglGetIntegerv(pname, params, params.position());
 	}
 	private static native void nglGetIntegerv(int pname, IntBuffer params, int params_offset);
-	public static void glGenTextures(int n, IntBuffer textures) {
-		nglGenTextures(n, textures, textures.position());
+	public static void glGenTextures(IntBuffer textures) {
+		nglGenTextures(textures.remaining(), textures, textures.position());
 	}
 	private static native void nglGenTextures(int n, IntBuffer textures, int textures_offset);
 	public static native int glGenLists(int range);
@@ -362,16 +362,16 @@
 	public static native void glPixelTransferi(int pname, int param);
 	public static native void glPixelStoref(int pname, float param);
 	public static native void glPixelStorei(int pname, int param);
-	public static void glPixelMap(int map, int mapsize, FloatBuffer values) {
-		nglPixelMapfv(map, mapsize, values, values.position());
+	public static void glPixelMap(int map, FloatBuffer values) {
+		nglPixelMapfv(map, values.remaining(), values, values.position());
 	}
 	private static native void nglPixelMapfv(int map, int mapsize, FloatBuffer values, int values_offset);
-	public static void glPixelMap(int map, int mapsize, IntBuffer values) {
-		nglPixelMapuiv(map, mapsize, values, values.position());
+	public static void glPixelMap(int map, IntBuffer values) {
+		nglPixelMapuiv(map, values.remaining(), values, values.position());
 	}
 	private static native void nglPixelMapuiv(int map, int mapsize, IntBuffer values, int values_offset);
-	public static void glPixelMap(int map, int mapsize, ShortBuffer values) {
-		nglPixelMapusv(map, mapsize, values, values.position());
+	public static void glPixelMap(int map, ShortBuffer values) {
+		nglPixelMapusv(map, values.remaining(), values, values.position());
 	}
 	private static native void nglPixelMapusv(int map, int mapsize, ShortBuffer values, int values_offset);
 	public static native void glPassThrough(float token);
@@ -396,8 +396,8 @@
 	}
 	private static native void nglMultMatrixf(FloatBuffer m, int m_offset);
 	public static native void glShadeModel(int mode);
-	public static void glSelectBuffer(int size, IntBuffer buffer) {
-		nglSelectBuffer(size, buffer, buffer.position());
+	public static void glSelectBuffer(IntBuffer buffer) {
+		nglSelectBuffer(buffer.remaining(), buffer, buffer.position());
 	}
 	private static native void nglSelectBuffer(int size, IntBuffer buffer, int buffer_offset);
 	public static native void glScissor(int x, int y, int width, int height);
@@ -515,5 +515,4 @@
 	public static native void glStencilMask(int mask);
 	public static native void glViewport(int x, int y, int width, int height);
 }
-
 

Index: CoreGL12.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL12.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL12.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CoreGL12.java	1 Aug 2003 20:57:09 -0000	1.6
+++ CoreGL12.java	2 Aug 2003 15:21:54 -0000	1.7
@@ -190,14 +190,14 @@
 		nglGetSeparableFilter(target, format, type, row, Util.getOffset(row), column, Util.getOffset(column), span, Util.getOffset(span));
 	}
 	private static native void nglGetSeparableFilter(int target, int format, int type, Buffer row, int row_offset, Buffer column, int column_offset, Buffer span, int span_offset);
-	public static void glDrawRangeElements(int mode, int start, int end, int count, int type, ByteBuffer indices) {
-		nglDrawRangeElements(mode, start, end, count, type, indices, indices.position());
+	public static void glDrawRangeElements(int mode, int start, int end, int type, ByteBuffer indices) {
+		nglDrawRangeElements(mode, start, end, indices.remaining(), type, indices, indices.position());
 	}
-	public static void glDrawRangeElements(int mode, int start, int end, int count, int type, ShortBuffer indices) {
-		nglDrawRangeElements(mode, start, end, count, type, indices, indices.position() << 1);
+	public static void glDrawRangeElements(int mode, int start, int end, int type, ShortBuffer indices) {
+		nglDrawRangeElements(mode, start, end, indices.remaining(), type, indices, indices.position() << 1);
 	}
-	public static void glDrawRangeElements(int mode, int start, int end, int count, int type, IntBuffer indices) {
-		nglDrawRangeElements(mode, start, end, count, type, indices, indices.position() << 2);
+	public static void glDrawRangeElements(int mode, int start, int end, int type, IntBuffer indices) {
+		nglDrawRangeElements(mode, start, end, indices.remaining(), type, indices, indices.position() << 2);
 	}
 	private static native void nglDrawRangeElements(int mode, int start, int end, int count, int type, Buffer indices, int indices_offset);
 	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ByteBuffer pixels) {
@@ -222,5 +222,4 @@
 	private static native void nglTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, Buffer pixels, int pixels_offset);
 	public static native void glCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height);
 }
-
 

Index: CoreGL14.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL14.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL14.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CoreGL14.java	2 Aug 2003 12:53:24 -0000	1.9
+++ CoreGL14.java	2 Aug 2003 15:21:54 -0000	1.10
@@ -51,8 +51,9 @@
 		nglFogCoordPointer(GL_FLOAT, stride, data, data.position() << 2);
 	}
 	private static native void nglFogCoordPointer (int type, int stride, Buffer data, int data_offset);
-	public static void glMultiDrawArrays(int mode, IntBuffer piFirst, IntBuffer piCount, int primcount) {
-		nglMultiDrawArrays(mode, piFirst, piFirst.position(), piCount, piCount.position(), primcount);
+	public static void glMultiDrawArrays(int mode, IntBuffer piFirst, IntBuffer piCount) {
+		assert piFirst.remaining() == piCount.remaining(): "piFirst.remaining() != piCount.remaining()";
+		nglMultiDrawArrays(mode, piFirst, piFirst.position(), piCount, piCount.position(), piFirst.remaining());
 	}
 	private static native void nglMultiDrawArrays(int mode, IntBuffer piFirst, int piFirst_offset, IntBuffer piCount, int piCount_offset, int primcount);
 /*        public static native void glMultiDrawElements(int mode, int piCount, int type, int pIndices, int primcount);*/
@@ -77,5 +78,4 @@
 	public static native void glWindowPos3f (float x, float y, float z);
 	public static native void glWindowPos3i (int x, int y, int z);
 }
-
 

Index: GL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- GL.java	2 Aug 2003 13:22:24 -0000	1.34
+++ GL.java	2 Aug 2003 15:21:54 -0000	1.35
@@ -84,8 +84,9 @@
 		int arg3Rep,
 		int arg3Mod);
 
-	public static boolean glAreProgramsResidentNV(int n, IntBuffer piIDs, ByteBuffer pbResidences) {
-		return nglAreProgramsResidentNV(n, piIDs, piIDs.position(), pbResidences, pbResidences.position());
+	public static boolean glAreProgramsResidentNV(IntBuffer piIDs, ByteBuffer pbResidences) {
+		assert piIDs.remaining() == pbResidences.remaining(): "piIDs.remaining() != pbResidences.remaining()";
+		return nglAreProgramsResidentNV(piIDs.remaining(), piIDs, piIDs.position(), pbResidences, pbResidences.position());
 	}
 	private static native boolean nglAreProgramsResidentNV(int n, IntBuffer piIDs, int piIDs_offset, ByteBuffer pbResidences, int pbResidences_offset);
 
@@ -268,25 +269,25 @@
 
 	public static native void glCurrentPaletteMatrixARB(int index);
 
-	public static void glDeleteFencesNV(int n, IntBuffer piFences) {
-		nglDeleteFencesNV(n, piFences, piFences.position());
+	public static void glDeleteFencesNV(IntBuffer piFences) {
+		nglDeleteFencesNV(piFences.remaining(), piFences, piFences.position());
 	}
 	private static native void nglDeleteFencesNV(int n, IntBuffer piFences, int piFences_offset);
 
 	public static native void glDeleteFragmentShaderATI(int id);
 
-	public static void glDeleteOcclusionQueriesNV(int n, IntBuffer piIDs) {
-		nglDeleteOcclusionQueriesNV(n, piIDs, piIDs.position());
+	public static void glDeleteOcclusionQueriesNV(IntBuffer piIDs) {
+		nglDeleteOcclusionQueriesNV(piIDs.remaining(), piIDs, piIDs.position());
 	}
 	private static native void nglDeleteOcclusionQueriesNV(int n, IntBuffer piIDs, int piIDs_offset);
 
-	public static void glDeleteProgramsARB(int n, IntBuffer piPrograms) {
-		nglDeleteProgramsARB(n, piPrograms, piPrograms.position());
+	public static void glDeleteProgramsARB(IntBuffer piPrograms) {
+		nglDeleteProgramsARB(piPrograms.remaining(), piPrograms, piPrograms.position());
 	}
 	private static native void nglDeleteProgramsARB(int n, IntBuffer piPrograms, int piPrograms_offset);
 
-	public static void glDeleteProgramsNV(int n, IntBuffer piIDs) {
-		nglDeleteProgramsNV(n, piIDs, piIDs.position());
+	public static void glDeleteProgramsNV(IntBuffer piIDs) {
+		nglDeleteProgramsNV(piIDs.remaining(), piIDs, piIDs.position());
 	}
 	private static native void nglDeleteProgramsNV(int n, IntBuffer piIDs, int piIDs_offset);
 
@@ -304,14 +305,14 @@
 		int end,
 		int count);
 
-	public static void glDrawRangeElementsEXT(int mode, int start, int end, int count, ByteBuffer pIndices) {
-		nglDrawRangeElementsEXT(mode, start, end, count, GL_UNSIGNED_BYTE, pIndices, pIndices.position());
+	public static void glDrawRangeElementsEXT(int mode, int start, int end, ByteBuffer pIndices) {
+		nglDrawRangeElementsEXT(mode, start, end, pIndices.remaining(), GL_UNSIGNED_BYTE, pIndices, pIndices.position());
 	}
-	public static void glDrawRangeElementsEXT(int mode, int start, int end, int count, ShortBuffer pIndices) {
-		nglDrawRangeElementsEXT(mode, start, end, count, GL_UNSIGNED_SHORT, pIndices, pIndices.position()<<1);
+	public static void glDrawRangeElementsEXT(int mode, int start, int end, ShortBuffer pIndices) {
+		nglDrawRangeElementsEXT(mode, start, end, pIndices.remaining(), GL_UNSIGNED_SHORT, pIndices, pIndices.position()<<1);
 	}
-	public static void glDrawRangeElementsEXT(int mode, int start, int end, int count, IntBuffer pIndices) {
-		nglDrawRangeElementsEXT(mode, start, end, count, GL_UNSIGNED_INT, pIndices, pIndices.position()<<2);
+	public static void glDrawRangeElementsEXT(int mode, int start, int end, IntBuffer pIndices) {
+		nglDrawRangeElementsEXT(mode, start, end, pIndices.remaining(), GL_UNSIGNED_INT, pIndices, pIndices.position()<<2);
 	}
 	private static native void nglDrawRangeElementsEXT(int mode, int start, int end, int count, int type, Buffer pIndices, int pIndices_offset);
 
@@ -364,25 +365,25 @@
 
 	public static native void glFreeObjectBufferATI(int buffer);
 
-	public static void glGenFencesNV(int n, IntBuffer piFences) {
-		nglGenFencesNV(n, piFences, piFences.position());
+	public static void glGenFencesNV(IntBuffer piFences) {
+		nglGenFencesNV(piFences.remaining(), piFences, piFences.position());
 	}
 	private static native void nglGenFencesNV(int n, IntBuffer piFences, int piFences_offset);
 
 	public static native int glGenFragmentShadersATI(int range);
 
-	public static void glGenOcclusionQueriesNV(int n, IntBuffer piIDs) {
-		nglGenOcclusionQueriesNV(n, piIDs, piIDs.position());
+	public static void glGenOcclusionQueriesNV(IntBuffer piIDs) {
+		nglGenOcclusionQueriesNV(piIDs.remaining(), piIDs, piIDs.position());
 	}
 	private static native void nglGenOcclusionQueriesNV(int n, IntBuffer piIDs, int piIDs_offset);
 
-	public static void glGenProgramsARB(int n, IntBuffer piPrograms) {
-		nglGenProgramsARB(n, piPrograms, piPrograms.position());
+	public static void glGenProgramsARB(IntBuffer piPrograms) {
+		nglGenProgramsARB(piPrograms.remaining(), piPrograms, piPrograms.position());
 	}
 	private static native void nglGenProgramsARB(int n, IntBuffer piPrograms, int piPrograms_offset);
 
-	public static void glGenProgramsNV(int n, IntBuffer piIDs) {
-		nglGenProgramsNV(n, piIDs, piIDs.position());
+	public static void glGenProgramsNV(IntBuffer piIDs) {
+		nglGenProgramsNV(piIDs.remaining(), piIDs, piIDs.position());
 	}
 	private static native void nglGenProgramsNV(int n, IntBuffer piIDs, int piIDs_offset);
 
@@ -653,8 +654,8 @@
 
 	public static native boolean glIsVariantEnabledEXT(int id, int cap);
 
-	public static void glLoadProgramNV(int target, int id, int len, ByteBuffer pProgram) {
-		nglLoadProgramNV(target, id, len, pProgram, pProgram.position());
+	public static void glLoadProgramNV(int target, int id, ByteBuffer pProgram) {
+		nglLoadProgramNV(target, id, pProgram.remaining(), pProgram, pProgram.position());
 	}
 	private static native void nglLoadProgramNV(int target, int id, int len, ByteBuffer pProgram, int pProgram_offset);
 
@@ -691,23 +692,24 @@
 	}
 	private static native void nglMatrixIndexPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_offset);
 
-	public static void glMatrixIndexuARB(int size, ByteBuffer pIndices) {
-		nglMatrixIndexubvARB(size, pIndices, pIndices.position());
+	public static void glMatrixIndexuARB(ByteBuffer pIndices) {
+		nglMatrixIndexubvARB(pIndices.remaining(), pIndices, pIndices.position());
 	}
 	private static native void nglMatrixIndexubvARB(int size, ByteBuffer pIndices, int pIndices_offset);
 
-	public static void glMatrixIndexuARB(int size, IntBuffer piIndices) {
-		nglMatrixIndexuivARB(size, piIndices, piIndices.position());
+	public static void glMatrixIndexuARB(IntBuffer piIndices) {
+		nglMatrixIndexuivARB(piIndices.remaining(), piIndices, piIndices.position());
 	}
 	private static native void nglMatrixIndexuivARB(int size, IntBuffer piIndices, int piIndices_offset);
 
-	public static void glMatrixIndexuARB(int size, ShortBuffer psIndices) {
-		nglMatrixIndexusvARB(size, psIndices, psIndices.position());
+	public static void glMatrixIndexuARB(ShortBuffer psIndices) {
+		nglMatrixIndexusvARB(psIndices.remaining(), psIndices, psIndices.position());
 	}
 	private static native void nglMatrixIndexusvARB(int size, ShortBuffer psIndices, int psIndices_offset);
 
-	public static void glMultiDrawArraysEXT(int mode, IntBuffer piFirst, IntBuffer piCount, int primcount) {
-		nglMultiDrawArraysEXT(mode, piFirst, piFirst.position(), piCount, piCount.position(), primcount);
+	public static void glMultiDrawArraysEXT(int mode, IntBuffer piFirst, IntBuffer piCount) {
+		assert piFirst.remaining() == piCount.remaining(): "piFirst.remaining() != piCount.remaining()";
+		nglMultiDrawArraysEXT(mode, piFirst, piFirst.position(), piCount, piCount.position(), piFirst.remaining());
 	}
 	private static native void nglMultiDrawArraysEXT(int mode, IntBuffer piFirst, int piFirst_offset, IntBuffer piCount, int piCount_offset, int primcount);
 
@@ -766,16 +768,16 @@
 	private static native void nglMultTransposeMatrixfARB(FloatBuffer pfMtx, int pfMtx_offset);
 
 	public static int glNewObjectBufferATI(int size, ByteBuffer pPointer, int usage) {
-		return nglNewObjectBufferATI(size, pPointer, pPointer.position(), usage);
+		return nglNewObjectBufferATI(size, pPointer, pPointer != null ? pPointer.position() : 0, usage);
 	}
 	public static int glNewObjectBufferATI(int size, ShortBuffer pPointer, int usage) {
-		return nglNewObjectBufferATI(size, pPointer, pPointer.position()<<1, usage);
+		return nglNewObjectBufferATI(size, pPointer, pPointer != null ? pPointer.position()<<1 : 0, usage);
 	}
 	public static int glNewObjectBufferATI(int size, FloatBuffer pPointer, int usage) {
-		return nglNewObjectBufferATI(size, pPointer, pPointer.position()<<2, usage);
+		return nglNewObjectBufferATI(size, pPointer, pPointer != null ? pPointer.position()<<2 : 0, usage);
 	}
 	public static int glNewObjectBufferATI(int size, IntBuffer pPointer, int usage) {
-		return nglNewObjectBufferATI(size, pPointer, pPointer.position()<<2, usage);
+		return nglNewObjectBufferATI(size, pPointer, pPointer != null ? pPointer.position()<<2 : 0, usage);
 	}
 	private static native int nglNewObjectBufferATI(int size, Buffer pPointer, int pPointer_offset, int usage);
 
@@ -843,13 +845,13 @@
 	}
 	private static native void nglProgramParameters4fvNV(int target, int index, int num, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glProgramStringARB(int target, int format, int len, ByteBuffer pString) {
-		nglProgramStringARB(target, format, len, pString, pString.position());
+	public static void glProgramStringARB(int target, int format, ByteBuffer pString) {
+		nglProgramStringARB(target, format, pString.remaining(), pString, pString.position());
 	}
 	private static native void nglProgramStringARB(int target, int format, int len, Buffer pString, int pString_offset);
 
-	public static void glRequestResidentProgramsNV(int n, IntBuffer piIDs) {
-		nglRequestResidentProgramsNV(n, piIDs, piIDs.position());
+	public static void glRequestResidentProgramsNV(IntBuffer piIDs) {
+		nglRequestResidentProgramsNV(piIDs.remaining(), piIDs, piIDs.position());
 	}
 	private static native void nglRequestResidentProgramsNV(int n, IntBuffer piIDs, int piIDs_offset);
 
@@ -945,17 +947,17 @@
 
 	public static native void glUnlockArraysEXT();
 
-	public static void glUpdateObjectBufferATI(int buffer, int offset, int size, ByteBuffer pPointer, int preserve) {
-		nglUpdateObjectBufferATI(buffer, offset, size, pPointer, pPointer.position(), preserve);
+	public static void glUpdateObjectBufferATI(int buffer, int offset, ByteBuffer pPointer, int preserve) {
+		nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining(), pPointer, pPointer.position(), preserve);
 	}
-	public static void glUpdateObjectBufferATI(int buffer, int offset, int size, ShortBuffer pPointer, int preserve) {
-		nglUpdateObjectBufferATI(buffer, offset, size, pPointer, pPointer.position()<<1, preserve);
+	public static void glUpdateObjectBufferATI(int buffer, int offset, ShortBuffer pPointer, int preserve) {
+		nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining()<<1, pPointer, pPointer.position()<<1, preserve);
 	}
-	public static void glUpdateObjectBufferATI(int buffer, int offset, int size, FloatBuffer pPointer, int preserve) {
-		nglUpdateObjectBufferATI(buffer, offset, size, pPointer, pPointer.position()<<2, preserve);
+	public static void glUpdateObjectBufferATI(int buffer, int offset, FloatBuffer pPointer, int preserve) {
+		nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining()<<2, pPointer, pPointer.position()<<2, preserve);
 	}
-	public static void glUpdateObjectBufferATI(int buffer, int offset, int size, IntBuffer pPointer, int preserve) {
-		nglUpdateObjectBufferATI(buffer, offset, size, pPointer, pPointer.position()<<2, preserve);
+	public static void glUpdateObjectBufferATI(int buffer, int offset, IntBuffer pPointer, int preserve) {
+		nglUpdateObjectBufferATI(buffer, offset, pPointer.remaining()<<2, pPointer, pPointer.position()<<2, preserve);
 	}
 	private static native void nglUpdateObjectBufferATI(int buffer, int offset, int size, Buffer pPointer, int pPointer_offset, int preserve);
 
@@ -1016,7 +1018,7 @@
 	private static native void nglVariantusvEXT(int id, ShortBuffer psAddr, int psAddr_offset);
 
 	public static void glVertexArrayRangeNV(ByteBuffer pPointer) {
-		nglVertexArrayRangeNV(pPointer.capacity(), pPointer, pPointer.position());
+		nglVertexArrayRangeNV(pPointer.remaining(), pPointer, pPointer.position());
 	}
 	private static native void nglVertexArrayRangeNV(int size, Buffer pPointer, int pPointer_offset);
 
@@ -1174,48 +1176,48 @@
 	}
 	private static native void nglVertexAttribPointerNV(int index, int size, int type, int stride, Buffer pPointer, int pPointer_offset);
 
-	public static void glVertexAttribs1NV(int index, int n, FloatBuffer pfV) {
-		nglVertexAttribs1fvNV(index, n, pfV, pfV.position());
+	public static void glVertexAttribs1NV(int index, FloatBuffer pfV) {
+		nglVertexAttribs1fvNV(index, pfV.remaining(), pfV, pfV.position());
 	}
 	private static native void nglVertexAttribs1fvNV(int index, int n, FloatBuffer pfV, int pfV_offset);
 
-	public static void glVertexAttribs1NV(int index, int n, ShortBuffer psV) {
-		nglVertexAttribs1svNV(index, n, psV, psV.position());
+	public static void glVertexAttribs1NV(int index, ShortBuffer psV) {
+		nglVertexAttribs1svNV(index, psV.remaining(), psV, psV.position());
 	}
 	private static native void nglVertexAttribs1svNV(int index, int n, ShortBuffer psV, int psV_offset);
 
-	public static void glVertexAttribs2NV(int index, int n, FloatBuffer pfV) {
-		nglVertexAttribs2fvNV(index, n, pfV, pfV.position());
+	public static void glVertexAttribs2NV(int index, FloatBuffer pfV) {
+		nglVertexAttribs2fvNV(index, pfV.remaining()>>1, pfV, pfV.position());
 	}
 	private static native void nglVertexAttribs2fvNV(int index, int n, FloatBuffer pfV, int pfV_offset);
 
-	public static void glVertexAttribs2NV(int index, int n, ShortBuffer psV) {
-		nglVertexAttribs2svNV(index, n, psV, psV.position());
+	public static void glVertexAttribs2NV(int index, ShortBuffer psV) {
+		nglVertexAttribs2svNV(index, psV.remaining()>>1, psV, psV.position());
 	}
 	private static native void nglVertexAttribs2svNV(int index, int n, ShortBuffer psV, int psV_offset);
 
-	public static void glVertexAttribs3NV(int index, int n, FloatBuffer pfV) {
-		nglVertexAttribs3fvNV(index, n, pfV, pfV.position());
+	public static void glVertexAttribs3NV(int index, FloatBuffer pfV) {
+		nglVertexAttribs3fvNV(index, pfV.remaining()/3, pfV, pfV.position());
 	}
 	private static native void nglVertexAttribs3fvNV(int index, int n, FloatBuffer pfV, int pfV_offset);
 
-	public static void glVertexAttribs3NV(int index, int n, ShortBuffer psV) {
-		nglVertexAttribs3svNV(index, n, psV, psV.position());
+	public static void glVertexAttribs3NV(int index, ShortBuffer psV) {
+		nglVertexAttribs3svNV(index, psV.remaining()/3, psV, psV.position());
 	}
 	private static native void nglVertexAttribs3svNV(int index, int n, ShortBuffer psV, int psV_offset);
 
-	public static void glVertexAttribs4NV(int index, int n, FloatBuffer pfV) {
-		nglVertexAttribs4fvNV(index, n, pfV, pfV.position());
+	public static void glVertexAttribs4NV(int index, FloatBuffer pfV) {
+		nglVertexAttribs4fvNV(index, pfV.remaining()>>2, pfV, pfV.position());
 	}
 	private static native void nglVertexAttribs4fvNV(int index, int n, FloatBuffer pfV, int pfV_offset);
 
-	public static void glVertexAttribs4NV(int index, int n, ShortBuffer psV) {
-		nglVertexAttribs4svNV(index, n, psV, psV.position());
+	public static void glVertexAttribs4NV(int index, ShortBuffer psV) {
+		nglVertexAttribs4svNV(index, psV.remaining()>>2, psV, psV.position());
 	}
 	private static native void nglVertexAttribs4svNV(int index, int n, ShortBuffer psV, int psV_offset);
 
-	public static void glVertexAttribs4uNV(int index, int n, ByteBuffer pV) {
-		nglVertexAttribs4ubvNV(index, n, pV, pV.position());
+	public static void glVertexAttribs4uNV(int index, ByteBuffer pV) {
+		nglVertexAttribs4ubvNV(index, pV.remaining()>>2, pV, pV.position());
 	}
 	private static native void nglVertexAttribs4ubvNV(int index, int n, ByteBuffer pV, int pV_offset);
 
@@ -1265,18 +1267,18 @@
 	}
 	private static native void nglVertexWeightPointerEXT(int size, int type, int stride, Buffer pPointer, int pPointer_offset);
 
-	public static void glWeightARB(int size, ByteBuffer pWeights) {
-		nglWeightbvARB(size, pWeights, pWeights.position());
+	public static void glWeightARB(ByteBuffer pWeights) {
+		nglWeightbvARB(pWeights.remaining(), pWeights, pWeights.position());
 	}
 	private static native void nglWeightbvARB(int size, ByteBuffer pWeights, int pWeights_offset);
 
 	public static void glWeightARB(int size, FloatBuffer pfWeights) {
-		nglWeightfvARB(size, pfWeights, pfWeights.position());
+		nglWeightfvARB(pfWeights.remaining(), pfWeights, pfWeights.position());
 	}
 	private static native void nglWeightfvARB(int size, FloatBuffer pfWeights, int pfWeights_offset);
 
-	public static void glWeightARB(int size, IntBuffer piWeights) {
-		nglWeightivARB(size, piWeights, piWeights.position());
+	public static void glWeightARB(IntBuffer piWeights) {
+		nglWeightivARB(piWeights.remaining(), piWeights, piWeights.position());
 	}
 	private static native void nglWeightivARB(int size, IntBuffer piWeights, int piWeights_offset);
 
@@ -1294,23 +1296,23 @@
 	}
 	private static native void nglWeightPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_offset);
 
-	public static void glWeightARB(int size, ShortBuffer psWeights) {
-		nglWeightsvARB(size, psWeights, psWeights.position());
+	public static void glWeightARB(ShortBuffer psWeights) {
+		nglWeightsvARB(psWeights.remaining(), psWeights, psWeights.position());
 	}
 	private static native void nglWeightsvARB(int size, ShortBuffer psWeights, int psWeights_offset);
 
-	public static void glWeightuARB(int size, ByteBuffer pWeights) {
-		nglWeightubvARB(size, pWeights, pWeights.position());
+	public static void glWeightuARB(ByteBuffer pWeights) {
+		nglWeightubvARB(pWeights.remaining(), pWeights, pWeights.position());
 	}
 	private static native void nglWeightubvARB(int size, ByteBuffer pWeights, int pWeights_offset);
 
-	public static void glWeightuARB(int size, IntBuffer piWeights) {
-		nglWeightuivARB(size, piWeights, piWeights.position());
+	public static void glWeightuARB(IntBuffer piWeights) {
+		nglWeightuivARB(piWeights.remaining(), piWeights, piWeights.position());
 	}
 	private static native void nglWeightuivARB(int size, IntBuffer piWeights, int piWeights_offset);
 
-	public static void glWeightuARB(int size, ShortBuffer psWeights) {
-		nglWeightusvARB(size, psWeights, psWeights.position());
+	public static void glWeightuARB(ShortBuffer psWeights) {
+		nglWeightusvARB(psWeights.remaining(), psWeights, psWeights.position());
 	}
 	private static native void nglWeightusvARB(int size, ShortBuffer psWeights, int psWeights_offset);
 
@@ -1443,52 +1445,52 @@
 		int outW);
 
 	public static native void glBindBufferARB(int target, int buffer);
-	public static void glDeleteBuffersARB(int n, IntBuffer buffers) {
-		nglDeleteBuffersARB(n, buffers, buffers.position());
+	public static void glDeleteBuffersARB(IntBuffer buffers) {
+		nglDeleteBuffersARB(buffers.remaining(), buffers, buffers.position());
 	}
 	private static native void nglDeleteBuffersARB(int n, IntBuffer buffers, int buffers_offset);
-	public static void glGenBuffersARB(int n, IntBuffer buffers) {
-		nglGenBuffersARB(n, buffers, buffers.position());
+	public static void glGenBuffersARB(IntBuffer buffers) {
+		nglGenBuffersARB(buffers.remaining(), buffers, buffers.position());
 	}
 	private static native void nglGenBuffersARB(int n, IntBuffer buffers, int buffers_offset);
 	public static native boolean glIsBufferARB(int buffer);
 	public static void glBufferDataARB(int target, int size, ByteBuffer data, int usage) {
-		nglBufferDataARB(target, size, data, data.position(), usage);
+		nglBufferDataARB(target, size, data, data != null ? data.position() : 0, usage);
 	}
 	public static void glBufferDataARB(int target, int size, ShortBuffer data, int usage) {
-		nglBufferDataARB(target, size, data, data.position()<<1, usage);
+		nglBufferDataARB(target, size, data, data != null ? data.position()<<1 : 0, usage);
 	}
 	public static void glBufferDataARB(int target, int size, FloatBuffer data, int usage) {
-		nglBufferDataARB(target, size, data, data.position()<<2, usage);
+		nglBufferDataARB(target, size, data, data != null ? data.position()<<2 : 0, usage);
 	}
 	public static void glBufferDataARB(int target, int size, IntBuffer data, int usage) {
-		nglBufferDataARB(target, size, data, data.position()<<2, usage);
+		nglBufferDataARB(target, size, data, data != null ? data.position()<<2 : 0, usage);
 	}
 	private static native void nglBufferDataARB(int target, int size, Buffer data, int data_offset, int usage);
-	public static void glBufferSubDataARB(int target, int offset, int size, ByteBuffer data) {
-		nglBufferSubDataARB(target, offset, size, data, data.position());
+	public static void glBufferSubDataARB(int target, int offset, ByteBuffer data) {
+		nglBufferSubDataARB(target, offset, data.remaining(), data, data.position());
 	}
-	public static void glBufferSubDataARB(int target, int offset, int size, ShortBuffer data) {
-		nglBufferSubDataARB(target, offset, size, data, data.position()<<1);
+	public static void glBufferSubDataARB(int target, int offset, ShortBuffer data) {
+		nglBufferSubDataARB(target, offset, data.remaining()<<1, data, data.position()<<1);
 	}
-	public static void glBufferSubDataARB(int target, int offset, int size, FloatBuffer data) {
-		nglBufferSubDataARB(target, offset, size, data, data.position()<<2);
+	public static void glBufferSubDataARB(int target, int offset, FloatBuffer data) {
+		nglBufferSubDataARB(target, offset, data.remaining()<<2, data, data.position()<<2);
 	}
-	public static void glBufferSubDataARB(int target, int offset, int size, IntBuffer data) {
-		nglBufferSubDataARB(target, offset, size, data, data.position()<<2);
+	public static void glBufferSubDataARB(int target, int offset, IntBuffer data) {
+		nglBufferSubDataARB(target, offset, data.remaining()<<2, data, data.position()<<2);
 	}
 	private static native void nglBufferSubDataARB(int target, int offset, int size, Buffer data, int data_offset);
-	public static void glGetBufferSubDataARB(int target, int offset, int size, ByteBuffer data) {
-		nglGetBufferSubDataARB(target, offset, size, data, data.position());
+	public static void glGetBufferSubDataARB(int target, int offset, ByteBuffer data) {
+		nglGetBufferSubDataARB(target, offset, data.remaining(), data, data.position());
 	}
-	public static void glGetBufferSubDataARB(int target, int offset, int size, ShortBuffer data) {
-		nglGetBufferSubDataARB(target, offset, size, data, data.position()<<1);
+	public static void glGetBufferSubDataARB(int target, int offset, ShortBuffer data) {
+		nglGetBufferSubDataARB(target, offset, data.remaining()<<1, data, data.position()<<1);
 	}
-	public static void glGetBufferSubDataARB(int target, int offset, int size, IntBuffer data) {
-		nglGetBufferSubDataARB(target, offset, size, data, data.position()<<2);
+	public static void glGetBufferSubDataARB(int target, int offset, IntBuffer data) {
+		nglGetBufferSubDataARB(target, offset, data.remaining()<<2, data, data.position()<<2);
 	}
-	public static void glGetBufferSubDataARB(int target, int offset, int size, FloatBuffer data) {
-		nglGetBufferSubDataARB(target, offset, size, data, data.position()<<2);
+	public static void glGetBufferSubDataARB(int target, int offset, FloatBuffer data) {
+		nglGetBufferSubDataARB(target, offset, data.remaining()<<2, data, data.position()<<2);
 	}
 	private static native void nglGetBufferSubDataARB(int target, int offset, int size, Buffer data, int data_offset);
 	/**

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv32676/src/java/org/lwjgl/test/opengl

Modified Files:
	Grass.java PbufferTest.java VBOTest.java 
Log Message:
Converted various GL sizes to buffer.remaining()

Index: Grass.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Grass.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Grass.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Grass.java	28 Jul 2003 10:09:57 -0000	1.16
+++ Grass.java	2 Aug 2003 15:21:55 -0000	1.17
@@ -133,7 +133,7 @@
 		byte_buf.order(ByteOrder.nativeOrder());
 		            GLCaps.determineAvailableExtensions();
 		System.out.println("Vertex program supported: " + GLCaps.GL_NV_vertex_program);
-		GL.glGenProgramsNV(1, byte_buf.asIntBuffer());
+		GL.glGenProgramsNV(byte_buf.asIntBuffer());
 		IntBuffer int_buf = byte_buf.asIntBuffer();
 		if (int_buf.get(0) == 0)
 			throw new RuntimeException("Could not allocate new vertex program id!");
@@ -148,7 +148,6 @@
 		GL.glLoadProgramNV(
 			GL.GL_VERTEX_PROGRAM_NV,
 			program_handle,
-			program_buf.remaining(),
 			program_buf);
 		/*gl.getIntegerv(GL.PROGRAM_ERROR_POSITION_NV, Sys.getDirectBufferAddress(int_buf));
 		System.out.println("error position: " + int_buf.get(0));*/

Index: PbufferTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PbufferTest.java	2 Aug 2003 13:22:25 -0000	1.7
+++ PbufferTest.java	2 Aug 2003 15:21:55 -0000	1.8
@@ -341,7 +341,7 @@
   private void destroyTexture() {
     IntBuffer buffer = ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
     buffer.put(0, tex_handle);
-    GL.glDeleteTextures(1, buffer);
+    GL.glDeleteTextures(buffer);
   }
 
   /**
@@ -400,7 +400,7 @@
     GL.glEnable(GL.GL_TEXTURE_2D);
     // Create shared texture
     IntBuffer buffer = ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
-    GL.glGenTextures(1, buffer);
+    GL.glGenTextures(buffer);
     tex_handle = buffer.get(0);
     GL.glBindTexture(GL.GL_TEXTURE_2D, tex_handle);
     GL.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_S, GL.GL_CLAMP);

Index: VBOTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- VBOTest.java	2 Aug 2003 13:22:25 -0000	1.3
+++ VBOTest.java	2 Aug 2003 15:21:55 -0000	1.4
@@ -186,12 +186,12 @@
 		System.exit(1);
 	}
 	IntBuffer int_buffer = ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
-	GL.glGenBuffersARB(1, int_buffer);
+	GL.glGenBuffersARB(int_buffer);
 	buffer_id = int_buffer.get(0);
 	GL.glBindBufferARB(GL.GL_ARRAY_BUFFER_ARB, buffer_id);
 	vertices = ByteBuffer.allocateDirect(2*4*4).order(ByteOrder.nativeOrder()).asFloatBuffer();
 	vertices.put(-50).put(-50).put(50).put(-50).put(50).put(50).put(-50).put(50);
-	GL.glBufferDataARB(GL.GL_ARRAY_BUFFER_ARB, 2*4*4, Sys.NULL, GL.GL_STREAM_DRAW_ARB);
+	GL.glBufferDataARB(GL.GL_ARRAY_BUFFER_ARB, 2*4*4, (ByteBuffer)null, GL.GL_STREAM_DRAW_ARB);
 	ByteBuffer index_buffer = Sys.createIndexBuffer(0);
 	GL.glEnableClientState(GL.GL_VERTEX_ARRAY);
 	GL.glVertexPointer(2, 0, index_buffer.asFloatBuffer());
@@ -206,8 +206,8 @@
       */
      private static void cleanup() {
 	IntBuffer int_buffer = ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder()).asIntBuffer();
-	int_buffer.put(buffer_id);
-	GL.glDeleteBuffersARB(1, int_buffer);
+	int_buffer.put(0, buffer_id);
+	GL.glDeleteBuffersARB(int_buffer);
          Keyboard.destroy();
          Mouse.destroy();
          gl.destroy();

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv32676/src/java/org/lwjgl

Modified Files:
	Sys.java 
Log Message:
Converted various GL sizes to buffer.remaining()

Index: Sys.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Sys.java	29 Jul 2003 11:09:44 -0000	1.23
+++ Sys.java	2 Aug 2003 15:21:54 -0000	1.24
@@ -85,7 +85,7 @@
 	/**
 	 * The ByteBuffer equivalent of the native NULL constant
 	 */
-	public static final ByteBuffer NULL;
+//	public static final ByteBuffer NULL;
 	
 	
 	private static boolean _debug;
@@ -102,7 +102,7 @@
 		} finally {
 			DEBUG = _debug;
 			initialize();
-			NULL = nGetNULLValue();
+//			NULL = nGetNULLValue();
 		}
 	}
 	
@@ -132,7 +132,7 @@
 	/**
 	 * Gets the native NULL constant value
 	 */
-	private static native ByteBuffer nGetNULLValue();
+//	private static native ByteBuffer nGetNULLValue();
 
 	/**
 	 * Create a buffer representing an integer index. Use it with functions that in C can take

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv15617/src/native/common

Modified Files:
	org_lwjgl_opengl_GL.cpp org_lwjgl_opengl_GL.h 
Log Message:
Removed superfluous postfixes, fixed examples

Index: org_lwjgl_opengl_GL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- org_lwjgl_opengl_GL.cpp	2 Aug 2003 12:53:25 -0000	1.12
+++ org_lwjgl_opengl_GL.cpp	2 Aug 2003 13:22:25 -0000	1.13
@@ -1360,9 +1360,9 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetVariantPointervEXT
+ * Method:    glGetVariantPointerEXT
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVariantPointervEXT(JNIEnv * env, jclass clazz, jint p0, jint p1, jint size)
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVariantPointerEXT(JNIEnv * env, jclass clazz, jint p0, jint p1, jint size)
 {
 	CHECK_EXISTS(glGetVariantPointervEXT)
 	void *address;
@@ -1421,9 +1421,9 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetVertexAttribPointervARB
+ * Method:    glGetVertexAttribPointerARB
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVertexAttribPointervARB(JNIEnv * env, jclass clazz, jint p0, jint p1, jint size)
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVertexAttribPointerARB(JNIEnv * env, jclass clazz, jint p0, jint p1, jint size)
 {
 	CHECK_EXISTS(glGetVertexAttribPointervARB)
 	void *address;
@@ -1434,9 +1434,9 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetVertexAttribPointervNV
+ * Method:    glGetVertexAttribPointerNV
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVertexAttribPointervNV(JNIEnv * env, jclass clazz, jint p0, jint p1, jint size)
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVertexAttribPointerNV(JNIEnv * env, jclass clazz, jint p0, jint p1, jint size)
 {
 	CHECK_EXISTS(glGetVertexAttribPointervNV)
 	void *address;
@@ -3670,7 +3670,7 @@
  * Method:    glGetBufferPointervARB
  * Signature: (III)V
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetBufferPointervARB(JNIEnv *env, jclass clazz, jint target, jint pname, jint size)
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetBufferPointerARB(JNIEnv *env, jclass clazz, jint target, jint pname, jint size)
 {
 	CHECK_EXISTS(glGetBufferPointervARB)
 	void *pointer;

Index: org_lwjgl_opengl_GL.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_opengl_GL.h	2 Aug 2003 12:53:25 -0000	1.9
+++ org_lwjgl_opengl_GL.h	2 Aug 2003 13:22:25 -0000	1.10
@@ -850,7 +850,7 @@
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    nglGetTexBumpParameterivATI
- * Signature: (ILjava/nio/FloatBuffer;I)V
+ * Signature: (ILjava/nio/IntBuffer;I)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglGetTexBumpParameterivATI
   (JNIEnv *, jclass, jint, jobject, jint);
@@ -905,10 +905,10 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetVariantPointervEXT
+ * Method:    glGetVariantPointerEXT
  * Signature: (III)Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVariantPointervEXT
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVariantPointerEXT
   (JNIEnv *, jclass, jint, jint, jint);
 
 /*
@@ -945,18 +945,18 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetVertexAttribPointervARB
+ * Method:    glGetVertexAttribPointerARB
  * Signature: (III)Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVertexAttribPointervARB
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVertexAttribPointerARB
   (JNIEnv *, jclass, jint, jint, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetVertexAttribPointervNV
+ * Method:    glGetVertexAttribPointerNV
  * Signature: (III)Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVertexAttribPointervNV
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetVertexAttribPointerNV
   (JNIEnv *, jclass, jint, jint, jint);
 
 /*
@@ -2337,10 +2337,10 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetBufferPointervARB
+ * Method:    glGetBufferPointerARB
  * Signature: (III)Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetBufferPointervARB
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glGetBufferPointerARB
   (JNIEnv *, jclass, jint, jint, jint);
 
 #ifdef __cplusplus

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv15617/src/java/org/lwjgl/test/opengl

Modified Files:
	FullScreenWindowedTest.java Game.java PbufferTest.java 
	VBOTest.java 
Log Message:
Removed superfluous postfixes, fixed examples

Index: FullScreenWindowedTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FullScreenWindowedTest.java	28 Jul 2003 10:09:57 -0000	1.9
+++ FullScreenWindowedTest.java	2 Aug 2003 13:22:24 -0000	1.10
@@ -177,7 +177,7 @@
     GL.glPushMatrix();
     {
       GL.glTranslatef(quadPosition.x, quadPosition.y, 0);
-      GL.glRotated(angle, 0.0f, 0.0f, 1.0f);
+      GL.glRotatef(angle, 0.0f, 0.0f, 1.0f);
       GL.glColor3f(1.0f, 1.0f, 1.0f);
       GL.glBegin(GL.GL_QUADS);
       {

Index: Game.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Game.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Game.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Game.java	18 Jul 2003 19:02:48 -0000	1.15
+++ Game.java	2 Aug 2003 13:22:25 -0000	1.16
@@ -181,7 +181,7 @@
        GL.glViewport(0, 0, Display.getWidth(), Display.getHeight());
          ByteBuffer num_tex_units_buf = ByteBuffer.allocateDirect(4);
          num_tex_units_buf.order(ByteOrder.nativeOrder());
-       GL.glGetIntegerv(GL.GL_MAX_TEXTURE_UNITS_ARB, num_tex_units_buf.asIntBuffer());
+       GL.glGetInteger(GL.GL_MAX_TEXTURE_UNITS_ARB, num_tex_units_buf.asIntBuffer());
          System.out.println("Number of texture units: " + num_tex_units_buf.getInt());
          // Fix the refresh rate to the display frequency.
 //         gl.wglSwapIntervalEXT(1);

Index: PbufferTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PbufferTest.java	28 Jul 2003 10:09:57 -0000	1.6
+++ PbufferTest.java	2 Aug 2003 13:22:25 -0000	1.7
@@ -194,7 +194,7 @@
     GL.glPushMatrix();
     {
       GL.glTranslatef(quadPosition.x, quadPosition.y, 0);
-      GL.glRotated(angle, 0.0f, 0.0f, 1.0f);
+      GL.glRotatef(angle, 0.0f, 0.0f, 1.0f);
       GL.glColor3f(1.0f, 1.0f, 1.0f);
       GL.glBegin(GL.GL_QUADS);
       {
@@ -215,7 +215,7 @@
     GL.glPushMatrix();
     {
       GL.glTranslatef(quadPosition.x, quadPosition.y, 0);
-      GL.glRotated(angle, 0.0f, 0.0f, 1.0f);
+      GL.glRotatef(angle, 0.0f, 0.0f, 1.0f);
       GL.glColor3f(1.0f, 1.0f, 0.0f);
       GL.glBegin(GL.GL_QUADS);
       {

Index: VBOTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VBOTest.java	29 Jul 2003 12:39:50 -0000	1.2
+++ VBOTest.java	2 Aug 2003 13:22:25 -0000	1.3
@@ -194,8 +194,8 @@
 	GL.glBufferDataARB(GL.GL_ARRAY_BUFFER_ARB, 2*4*4, Sys.NULL, GL.GL_STREAM_DRAW_ARB);
 	ByteBuffer index_buffer = Sys.createIndexBuffer(0);
 	GL.glEnableClientState(GL.GL_VERTEX_ARRAY);
-	GL.glVertexPointer(2, GL.GL_FLOAT, 0, index_buffer);
-       GL.glGetIntegerv(GL.GL_MAX_TEXTURE_UNITS_ARB, int_buffer);
+	GL.glVertexPointer(2, 0, index_buffer.asFloatBuffer());
+       GL.glGetInteger(GL.GL_MAX_TEXTURE_UNITS_ARB, int_buffer);
          System.out.println("Number of texture units: " + int_buffer.get(0));
          // Fix the refresh rate to the display frequency.
 //         gl.wglSwapIntervalEXT(1);

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv15617/src/java/org/lwjgl/opengl

Modified Files:
	GL.java 
Log Message:
Removed superfluous postfixes, fixed examples

Index: GL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- GL.java	2 Aug 2003 12:53:24 -0000	1.33
+++ GL.java	2 Aug 2003 13:22:24 -0000	1.34
@@ -183,19 +183,19 @@
 
 	public static native void glCombinerParameterfNV(int pname, float param);
 
-	public static void glCombinerParameterfvNV(int pname, FloatBuffer pfParams) {
+	public static void glCombinerParameterNV(int pname, FloatBuffer pfParams) {
 		nglCombinerParameterfvNV(pname, pfParams, pfParams.position());
 	}
 	private static native void nglCombinerParameterfvNV(int pname, FloatBuffer pfParams, int pfParams_offset);
 
 	public static native void glCombinerParameteriNV(int pname, int param);
 
-	public static void glCombinerParameterivNV(int pname, IntBuffer piParams) {
+	public static void glCombinerParameterNV(int pname, IntBuffer piParams) {
 		nglCombinerParameterivNV(pname, piParams, piParams.position());
 	}
 	private static native void nglCombinerParameterivNV(int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glCombinerStageParameterfvNV(int stage, int pname, FloatBuffer pfParams) {
+	public static void glCombinerStageParameterNV(int stage, int pname, FloatBuffer pfParams) {
 		nglCombinerStageParameterfvNV(stage, pname, pfParams, pfParams.position());
 	}
 	private static native void nglCombinerStageParameterfvNV(int stage, int pname, FloatBuffer pfParams, int pfParams_offset);
@@ -394,37 +394,37 @@
 
 	public static native int glGenVertexShadersEXT(int range);
 
-	public static void glGetArrayObjectfvATI(int array, int pname, FloatBuffer pfParams) {
+	public static void glGetArrayObjectATI(int array, int pname, FloatBuffer pfParams) {
 		nglGetArrayObjectfvATI(array, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetArrayObjectfvATI(int array, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetArrayObjectivATI(int array, int pname, IntBuffer piParams) {
+	public static void glGetArrayObjectATI(int array, int pname, IntBuffer piParams) {
 		nglGetArrayObjectivATI(array, pname, piParams, piParams.position());
 	}
 	private static native void nglGetArrayObjectivATI(int array, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetCombinerInputParameterfvNV(int stage, int portion, int variable, int pname, FloatBuffer pfParams) {
+	public static void glGetCombinerInputParameterNV(int stage, int portion, int variable, int pname, FloatBuffer pfParams) {
 		nglGetCombinerInputParameterfvNV(stage, portion, variable, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetCombinerInputParameterfvNV(int stage, int portion, int variable, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetCombinerInputParameterivNV(int stage, int portion, int variable, int pname, IntBuffer piParams) {
+	public static void glGetCombinerInputParameterNV(int stage, int portion, int variable, int pname, IntBuffer piParams) {
 		nglGetCombinerInputParameterivNV(stage, portion, variable, pname, piParams, piParams.position());
 	}
 	private static native void nglGetCombinerInputParameterivNV(int stage, int portion, int variable, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetCombinerOutputParameterfvNV(int stage, int portion, int pname, FloatBuffer pfParams) {
+	public static void glGetCombinerOutputParameterNV(int stage, int portion, int pname, FloatBuffer pfParams) {
 		nglGetCombinerOutputParameterfvNV(stage, portion, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetCombinerOutputParameterfvNV(int stage, int portion, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetCombinerOutputParameterivNV(int stage, int portion, int pname, IntBuffer piParams) {
+	public static void glGetCombinerOutputParameterNV(int stage, int portion, int pname, IntBuffer piParams) {
 		nglGetCombinerOutputParameterivNV(stage, portion, pname, piParams, piParams.position());
 	}
 	private static native void nglGetCombinerOutputParameterivNV(int stage, int portion, int pname, IntBuffer piParams, int pfParams_offset);
 
-	public static void glGetCombinerStageParameterfvNV(int stage, int pname, FloatBuffer pfParams) {
+	public static void glGetCombinerStageParameterNV(int stage, int pname, FloatBuffer pfParams) {
 		nglGetCombinerStageParameterfvNV(stage, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetCombinerStageParameterfvNV(int stage, int pname, FloatBuffer pfParams, int pfParams_offset);
@@ -440,57 +440,57 @@
 	}
 	private static native void nglGetCompressedTexImageARB(int target, int lod, Buffer pImg, int pImg_offset);
 
-	public static void glGetFenceivNV(int fence, int pname, IntBuffer piParams) {
+	public static void glGetFenceNV(int fence, int pname, IntBuffer piParams) {
 		nglGetFenceivNV(fence, pname, piParams, piParams.position());
 	}
 	private static native void nglGetFenceivNV(int fence, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetFinalCombinerInputParameterfvNV(int variable, int pname, FloatBuffer pfParams) {
+	public static void glGetFinalCombinerInputParameterNV(int variable, int pname, FloatBuffer pfParams) {
 		nglGetFinalCombinerInputParameterfvNV(variable, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetFinalCombinerInputParameterfvNV(int variable, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetFinalCombinerInputParameterivNV(int variable, int pname, IntBuffer piParams) {
+	public static void glGetFinalCombinerInputParameterNV(int variable, int pname, IntBuffer piParams) {
 		nglGetFinalCombinerInputParameterivNV(variable, pname, piParams, piParams.position());
 	}
 	private static native void nglGetFinalCombinerInputParameterivNV(int variable, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetInvariantBooleanvEXT(int id, int value, ByteBuffer pbData) {
+	public static void glGetInvariantBooleanEXT(int id, int value, ByteBuffer pbData) {
 		nglGetInvariantBooleanvEXT(id, value, pbData, pbData.position());
 	}
 	private static native void nglGetInvariantBooleanvEXT(int id, int value, ByteBuffer pbData, int pbData_offset);
 
-	public static void glGetInvariantFloatvEXT(int id, int value, FloatBuffer pfData) {
+	public static void glGetInvariantFloatEXT(int id, int value, FloatBuffer pfData) {
 		nglGetInvariantFloatvEXT(id, value, pfData, pfData.position());
 	}
 	private static native void nglGetInvariantFloatvEXT(int id, int value, FloatBuffer pfData, int pfData_offset);
 
-	public static void glGetInvariantIntegervEXT(int id, int value, IntBuffer piData) {
+	public static void glGetInvariantIntegerEXT(int id, int value, IntBuffer piData) {
 		nglGetInvariantIntegervEXT(id, value, piData, piData.position());
 	}
 	private static native void nglGetInvariantIntegervEXT(int id, int value, IntBuffer piData, int piData_offset);
 
-	public static void glGetLocalConstantBooleanvEXT(int id, int value, ByteBuffer pbData) {
+	public static void glGetLocalConstantBooleanEXT(int id, int value, ByteBuffer pbData) {
 		nglGetLocalConstantBooleanvEXT(id, value, pbData, pbData.position());
 	}
 	private static native void nglGetLocalConstantBooleanvEXT(int id, int value, ByteBuffer pbData, int pbData_offset);
 
-	public static void glGetLocalConstantFloatvEXT(int id, int value, FloatBuffer pfData) {
+	public static void glGetLocalConstantFloatEXT(int id, int value, FloatBuffer pfData) {
 		nglGetLocalConstantFloatvEXT(id, value, pfData, pfData.position());
 	}
 	private static native void nglGetLocalConstantFloatvEXT(int id, int value, FloatBuffer pfData, int pfData_offset);
 
-	public static void glGetLocalConstantIntegervEXT(int id, int value, IntBuffer piData) {
+	public static void glGetLocalConstantIntegerEXT(int id, int value, IntBuffer piData) {
 		nglGetLocalConstantIntegervEXT(id, value, piData, piData.position());
 	}	
 	private static native void nglGetLocalConstantIntegervEXT(int id, int value, IntBuffer piData, int piData_offset);
 
-	public static void glGetMapAttribParameterfvNV(int target, int index, int pname, FloatBuffer pfParams) {
+	public static void glGetMapAttribParameterNV(int target, int index, int pname, FloatBuffer pfParams) {
 		nglGetMapAttribParameterfvNV(target, index, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetMapAttribParameterfvNV(int target, int index, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetMapAttribParameterivNV(int target, int index, int pname, IntBuffer piParams) {
+	public static void glGetMapAttribParameterNV(int target, int index, int pname, IntBuffer piParams) {
 		nglGetMapAttribParameterivNV(target, index, pname, piParams, piParams.position());
 	}
 	private static native void nglGetMapAttribParameterivNV(int target, int index, int pname, IntBuffer piParams, int piParams_offset);
@@ -500,57 +500,57 @@
 	}
 	private static native void nglGetMapControlPointsNV(int target, int index, int type, int ustride, int vstride, boolean packed, Buffer pPoints, int pPoints_offset);
 
-	public static void glGetMapParameterfvNV(int target, int pname, FloatBuffer pfParams) {
+	public static void glGetMapParameterNV(int target, int pname, FloatBuffer pfParams) {
 		nglGetMapParameterfvNV(target, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetMapParameterfvNV(int target, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetMapParameterivNV(int target, int pname, IntBuffer piParams) {
+	public static void glGetMapParameterNV(int target, int pname, IntBuffer piParams) {
 		nglGetMapParameterivNV(target, pname, piParams, piParams.position());
 	}
 	private static native void nglGetMapParameterivNV(int target, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetObjectBufferfvATI(int buffer, int pname, FloatBuffer pfParams) {
+	public static void glGetObjectBufferATI(int buffer, int pname, FloatBuffer pfParams) {
 		nglGetObjectBufferfvATI(buffer, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetObjectBufferfvATI(int buffer, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetObjectBufferivATI(int buffer, int pname, IntBuffer piParams) {
+	public static void glGetObjectBufferATI(int buffer, int pname, IntBuffer piParams) {
 		nglGetObjectBufferivATI(buffer, pname, piParams, piParams.position());
 	}
 	private static native void nglGetObjectBufferivATI(int buffer, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetOcclusionQueryivNV(int id, int pname, IntBuffer piParams) {
+	public static void glGetOcclusionQueryNV(int id, int pname, IntBuffer piParams) {
 		nglGetOcclusionQueryivNV(id, pname, piParams, piParams.position());
 	}
 	private static native void nglGetOcclusionQueryivNV(int id, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetOcclusionQueryuivNV(int id, int pname, IntBuffer piParams) {
+	public static void glGetOcclusionQueryuNV(int id, int pname, IntBuffer piParams) {
 		nglGetOcclusionQueryuivNV(id, pname, piParams, piParams.position());
 	}
 	private static native void nglGetOcclusionQueryuivNV(int id, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetProgramEnvParameterfvARB(int target, int index, FloatBuffer pfParams) {
+	public static void glGetProgramEnvParameterARB(int target, int index, FloatBuffer pfParams) {
 		nglGetProgramEnvParameterfvARB(target, index, pfParams, pfParams.position());
 	}
 	private static native void nglGetProgramEnvParameterfvARB(int target, int index, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetProgramivARB(int target, int pname, IntBuffer piParams) {
+	public static void glGetProgramARB(int target, int pname, IntBuffer piParams) {
 		nglGetProgramivARB(target, pname, piParams, piParams.position());
 	}
 	private static native void nglGetProgramivARB(int target, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetProgramivNV(int id, int pname, IntBuffer piParams) {
+	public static void glGetProgramNV(int id, int pname, IntBuffer piParams) {
 		nglGetProgramivNV(id, pname, piParams, piParams.position());
 	}
 	private static native void nglGetProgramivNV(int id, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetProgramLocalParameterfvARB(int target, int index, FloatBuffer pfParams) {
+	public static void glGetProgramLocalParameterARB(int target, int index, FloatBuffer pfParams) {
 		nglGetProgramLocalParameterfvARB(target, index, pfParams, pfParams.position());
 	}
 	private static native void nglGetProgramLocalParameterfvARB(int target, int index, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetProgramParameterfvNV(int target, int index, int pname, FloatBuffer pfParams) {
+	public static void glGetProgramParameterNV(int target, int index, int pname, FloatBuffer pfParams) {
 		nglGetProgramParameterfvNV(target, index, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetProgramParameterfvNV(int target, int index, int pname, FloatBuffer pfParams, int pfParams_offset);
@@ -565,74 +565,74 @@
 	}
 	private static native void nglGetProgramStringNV(int id, int pname, ByteBuffer pProgram, int pProgram_offset);
 
-	public static void glGetTexBumpParameterfvATI(int pname, FloatBuffer pfParam) {
+	public static void glGetTexBumpParameterATI(int pname, FloatBuffer pfParam) {
 		nglGetTexBumpParameterfvATI(pname, pfParam, pfParam.position());
 	}
 	private static native void nglGetTexBumpParameterfvATI(int pname, FloatBuffer pfParam, int pfParam_offset);
 
-	public static void glGetTexBumpParameterivATI(int pname, FloatBuffer piParam) {
+	public static void glGetTexBumpParameterATI(int pname, IntBuffer piParam) {
 		nglGetTexBumpParameterivATI(pname, piParam, piParam.position());
 	}
-	private static native void nglGetTexBumpParameterivATI(int pname, FloatBuffer piParam, int piParam_offset);
+	private static native void nglGetTexBumpParameterivATI(int pname, IntBuffer piParam, int piParam_offset);
 
-	public static void glGetTrackMatrixivNV(int target, int address, int pname, IntBuffer piParams) {
+	public static void glGetTrackMatrixNV(int target, int address, int pname, IntBuffer piParams) {
 		nglGetTrackMatrixivNV(target, address, pname, piParams, piParams.position());
 	}
 	private static native void nglGetTrackMatrixivNV(int target, int address, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetVariantArrayObjectfvATI(int id, int pname, FloatBuffer pfParams) {
+	public static void glGetVariantArrayObjectATI(int id, int pname, FloatBuffer pfParams) {
 		nglGetVariantArrayObjectfvATI(id, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetVariantArrayObjectfvATI(int id, int pname, FloatBuffer pfParams, int pfParams_offset_offset);
 
-	public static void glGetVariantArrayObjectivATI(int id, int pname, IntBuffer piParams) {
+	public static void glGetVariantArrayObjectATI(int id, int pname, IntBuffer piParams) {
 		nglGetVariantArrayObjectivATI(id, pname, piParams, piParams.position());
 	}
 	private static native void nglGetVariantArrayObjectivATI(int id, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetVariantBooleanvEXT(int id, int value, ByteBuffer pbData) {
+	public static void glGetVariantBooleanEXT(int id, int value, ByteBuffer pbData) {
 		nglGetVariantBooleanvEXT(id, value, pbData, pbData.position());
 	}
 	private static native void nglGetVariantBooleanvEXT(int id, int value, ByteBuffer pbData, int pbData_offset);
 
-	public static void glGetVariantFloatvEXT(int id, int value, FloatBuffer pfData) {
+	public static void glGetVariantFloatEXT(int id, int value, FloatBuffer pfData) {
 		nglGetVariantFloatvEXT(id, value, pfData, pfData.position());
 	}
 	private static native void nglGetVariantFloatvEXT(int id, int value, FloatBuffer pfData, int pfData_offset);
 
-	public static void glGetVariantIntegervEXT(int id, int value, IntBuffer piData) {
+	public static void glGetVariantIntegerEXT(int id, int value, IntBuffer piData) {
 		nglGetVariantIntegervEXT(id, value, piData, piData.position());
 	}
 	private static native void nglGetVariantIntegervEXT(int id, int value, IntBuffer piData, int piData_offset);
 
-	public static native ByteBuffer glGetVariantPointervEXT(int id, int value, int size);
+	public static native ByteBuffer glGetVariantPointerEXT(int id, int value, int size);
 
-	public static void glGetVertexAttribfvARB(int index, int pname, FloatBuffer pfParams) {
+	public static void glGetVertexAttribARB(int index, int pname, FloatBuffer pfParams) {
 		nglGetVertexAttribfvARB(index, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetVertexAttribfvARB(int index, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetVertexAttribfvNV(int index, int pname, FloatBuffer pfParams) {
+	public static void glGetVertexAttribNV(int index, int pname, FloatBuffer pfParams) {
 		nglGetVertexAttribfvNV(index, pname, pfParams, pfParams.position());
 	}
 	private static native void nglGetVertexAttribfvNV(int index, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glGetVertexAttribivARB(int index, int pname, IntBuffer piParams) {
+	public static void glGetVertexAttribARB(int index, int pname, IntBuffer piParams) {
 		nglGetVertexAttribivARB(index, pname, piParams, piParams.position());
 	}
 	private static native void nglGetVertexAttribivARB(int index, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static void glGetVertexAttribivNV(int index, int pname, IntBuffer piParams) {
+	public static void glGetVertexAttribNV(int index, int pname, IntBuffer piParams) {
 		nglGetVertexAttribivNV(index, pname, piParams, piParams.position());
 	}
 	private static native void nglGetVertexAttribivNV(int index, int pname, IntBuffer piParams, int piParams_offset);
 
-	public static native ByteBuffer glGetVertexAttribPointervARB(
+	public static native ByteBuffer glGetVertexAttribPointerARB(
 		int index,
 		int pname,
 		int size);
 
-	public static native ByteBuffer glGetVertexAttribPointervNV(
+	public static native ByteBuffer glGetVertexAttribPointerNV(
 		int index,
 		int pname,
 		int size);
@@ -670,12 +670,12 @@
 	}
 	private static native void nglMapControlPointsNV(int target, int index, int type, int ustride, int vstride, int uorder, int vorder, boolean packed, Buffer pPoints, int pPoints_offset);
 
-	public static void glMapParameterfvNV(int target, int pname, FloatBuffer pfParams) {
+	public static void glMapParameterNV(int target, int pname, FloatBuffer pfParams) {
 		nglMapParameterfvNV(target, pname, pfParams, pfParams.position());
 	}
 	private static native void nglMapParameterfvNV(int target, int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glMapParameterivNV(int target, int pname, IntBuffer piParams) {
+	public static void glMapParameterNV(int target, int pname, IntBuffer piParams) {
 		nglMapParameterivNV(target, pname, piParams, piParams.position());
 	}
 	private static native void nglMapParameterivNV(int target, int pname, IntBuffer piParams, int piParams_offset);
@@ -691,17 +691,17 @@
 	}
 	private static native void nglMatrixIndexPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_offset);
 
-	public static void glMatrixIndexubvARB(int size, ByteBuffer pIndices) {
+	public static void glMatrixIndexuARB(int size, ByteBuffer pIndices) {
 		nglMatrixIndexubvARB(size, pIndices, pIndices.position());
 	}
 	private static native void nglMatrixIndexubvARB(int size, ByteBuffer pIndices, int pIndices_offset);
 
-	public static void glMatrixIndexuivARB(int size, IntBuffer piIndices) {
+	public static void glMatrixIndexuARB(int size, IntBuffer piIndices) {
 		nglMatrixIndexuivARB(size, piIndices, piIndices.position());
 	}
 	private static native void nglMatrixIndexuivARB(int size, IntBuffer piIndices, int piIndices_offset);
 
-	public static void glMatrixIndexusvARB(int size, ShortBuffer psIndices) {
+	public static void glMatrixIndexuARB(int size, ShortBuffer psIndices) {
 		nglMatrixIndexusvARB(size, psIndices, psIndices.position());
 	}
 	private static native void nglMatrixIndexusvARB(int size, ShortBuffer psIndices, int psIndices_offset);
@@ -797,19 +797,19 @@
 
 	public static native void glPointParameterfEXT(int pname, float param);
 
-	public static void glPointParameterfvARB(int pname, FloatBuffer pfParams) {
+	public static void glPointParameterARB(int pname, FloatBuffer pfParams) {
 		nglPointParameterfvARB(pname, pfParams, pfParams.position());
 	}
 	private static native void nglPointParameterfvARB(int pname, FloatBuffer pfParams, int pfParams_offset);
 
-	public static void glPointParameterfvEXT(int pname, FloatBuffer pfParams) {
+	public static void glPointParameterEXT(int pname, FloatBuffer pfParams) {
 		nglPointParameterfvEXT(pname, pfParams, pfParams.position());
 	}
 	private static native void nglPointParameterfvEXT(int pname, FloatBuffer pfParams, int pfParams_offset);
 
 	public static native void glPointParameteriNV(int pname, int param);
 
-	public static void glPointParameterivNV(int pname, IntBuffer piParams) {
+	public static void glPointParameterNV(int pname, IntBuffer piParams) {
 		nglPointParameterivNV(pname, piParams, piParams.position());
 	}
 	private static native void nglPointParameterivNV(int pname, IntBuffer piParams, int piParams_offset);
@@ -838,7 +838,7 @@
 		float z,
 		float w);
 
-	public static void glProgramParameters4fvNV(int target, int index, int num, FloatBuffer pfParams) {
+	public static void glProgramParameters4NV(int target, int index, int num, FloatBuffer pfParams) {
 		nglProgramParameters4fvNV(target, index, num, pfParams, pfParams.position());
 	}
 	private static native void nglProgramParameters4fvNV(int target, int index, int num, FloatBuffer pfParams, int pfParams_offset);
@@ -927,12 +927,12 @@
 
 	public static native boolean glTestFenceNV(int fence);
 
-	public static void glTexBumpParameterfvATI(int pname, FloatBuffer pfParam) {
+	public static void glTexBumpParameterATI(int pname, FloatBuffer pfParam) {
 		nglTexBumpParameterfvATI(pname, pfParam, pfParam.position());
 	}
 	private static native void nglTexBumpParameterfvATI(int pname, FloatBuffer pfParam, int pfParam_offset);
 
-	public static void glTexBumpParameterivATI(int pname, IntBuffer piParam) {
+	public static void glTexBumpParameterATI(int pname, IntBuffer piParam) {
 		nglTexBumpParameterivATI(pname, piParam, piParam.position());
 	}
 	private static native void nglTexBumpParameterivATI(int pname, IntBuffer piParam, int piParam_offset);
@@ -966,17 +966,17 @@
 		int buffer,
 		int offset);
 
-	public static void glVariantbvEXT(int id, ByteBuffer pAddr) {
+	public static void glVariantEXT(int id, ByteBuffer pAddr) {
 		nglVariantbvEXT(id, pAddr, pAddr.position());
 	}
 	private static native void nglVariantbvEXT(int id, ByteBuffer pAddr, int pAddr_offset);
 
-	public static void glVariantfvEXT(int id, FloatBuffer pfAddr) {
+	public static void glVariantEXT(int id, FloatBuffer pfAddr) {
 		nglVariantfvEXT(id, pfAddr, pfAddr.position());
 	}
 	private static native void nglVariantfvEXT(int id, FloatBuffer pfAddr, int pfAddr_offset);
 
-	public static void glVariantivEXT(int id, IntBuffer piAddr) {
+	public static void glVariantEXT(int id, IntBuffer piAddr) {
 		nglVariantivEXT(id, piAddr, piAddr.position());
 	}
 	private static native void nglVariantivEXT(int id, IntBuffer piAddr, int piAddr_offset);
@@ -995,22 +995,22 @@
 	}
 	private static native void nglVariantPointerEXT(int id, int type, int stride, Buffer pAddr, int pAddr_offset);
 
-	public static void glVariantsvEXT(int id, ShortBuffer psAddr) {
+	public static void glVariantEXT(int id, ShortBuffer psAddr) {
 		nglVariantsvEXT(id, psAddr, psAddr.position());
 	}
 	private static native void nglVariantsvEXT(int id, ShortBuffer psAddr, int psAddr_offset);
 
-	public static void glVariantubvEXT(int id, ByteBuffer pAddr) {
+	public static void glVariantuEXT(int id, ByteBuffer pAddr) {
 		nglVariantubvEXT(id, pAddr, pAddr.position());
 	}
 	private static native void nglVariantubvEXT(int id, ByteBuffer pAddr, int pAddr_offset);
 
-	public static void glVariantuivEXT(int id, IntBuffer piAddr) {
+	public static void glVariantuEXT(int id, IntBuffer piAddr) {
 		nglVariantuivEXT(id, piAddr, piAddr.position());
 	}
 	private static native void nglVariantuivEXT(int id, IntBuffer piAddr, int piAddr_offset);
 
-	public static void glVariantusvEXT(int id, ShortBuffer psAddr) {
+	public static void glVariantuEXT(int id, ShortBuffer psAddr) {
 		nglVariantusvEXT(id, psAddr, psAddr.position());
 	}
 	private static native void nglVariantusvEXT(int id, ShortBuffer psAddr, int psAddr_offset);
@@ -1044,7 +1044,7 @@
 
 	public static native void glVertexAttrib3sNV(int index, short x, short y, short z);
 
-	public static void glVertexAttrib4bvARB(int index, ByteBuffer pV) {
+	public static void glVertexAttrib4ARB(int index, ByteBuffer pV) {
 		nglVertexAttrib4bvARB(index, pV, pV.position());
 	}
 	private static native void nglVertexAttrib4bvARB(int index, ByteBuffer pV, int pV_offset);
@@ -1063,22 +1063,22 @@
 		float z,
 		float w);
 
-	public static void glVertexAttrib4ivARB(int index, IntBuffer piV) {
+	public static void glVertexAttrib4ARB(int index, IntBuffer piV) {
 		nglVertexAttrib4ivARB(index, piV, piV.position());
 	}
 	private static native void nglVertexAttrib4ivARB(int index, IntBuffer piV, int piV_offset);
 
-	public static void glVertexAttrib4NbvARB(int index, ByteBuffer pV) {
+	public static void glVertexAttrib4NARB(int index, ByteBuffer pV) {
 		nglVertexAttrib4NbvARB(index, pV, pV.position());
 	}
 	private static native void nglVertexAttrib4NbvARB(int index, ByteBuffer pV, int pV_offset);
 
-	public static void glVertexAttrib4NivARB(int index, IntBuffer piV) {
+	public static void glVertexAttrib4NARB(int index, IntBuffer piV) {
 		nglVertexAttrib4NivARB(index, piV, piV.position());
 	}
 	private static native void nglVertexAttrib4NivARB(int index, IntBuffer piV, int piV_offset);
 
-	public static void glVertexAttrib4NsvARB(int index, ShortBuffer psV) {
+	public static void glVertexAttrib4NARB(int index, ShortBuffer psV) {
 		nglVertexAttrib4NsvARB(index, psV, psV.position());
 	}
 	private static native void nglVertexAttrib4NsvARB(int index, ShortBuffer psV, int psV_offset);
@@ -1090,17 +1090,17 @@
 		byte z,
 		byte w);
 
-	public static void glVertexAttrib4NubvARB(int index, ByteBuffer pV) {
+	public static void glVertexAttrib4NuARB(int index, ByteBuffer pV) {
 		nglVertexAttrib4NubvARB(index, pV, pV.position());
 	}
 	private static native void nglVertexAttrib4NubvARB(int index, ByteBuffer pV, int pV_offset);
 
-	public static void glVertexAttrib4NuivARB(int index, IntBuffer piV) {
+	public static void glVertexAttrib4NuARB(int index, IntBuffer piV) {
 		nglVertexAttrib4NuivARB(index, piV, piV.position());
 	}
 	private static native void nglVertexAttrib4NuivARB(int index, IntBuffer piV, int piV_offset);
 
-	public static void glVertexAttrib4NusvARB(int index, ShortBuffer psV) {
+	public static void glVertexAttrib4NuARB(int index, ShortBuffer psV) {
 		nglVertexAttrib4NusvARB(index, psV, psV.position());
 	}
 	private static native void nglVertexAttrib4NusvARB(int index, ShortBuffer psV, int psV_offset);
@@ -1126,22 +1126,22 @@
 		byte z,
 		byte w);
 
-	public static void glVertexAttrib4ubvARB(int index, ByteBuffer pV) {
+	public static void glVertexAttrib4uARB(int index, ByteBuffer pV) {
 		nglVertexAttrib4ubvARB(index, pV, pV.position());
 	}
 	private static native void nglVertexAttrib4ubvARB(int index, ByteBuffer pV, int pV_offset);
 
-	public static void glVertexAttrib4ubvNV(int index, ByteBuffer pV) {
+	public static void glVertexAttrib4uNV(int index, ByteBuffer pV) {
 		nglVertexAttrib4ubvNV(index, pV, pV.position());
 	}
 	private static native void nglVertexAttrib4ubvNV(int index, ByteBuffer pV, int pV_offset);
 
-	public static void glVertexAttrib4uivARB(int index, IntBuffer piV) {
+	public static void glVertexAttrib4uARB(int index, IntBuffer piV) {
 		nglVertexAttrib4uivARB(index, piV, piV.position());
 	}
 	private static native void nglVertexAttrib4uivARB(int index, IntBuffer piV, int piV_offset);
 
-	public static void glVertexAttrib4usvARB(int index, ShortBuffer psV) {
+	public static void glVertexAttrib4uARB(int index, ShortBuffer psV) {
 		nglVertexAttrib4usvARB(index, psV, psV.position());
 	}
 	private static native void nglVertexAttrib4usvARB(int index, ShortBuffer psV, int psV_offset);
@@ -1174,47 +1174,47 @@
 	}
 	private static native void nglVertexAttribPointerNV(int index, int size, int type, int stride, Buffer pPointer, int pPointer_offset);
 
-	public static void glVertexAttribs1fvNV(int index, int n, FloatBuffer pfV) {
+	public static void glVertexAttribs1NV(int index, int n, FloatBuffer pfV) {
 		nglVertexAttribs1fvNV(index, n, pfV, pfV.position());
 	}
 	private static native void nglVertexAttribs1fvNV(int index, int n, FloatBuffer pfV, int pfV_offset);
 
-	public static void glVertexAttribs1svNV(int index, int n, ShortBuffer psV) {
+	public static void glVertexAttribs1NV(int index, int n, ShortBuffer psV) {
 		nglVertexAttribs1svNV(index, n, psV, psV.position());
 	}
 	private static native void nglVertexAttribs1svNV(int index, int n, ShortBuffer psV, int psV_offset);
 
-	public static void glVertexAttribs2fvNV(int index, int n, FloatBuffer pfV) {
+	public static void glVertexAttribs2NV(int index, int n, FloatBuffer pfV) {
 		nglVertexAttribs2fvNV(index, n, pfV, pfV.position());
 	}
 	private static native void nglVertexAttribs2fvNV(int index, int n, FloatBuffer pfV, int pfV_offset);
 
-	public static void glVertexAttribs2svNV(int index, int n, ShortBuffer psV) {
+	public static void glVertexAttribs2NV(int index, int n, ShortBuffer psV) {
 		nglVertexAttribs2svNV(index, n, psV, psV.position());
 	}
 	private static native void nglVertexAttribs2svNV(int index, int n, ShortBuffer psV, int psV_offset);
 
-	public static void glVertexAttribs3fvNV(int index, int n, FloatBuffer pfV) {
+	public static void glVertexAttribs3NV(int index, int n, FloatBuffer pfV) {
 		nglVertexAttribs3fvNV(index, n, pfV, pfV.position());
 	}
 	private static native void nglVertexAttribs3fvNV(int index, int n, FloatBuffer pfV, int pfV_offset);
 
-	public static void glVertexAttribs3svNV(int index, int n, ShortBuffer psV) {
+	public static void glVertexAttribs3NV(int index, int n, ShortBuffer psV) {
 		nglVertexAttribs3svNV(index, n, psV, psV.position());
 	}
 	private static native void nglVertexAttribs3svNV(int index, int n, ShortBuffer psV, int psV_offset);
 
-	public static void glVertexAttribs4fvNV(int index, int n, FloatBuffer pfV) {
+	public static void glVertexAttribs4NV(int index, int n, FloatBuffer pfV) {
 		nglVertexAttribs4fvNV(index, n, pfV, pfV.position());
 	}
 	private static native void nglVertexAttribs4fvNV(int index, int n, FloatBuffer pfV, int pfV_offset);
 
-	public static void glVertexAttribs4svNV(int index, int n, ShortBuffer psV) {
+	public static void glVertexAttribs4NV(int index, int n, ShortBuffer psV) {
 		nglVertexAttribs4svNV(index, n, psV, psV.position());
 	}
 	private static native void nglVertexAttribs4svNV(int index, int n, ShortBuffer psV, int psV_offset);
 
-	public static void glVertexAttribs4ubvNV(int index, int n, ByteBuffer pV) {
+	public static void glVertexAttribs4uNV(int index, int n, ByteBuffer pV) {
 		nglVertexAttribs4ubvNV(index, n, pV, pV.position());
 	}
 	private static native void nglVertexAttribs4ubvNV(int index, int n, ByteBuffer pV, int pV_offset);
@@ -1265,17 +1265,17 @@
 	}
 	private static native void nglVertexWeightPointerEXT(int size, int type, int stride, Buffer pPointer, int pPointer_offset);
 
-	public static void glWeightbvARB(int size, ByteBuffer pWeights) {
+	public static void glWeightARB(int size, ByteBuffer pWeights) {
 		nglWeightbvARB(size, pWeights, pWeights.position());
 	}
 	private static native void nglWeightbvARB(int size, ByteBuffer pWeights, int pWeights_offset);
 
-	public static void glWeightfvARB(int size, FloatBuffer pfWeights) {
+	public static void glWeightARB(int size, FloatBuffer pfWeights) {
 		nglWeightfvARB(size, pfWeights, pfWeights.position());
 	}
 	private static native void nglWeightfvARB(int size, FloatBuffer pfWeights, int pfWeights_offset);
 
-	public static void glWeightivARB(int size, IntBuffer piWeights) {
+	public static void glWeightARB(int size, IntBuffer piWeights) {
 		nglWeightivARB(size, piWeights, piWeights.position());
 	}
 	private static native void nglWeightivARB(int size, IntBuffer piWeights, int piWeights_offset);
@@ -1294,22 +1294,22 @@
 	}
 	private static native void nglWeightPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_offset);
 
-	public static void glWeightsvARB(int size, ShortBuffer psWeights) {
+	public static void glWeightARB(int size, ShortBuffer psWeights) {
 		nglWeightsvARB(size, psWeights, psWeights.position());
 	}
 	private static native void nglWeightsvARB(int size, ShortBuffer psWeights, int psWeights_offset);
 
-	public static void glWeightubvARB(int size, ByteBuffer pWeights) {
+	public static void glWeightuARB(int size, ByteBuffer pWeights) {
 		nglWeightubvARB(size, pWeights, pWeights.position());
 	}
 	private static native void nglWeightubvARB(int size, ByteBuffer pWeights, int pWeights_offset);
 
-	public static void glWeightuivARB(int size, IntBuffer piWeights) {
+	public static void glWeightuARB(int size, IntBuffer piWeights) {
 		nglWeightuivARB(size, piWeights, piWeights.position());
 	}
 	private static native void nglWeightuivARB(int size, IntBuffer piWeights, int piWeights_offset);
 
-	public static void glWeightusvARB(int size, ShortBuffer psWeights) {
+	public static void glWeightuARB(int size, ShortBuffer psWeights) {
 		nglWeightusvARB(size, psWeights, psWeights.position());
 	}
 	private static native void nglWeightusvARB(int size, ShortBuffer psWeights, int psWeights_offset);
@@ -1510,9 +1510,9 @@
 	 */
 	public static native ByteBuffer glMapBufferARB(int target, int access, int size, ByteBuffer oldBuffer);
 	public static native boolean glUnmapBufferARB(int target);
-	public static void glGetBufferParameterivARB(int target, int pname, IntBuffer params) {
+	public static void glGetBufferParameterARB(int target, int pname, IntBuffer params) {
 		nglGetBufferParameterivARB(target, pname, params, params.position());
 	}
 	private static native void nglGetBufferParameterivARB(int target, int pname, IntBuffer params, int params_offset);
-	public static native ByteBuffer glGetBufferPointervARB(int target, int pname, int size);
+	public static native ByteBuffer glGetBufferPointerARB(int target, int pname, int size);
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv11906/src/native/common

Modified Files:
	Makefile.am org_lwjgl_opengl_CoreGL11.cpp 
	org_lwjgl_opengl_CoreGL11.h org_lwjgl_opengl_CoreGL14.h 
	org_lwjgl_opengl_GL.cpp org_lwjgl_opengl_GL.h 
	org_lwjgl_opengl_GLCaps.h org_lwjgl_opengl_GLU.cpp 
	org_lwjgl_opengl_GLU.h 
Log Message:
Converted GL native

Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	25 Jul 2003 13:09:33 -0000	1.7
+++ Makefile.am	2 Aug 2003 12:53:25 -0000	1.8
@@ -1,14 +1,14 @@
-SUBDIRS = callbacks
+#SUBDIRS = callbacks
 
 noinst_LTLIBRARIES = libcommon.la
 
 libcommon_la_SOURCES = $(COMMON)
 libcommon_la_CPPFLAGS = -D_DEBUG
 
-libcommon_la_LIBADD = \
-  callbacks/libcallbacks.la
-libcommon_la_DEPENDENCIES = \
-  callbacks/libcallbacks.la
+#libcommon_la_LIBADD = \
+#  callbacks/libcallbacks.la
+#libcommon_la_DEPENDENCIES = \
+#  callbacks/libcallbacks.la
 
 COMMON = \
   extal.cpp \

Index: org_lwjgl_opengl_CoreGL11.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_CoreGL11.cpp	2 Aug 2003 10:55:32 -0000	1.3
+++ org_lwjgl_opengl_CoreGL11.cpp	2 Aug 2003 12:53:25 -0000	1.4
@@ -1088,7 +1088,7 @@
  * Class:     org_lwjgl_opengl_CoreGL11
  * Method:    glMapGrid1f
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglMapGrid1f(JNIEnv * env, jclass clazz, jint p0, jfloat p1, jfloat p2)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glMapGrid1f(JNIEnv * env, jclass clazz, jint p0, jfloat p1, jfloat p2)
 {
 	glMapGrid1f((GLint) p0, (GLfloat) p1, (GLfloat) p2);
 	CHECK_GL_ERROR
@@ -1099,7 +1099,7 @@
  * Class:     org_lwjgl_opengl_CoreGL11
  * Method:    glMapGrid2f
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglMapGrid2f(JNIEnv * env, jclass clazz, jint p0, jfloat p1, jfloat p2, jint p3, jfloat p4, jfloat p5)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glMapGrid2f(JNIEnv * env, jclass clazz, jint p0, jfloat p1, jfloat p2, jint p3, jfloat p4, jfloat p5)
 {
 	glMapGrid2f((GLint) p0, (GLfloat) p1, (GLfloat) p2, (GLint) p3, (GLfloat) p4, (GLfloat) p5);
 	CHECK_GL_ERROR
@@ -1940,9 +1940,9 @@
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
- * Method:    glTexGenfv
+ * Method:    nglTexGenfv
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGenfv(JNIEnv * env, jclass clazz, jint p0, jint p1, jobject buffer, jint offset)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGenfv(JNIEnv * env, jclass clazz, jint p0, jint p1, jobject buffer, jint offset)
 {
 	const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer);
 	glTexGenfv((GLint) p0, (GLint) p1, address);

Index: org_lwjgl_opengl_CoreGL11.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_CoreGL11.h	2 Aug 2003 10:55:32 -0000	1.4
+++ org_lwjgl_opengl_CoreGL11.h	2 Aug 2003 12:53:25 -0000	1.5
@@ -129,11 +129,11 @@
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
- * Method:    glDeleteTextures
- * Signature: (ILjava/nio/IntBuffer;)V
+ * Method:    nglDeleteTextures
+ * Signature: (ILjava/nio/IntBuffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glDeleteTextures
-  (JNIEnv *, jclass, jint, jobject);
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglDeleteTextures
+  (JNIEnv *, jclass, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
@@ -1110,14 +1110,6 @@
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glNormal3i
   (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     org_lwjgl_opengl_CoreGL11
- * Method:    glNormal3s
- * Signature: (SSS)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glNormal3s
-  (JNIEnv *, jclass, jshort, jshort, jshort);
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11

Index: org_lwjgl_opengl_CoreGL14.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL14.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL14.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_CoreGL14.h	2 Aug 2003 10:55:32 -0000	1.5
+++ org_lwjgl_opengl_CoreGL14.h	2 Aug 2003 12:53:25 -0000	1.6
@@ -41,10 +41,10 @@
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL14
- * Method:    nglPointParameter
+ * Method:    nglPointParameterfv
  * Signature: (ILjava/nio/FloatBuffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_nglPointParameter
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_nglPointParameterfv
   (JNIEnv *, jclass, jint, jobject, jint);
 
 /*

Index: org_lwjgl_opengl_GL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- org_lwjgl_opengl_GL.cpp	29 Jul 2003 12:29:32 -0000	1.11
+++ org_lwjgl_opengl_GL.cpp	2 Aug 2003 12:53:25 -0000	1.12
@@ -111,14 +111,14 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glAreProgramsResidentNV
+ * Method:    nglAreProgramsResidentNV
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GL_glAreProgramsResidentNV(JNIEnv * env, jclass clazz, jint p0, jobject buffer, jobject buffer2)
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GL_nglAreProgramsResidentNV(JNIEnv * env, jclass clazz, jint p0, jobject buffer, jint buffer_offset, jobject buffer2, jint buffer2_offset)
 {
 	CHECK_EXISTS(glAreProgramsResidentNV)
 	const GLuint *address = (const GLuint *)env->GetDirectBufferAddress(buffer);
[...2761 lines suppressed...]
 	CHECK_GL_ERROR
 }
 
@@ -4096,13 +3655,13 @@
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    glGetBufferParameterivARB
- * Signature: (III)V
+ * Signature: n(III)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glGetBufferParameterivARB(JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglGetBufferParameterivARB(JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint buffer_offset)
 {
 	CHECK_EXISTS(glGetBufferParameterivARB)
 	GLint *address = (GLint *)env->GetDirectBufferAddress(buffer);
-	glGetBufferParameterivARB((GLenum)target, (GLenum)pname, address);
+	glGetBufferParameterivARB((GLenum)target, (GLenum)pname, address + buffer_offset);
 	CHECK_GL_ERROR
 }
 

Index: org_lwjgl_opengl_GL.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_opengl_GL.h	2 Aug 2003 10:55:32 -0000	1.8
+++ org_lwjgl_opengl_GL.h	2 Aug 2003 12:53:25 -0000	1.9
@@ -1098,10 +1098,10 @@
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    nglMultiDrawArraysEXT
- * Signature: (ILjava/nio/IntBuffer;ILjava/nio/IntBuffer;I)V
+ * Signature: (ILjava/nio/IntBuffer;ILjava/nio/IntBuffer;II)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglMultiDrawArraysEXT
-  (JNIEnv *, jclass, jint, jobject, jint, jobject, jint);
+  (JNIEnv *, jclass, jint, jobject, jint, jobject, jint, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GL
@@ -2121,11 +2121,11 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    nglXFreeMemoryNV
- * Signature: (Ljava/nio/ByteBuffer;I)V
+ * Method:    glXFreeMemoryNV
+ * Signature: (Ljava/nio/ByteBuffer;)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglXFreeMemoryNV
-  (JNIEnv *, jclass, jobject, jint);
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glXFreeMemoryNV
+  (JNIEnv *, jclass, jobject);
 
 /*
  * Class:     org_lwjgl_opengl_GL
@@ -2305,11 +2305,11 @@
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetBufferSubDataARB
- * Signature: (IIILjava/nio/Buffer;)V
+ * Method:    nglGetBufferSubDataARB
+ * Signature: (IIILjava/nio/Buffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glGetBufferSubDataARB
-  (JNIEnv *, jclass, jint, jint, jint, jobject);
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglGetBufferSubDataARB
+  (JNIEnv *, jclass, jint, jint, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GL

Index: org_lwjgl_opengl_GLCaps.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLCaps.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLCaps.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_GLCaps.h	2 Aug 2003 10:55:32 -0000	1.2
+++ org_lwjgl_opengl_GLCaps.h	2 Aug 2003 12:53:25 -0000	1.3
@@ -7,7 +7,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: GL_ARB_imaging */
 /* Inaccessible static: GL_ARB_depth_texture */
 /* Inaccessible static: GL_ARB_matrix_palette */
@@ -109,7 +108,7 @@
 /* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GLCaps */
 /*
  * Class:     org_lwjgl_opengl_GLCaps
- * Method:    isWGLEXTExtensionsStringAvaiable
+ * Method:    isWGLEXTExtensionsStringAvailable
  * Signature: ()Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLEXTExtensionsStringAvailable
@@ -117,7 +116,7 @@
 
 /*
  * Class:     org_lwjgl_opengl_GLCaps
- * Method:    isWGLARBExtensionsStringAvaiable
+ * Method:    isWGLARBExtensionsStringAvailable
  * Signature: ()Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLARBExtensionsStringAvailable

Index: org_lwjgl_opengl_GLU.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_opengl_GLU.cpp	2 Aug 2003 10:55:32 -0000	1.9
+++ org_lwjgl_opengl_GLU.cpp	2 Aug 2003 12:53:25 -0000	1.10
@@ -43,7 +43,7 @@
 #include "extgl.h"
 #include "checkGLerror.h"
 
-#include "callbacks/GLUQuadricCallbacks.h"
+//#include "callbacks/GLUQuadricCallbacks.h"
 
 /*
  * Class:     org_lwjgl_opengl_GLU
@@ -91,7 +91,7 @@
  * Class:     org_lwjgl_opengl_GLU
  * Method:    pickMatrix
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPickMatrix(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jdouble p3, jobject buffer, jint offset)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_ngluPickMatrix(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jdouble p3, jobject buffer, jint offset)
 {
 	GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer);
 	gluPickMatrix((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (GLdouble) p3, address);
@@ -112,7 +112,7 @@
  * Class:     org_lwjgl_opengl_GLU
  * Method:    project
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluProject(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jobject buffer, jint buffer_offset, jobject buffer2, jint buffer2_offset, jobject buffer3, jint buffer3_offset, jobject win_buffer, jint win_offset)
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluProject(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jobject buffer, jint buffer_offset, jobject buffer2, jint buffer2_offset, jobject buffer3, jint buffer3_offset, jobject win_buffer, jint win_offset)
 {
 	const GLdouble *address = buffer_offset + (const GLdouble *)env->GetDirectBufferAddress(buffer);
 	const GLdouble *address2 = buffer2_offset + (const GLdouble *)env->GetDirectBufferAddress(buffer2);
@@ -127,7 +127,7 @@
  * Class:     org_lwjgl_opengl_GLU
  * Method:    unProject
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluUnProject(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jobject buffer, jint buffer_offset, jobject buffer2, jint buffer2_offset, jobject buffer3, jint buffer3_offset, jobject obj_buffer, jint obj_buffer_offset)
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluUnProject(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jobject buffer, jint buffer_offset, jobject buffer2, jint buffer2_offset, jobject buffer3, jint buffer3_offset, jobject obj_buffer, jint obj_buffer_offset)
 {
 	const GLdouble *address = buffer_offset + (const GLdouble *)env->GetDirectBufferAddress(buffer);
 	const GLdouble *address2 = buffer2_offset + (const GLdouble *)env->GetDirectBufferAddress(buffer2);
@@ -142,7 +142,7 @@
  * Class:     org_lwjgl_opengl_GLU
  * Method:    scaleImage
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluScaleImage(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jobject buffer, jint offset, jint p5, jint p6, jint p7, jobject buffer2, jint offset2)
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluScaleImage(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jobject buffer, jint offset, jint p5, jint p6, jint p7, jobject buffer2, jint offset2)
 {
 	const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer));
 	void *address2 = (void *)(offset2 + (GLbyte *)env->GetDirectBufferAddress(buffer2));
@@ -155,7 +155,7 @@
  * Class:     org_lwjgl_opengl_GLU
  * Method:    build1DMipmaps
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild1DMipmaps(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jobject buffer, jint offset)
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluBuild1DMipmaps(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jobject buffer, jint offset)
 {
 	const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer));
 	jint ret = (jint) gluBuild1DMipmaps((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, address);
@@ -167,7 +167,7 @@
  * Class:     org_lwjgl_opengl_GLU
  * Method:    build2DMipmaps
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild2DMipmaps(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jobject buffer, jint offset)
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluBuild2DMipmaps(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jobject buffer, jint offset)
 {
 	const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer));
 	jint ret = (jint) gluBuild2DMipmaps((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, address);

Index: org_lwjgl_opengl_GLU.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_opengl_GLU.h	20 Jul 2003 16:25:05 -0000	1.7
+++ org_lwjgl_opengl_GLU.h	2 Aug 2003 12:53:25 -0000	1.8
@@ -41,11 +41,11 @@
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluPickMatrix
- * Signature: (DDDDLjava/nio/IntBuffer;)V
+ * Method:    ngluPickMatrix
+ * Signature: (DDDDLjava/nio/IntBuffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPickMatrix
-  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jdouble, jobject);
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_ngluPickMatrix
+  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jdouble, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
@@ -57,131 +57,43 @@
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluProject
- * Signature: (DDDLjava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/IntBuffer;Ljava/nio/DoubleBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluProject
-  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jobject, jobject, jobject);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluUnProject
- * Signature: (DDDLjava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/IntBuffer;Ljava/nio/DoubleBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluUnProject
-  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jobject, jobject, jobject);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluScaleImage
- * Signature: (IIIILjava/nio/ByteBuffer;IIILjava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluScaleImage
-  (JNIEnv *, jclass, jint, jint, jint, jint, jobject, jint, jint, jint, jobject);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluBuild1DMipmaps
- * Signature: (IIIIILjava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild1DMipmaps
-  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluBuild2DMipmaps
- * Signature: (IIIIIILjava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild2DMipmaps
-  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jobject);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluNewQuadric
- * Signature: ()Ljava/nio/ByteBuffer;
- */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GLU_gluNewQuadric
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluCylinder
- * Signature: (Ljava/nio/ByteBuffer;DDDII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluCylinder
-  (JNIEnv *, jclass, jobject, jdouble, jdouble, jdouble, jint, jint);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluDeleteQuadric
- * Signature: (Ljava/nio/ByteBuffer;)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluDeleteQuadric
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluDisk
- * Signature: (Ljava/nio/ByteBuffer;DDII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluDisk
-  (JNIEnv *, jclass, jobject, jdouble, jdouble, jint, jint);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluPartialDisk
- * Signature: (Ljava/nio/ByteBuffer;DDIIDD)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPartialDisk
-  (JNIEnv *, jclass, jobject, jdouble, jdouble, jint, jint, jdouble, jdouble);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluQuadricDrawStyle
- * Signature: (Ljava/nio/ByteBuffer;I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricDrawStyle
-  (JNIEnv *, jclass, jobject, jint);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluQuadricNormals
- * Signature: (Ljava/nio/ByteBuffer;I)V
+ * Method:    ngluProject
+ * Signature: (DDDLjava/nio/DoubleBuffer;ILjava/nio/DoubleBuffer;ILjava/nio/IntBuffer;ILjava/nio/DoubleBuffer;I)I
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricNormals
-  (JNIEnv *, jclass, jobject, jint);
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluProject
+  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jint, jobject, jint, jobject, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluQuadricOrientation
- * Signature: (Ljava/nio/ByteBuffer;I)V
+ * Method:    ngluUnProject
+ * Signature: (DDDLjava/nio/DoubleBuffer;ILjava/nio/DoubleBuffer;ILjava/nio/IntBuffer;ILjava/nio/DoubleBuffer;I)I
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricOrientation
-  (JNIEnv *, jclass, jobject, jint);
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluUnProject
+  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jint, jobject, jint, jobject, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluQuadricTexture
- * Signature: (Ljava/nio/ByteBuffer;Z)V
+ * Method:    ngluScaleImage
+ * Signature: (IIIILjava/nio/ByteBuffer;IIIILjava/nio/ByteBuffer;I)I
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricTexture
-  (JNIEnv *, jclass, jobject, jboolean);
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluScaleImage
+  (JNIEnv *, jclass, jint, jint, jint, jint, jobject, jint, jint, jint, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluSphere
- * Signature: (Ljava/nio/ByteBuffer;DII)V
+ * Method:    ngluBuild1DMipmaps
+ * Signature: (IIIIILjava/nio/ByteBuffer;I)I
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluSphere
-  (JNIEnv *, jclass, jobject, jdouble, jint, jint);
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluBuild1DMipmaps
+  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluQuadricCallback
- * Signature: (Ljava/nio/ByteBuffer;ILjava/lang/Object;Ljava/lang/String;)V
+ * Method:    ngluBuild2DMipmaps
+ * Signature: (IIIIIILjava/nio/ByteBuffer;I)I
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricCallback
-  (JNIEnv *, jclass, jobject, jint, jobject, jstring);
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluBuild2DMipmaps
+  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jobject, jint);
 
 #ifdef __cplusplus
 }