Converted GL native

src/java/org/lwjgl/opengl/CoreGL11.java

@@ -76,7 +76,10 @@ public class CoreGL11 implements CoreGL11Constants {
 	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 native void glDeleteTextures(int n, IntBuffer textures);
+	public static void glDeleteTextures(int n, IntBuffer textures) {
+		nglDeleteTextures(n, textures, textures.position());
+	}
+	private static native void nglDeleteTextures(int n, IntBuffer textures, int textures_offset);
 	public static native void glCullFace(int mode);
 	public static native void glCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y, int width, int height);
 	public static native void glCopyTexSubImage1D(int target, int level, int xoffset, int x, int y, int width);

src/java/org/lwjgl/opengl/CoreGL14.java

@@ -57,10 +57,10 @@ public class CoreGL14 extends CoreGL13 implements CoreGL14Constants {
 	private static native void nglMultiDrawArrays(int mode, IntBuffer piFirst, int piFirst_offset, IntBuffer piCount, int piCount_offset, int primcount);
 /*        public static native void glMultiDrawElements(int mode, int piCount, int type, int pIndices, int primcount);*/
 	public static native void glPointParameterf (int pname, float param);
-	public static void glPointParameterfv (int pname, FloatBuffer params) {
+	public static void glPointParameter(int pname, FloatBuffer params) {
-		nglPointParameter(pname, params, params.position());
+		nglPointParameterfv(pname, params, params.position());
 	}
-	private static native void nglPointParameter (int pname, FloatBuffer params, int params_offset);
+	private static native void nglPointParameterfv(int pname, FloatBuffer params, int params_offset);
 	public static native void glSecondaryColor3b (byte red, byte green, byte blue);
 	public static native void glSecondaryColor3f (float red, float green, float blue);
 	public static native void glSecondaryColor3ub (byte red, byte green, byte blue);

src/java/org/lwjgl/opengl/GL.java

@@ -707,9 +707,9 @@ public class GL extends CoreGL14 implements GLConstants {
 	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());
+		nglMultiDrawArraysEXT(mode, piFirst, piFirst.position(), piCount, piCount.position(), primcount);
 	}
-	private static native void nglMultiDrawArraysEXT(int mode, IntBuffer piFirst, int piFirst_offset, IntBuffer piCount, int piCount_offset);
+	private static native void nglMultiDrawArraysEXT(int mode, IntBuffer piFirst, int piFirst_offset, IntBuffer piCount, int piCount_offset, int primcount);
 
 //	public static native void glMultiDrawElementsEXT(int mode, int piCount, int type, int pIndices, int primcount);
 
@@ -1320,10 +1320,7 @@ public class GL extends CoreGL14 implements GLConstants {
 		float writeFrequency,
 		float priority);
 
-	public static void glXFreeMemoryNV(ByteBuffer pointer) {
+	private static native void glXFreeMemoryNV(ByteBuffer pointer);
-		nglXFreeMemoryNV(pointer, pointer.position());
-	}
-	private static native void nglXFreeMemoryNV(ByteBuffer pointer, int pointer_offset);
 
 	// #ifdef _WIN32
 
@@ -1481,7 +1478,19 @@ public class GL extends CoreGL14 implements GLConstants {
 		nglBufferSubDataARB(target, offset, size, data, data.position()<<2);
 	}
 	private static native void nglBufferSubDataARB(int target, int offset, int size, Buffer data, int data_offset);
-	public static native void glGetBufferSubDataARB(int target, int offset, int size, Buffer data);
+	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, int size, ShortBuffer data) {
+		nglGetBufferSubDataARB(target, offset, size, 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, int size, FloatBuffer data) {
+		nglGetBufferSubDataARB(target, offset, size, data, data.position()<<2);
+	}
+	private static native void nglGetBufferSubDataARB(int target, int offset, int size, Buffer data, int data_offset);
 	/**
 	 * glMapBufferARB maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, in
 	 * which case a new ByteBuffer will be created, pointing to the returned memory. If oldBuffer is non-null,

src/java/org/lwjgl/opengl/GLU.java

@@ -74,13 +74,10 @@ public class GLU implements GLUConstants {
 		double zNear,
 		double zFar);
 
-	public static native void gluPickMatrix(
+	public static void gluPickMatrix(double x, double y, double width, double height, IntBuffer viewport) {
-		double x,
+		ngluPickMatrix(x, y, width, height, viewport, viewport.position());
-		double y,
+	}
-		double width,
+	private static native void ngluPickMatrix(double x, double y, double width, double height, IntBuffer viewport, int viewport_offset);
-		double height,
-		IntBuffer viewport
-	);
 
 	public static native void gluLookAt(
 		double eyex,

src/native/common/Makefile.am

@@ -1,14 +1,14 @@
-SUBDIRS = callbacks
+#SUBDIRS = callbacks
 
 noinst_LTLIBRARIES = libcommon.la
 
 libcommon_la_SOURCES = $(COMMON)
 libcommon_la_CPPFLAGS = -D_DEBUG
 
-libcommon_la_LIBADD = \
+#libcommon_la_LIBADD = \
-  callbacks/libcallbacks.la
+#  callbacks/libcallbacks.la
-libcommon_la_DEPENDENCIES = \
+#libcommon_la_DEPENDENCIES = \
-  callbacks/libcallbacks.la
+#  callbacks/libcallbacks.la
 
 COMMON = \
   extal.cpp \

src/native/common/org_lwjgl_opengl_CoreGL11.cpp

@@ -1088,7 +1088,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglMaterialiv(JNIEnv * env
  * 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 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglMapGrid1f(JNIEnv * env,
  * 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 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGenf(JNIEnv * env, jc
 
 /*
  * 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);

src/native/common/org_lwjgl_opengl_CoreGL11.h

@@ -129,11 +129,11 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glDeleteLists
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
- * Method:    glDeleteTextures
+ * Method:    nglDeleteTextures
- * Signature: (ILjava/nio/IntBuffer;)V
+ * Signature: (ILjava/nio/IntBuffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glDeleteTextures
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglDeleteTextures
-  (JNIEnv *, jclass, jint, jobject);
+  (JNIEnv *, jclass, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
@@ -1111,14 +1111,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glNormal3f
 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
  * Method:    glNewList

src/native/common/org_lwjgl_opengl_CoreGL14.h

@@ -41,10 +41,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glPointParameterf
 
 /*
  * 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);
 
 /*

src/native/common/org_lwjgl_opengl_GL.h

@@ -1098,10 +1098,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglMatrixIndexusvARB
 /*
  * 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 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL_glXAllocateMemoryNV
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    nglXFreeMemoryNV
+ * Method:    glXFreeMemoryNV
- * Signature: (Ljava/nio/ByteBuffer;I)V
+ * Signature: (Ljava/nio/ByteBuffer;)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglXFreeMemoryNV
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glXFreeMemoryNV
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jobject);
 
 /*
  * Class:     org_lwjgl_opengl_GL
@@ -2305,11 +2305,11 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglBufferSubDataARB
 
 /*
  * Class:     org_lwjgl_opengl_GL
- * Method:    glGetBufferSubDataARB
+ * Method:    nglGetBufferSubDataARB
- * Signature: (IIILjava/nio/Buffer;)V
+ * Signature: (IIILjava/nio/Buffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glGetBufferSubDataARB
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nglGetBufferSubDataARB
-  (JNIEnv *, jclass, jint, jint, jint, jobject);
+  (JNIEnv *, jclass, jint, jint, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GL

src/native/common/org_lwjgl_opengl_GLCaps.h

@@ -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 @@ extern "C" {
 /* 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 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLEXTExtensionsString
 
 /*
  * Class:     org_lwjgl_opengl_GLCaps
- * Method:    isWGLARBExtensionsStringAvaiable
+ * Method:    isWGLARBExtensionsStringAvailable
  * Signature: ()Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLARBExtensionsStringAvailable

src/native/common/org_lwjgl_opengl_GLU.cpp

@@ -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 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPerspective(JNIEnv * env, jc
  * 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 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluLookAt(JNIEnv * env, jclass
  * 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 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluProject(JNIEnv * env, jclass
  * 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 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluUnProject(JNIEnv * env, jcla
  * 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 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluScaleImage(JNIEnv * env, jcl
  * 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 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild1DMipmaps(JNIEnv * env,
  * 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);

src/native/common/org_lwjgl_opengl_GLU.h

@@ -41,11 +41,11 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPerspective
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluPickMatrix
+ * Method:    ngluPickMatrix
- * Signature: (DDDDLjava/nio/IntBuffer;)V
+ * Signature: (DDDDLjava/nio/IntBuffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluPickMatrix
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_ngluPickMatrix
-  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jdouble, jobject);
+  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jdouble, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
@@ -57,131 +57,43 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluLookAt
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluProject
+ * Method:    ngluProject
- * Signature: (DDDLjava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/IntBuffer;Ljava/nio/DoubleBuffer;)I
+ * Signature: (DDDLjava/nio/DoubleBuffer;ILjava/nio/DoubleBuffer;ILjava/nio/IntBuffer;ILjava/nio/DoubleBuffer;I)I
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluProject
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluProject
-  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jobject, jobject, jobject);
+  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jint, jobject, jint, jobject, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluUnProject
+ * Method:    ngluUnProject
- * Signature: (DDDLjava/nio/DoubleBuffer;Ljava/nio/DoubleBuffer;Ljava/nio/IntBuffer;Ljava/nio/DoubleBuffer;)I
+ * Signature: (DDDLjava/nio/DoubleBuffer;ILjava/nio/DoubleBuffer;ILjava/nio/IntBuffer;ILjava/nio/DoubleBuffer;I)I
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluUnProject
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluUnProject
-  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jobject, jobject, jobject);
+  (JNIEnv *, jclass, jdouble, jdouble, jdouble, jobject, jint, jobject, jint, jobject, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluScaleImage
+ * Method:    ngluScaleImage
- * Signature: (IIIILjava/nio/ByteBuffer;IIILjava/nio/ByteBuffer;)I
+ * Signature: (IIIILjava/nio/ByteBuffer;IIIILjava/nio/ByteBuffer;I)I
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluScaleImage
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluScaleImage
-  (JNIEnv *, jclass, jint, jint, jint, jint, jobject, jint, jint, jint, jobject);
+  (JNIEnv *, jclass, jint, jint, jint, jint, jobject, jint, jint, jint, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluBuild1DMipmaps
+ * Method:    ngluBuild1DMipmaps
- * Signature: (IIIIILjava/nio/ByteBuffer;)I
+ * Signature: (IIIIILjava/nio/ByteBuffer;I)I
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild1DMipmaps
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluBuild1DMipmaps
-  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject);
+  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject, jint);
 
 /*
  * Class:     org_lwjgl_opengl_GLU
- * Method:    gluBuild2DMipmaps
+ * Method:    ngluBuild2DMipmaps
- * Signature: (IIIIIILjava/nio/ByteBuffer;)I
+ * Signature: (IIIIIILjava/nio/ByteBuffer;I)I
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_gluBuild2DMipmaps
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_GLU_ngluBuild2DMipmaps
-  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jobject);
+  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jobject, jint);
-
-/*
- * 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
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricNormals
-  (JNIEnv *, jclass, jobject, jint);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluQuadricOrientation
- * Signature: (Ljava/nio/ByteBuffer;I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricOrientation
-  (JNIEnv *, jclass, jobject, jint);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluQuadricTexture
- * Signature: (Ljava/nio/ByteBuffer;Z)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricTexture
-  (JNIEnv *, jclass, jobject, jboolean);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluSphere
- * Signature: (Ljava/nio/ByteBuffer;DII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluSphere
-  (JNIEnv *, jclass, jobject, jdouble, jint, jint);
-
-/*
- * Class:     org_lwjgl_opengl_GLU
- * Method:    gluQuadricCallback
- * Signature: (Ljava/nio/ByteBuffer;ILjava/lang/Object;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_gluQuadricCallback
-  (JNIEnv *, jclass, jobject, jint, jobject, jstring);
 
 #ifdef __cplusplus
 }

src/native/configure.in

@@ -73,4 +73,4 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.
 
-AC_OUTPUT([Makefile common/Makefile common/callbacks/Makefile linux/Makefile])
+AC_OUTPUT([Makefile common/Makefile linux/Makefile])

src/native/linux/org_lwjgl_opengl_GLCaps.cpp

@@ -46,7 +46,7 @@
  * Method:    isWGLEXTExtensionsStringAvaiable
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLEXTExtensionsStringAvaiable
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLEXTExtensionsStringAvailable
   (JNIEnv *env, jclass clazz) {
 	return JNI_FALSE;
 }
@@ -56,7 +56,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLEXTExtensionsString
  * Method:    isWGLARBExtensionsStringAvaiable
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLARBExtensionsStringAvaiable
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GLCaps_isWGLARBExtensionsStringAvailable
   (JNIEnv *env, jclass clazz) {
 	return JNI_FALSE;
 }