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

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

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:
Removed duplicate exception

Index: org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- org_lwjgl_opengl_Window.cpp	25 Feb 2004 18:09:10 -0000	1.19
+++ org_lwjgl_opengl_Window.cpp	9 Mar 2004 12:20:21 -0000	1.20
@@ -451,11 +451,6 @@
 	return true;
 }
 
-/*
- * Class:     org_lwjgl_opengl_GLWindow
- * Method:    nCreate
- * Signature: (IIII)Z
- */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate
   (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jint samples)
 {
@@ -490,18 +485,8 @@
 	if (!create_success) {
 		XCloseDisplay(disp);
 		extgl_Close();
-		throwException(env, "Could not create window");
 		return;
 	}
-/*	if (!extgl_Initialize(env, ext_set)) {
-		destroy();
-		throwException(env, "Could not init gl function pointers");
-		return;
-	}
-	if (ISDEBUGENABLED()) {
-		const GLubyte * extensions = glGetString(GL_EXTENSIONS);
-		printf("Supported extensions: %s\n", extensions);
-	}*/
 }
 
 /*

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

Modified Files:
	extgl.cpp extgl.h 
Log Message:
Cleaned up extgl.cpp and extgl.h

Index: extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- extgl.cpp	9 Mar 2004 11:03:09 -0000	1.29
+++ extgl.cpp	9 Mar 2004 11:09:22 -0000	1.30
@@ -128,345 +128,6 @@
 aglSurfaceTexturePROC aglSurfaceTexture = NULL;
 #endif
 
-/* function variables */
-
-/*glAccumPROC glAccum = NULL;
-glAlphaFuncPROC glAlphaFunc = NULL;
-glAreTexturesResidentPROC glAreTexturesResident = NULL;
-glArrayElementPROC glArrayElement = NULL;
-glBeginPROC glBegin = NULL;
-glBindTexturePROC glBindTexture = NULL;
-glBitmapPROC glBitmap = NULL;
-glBlendFuncPROC glBlendFunc = NULL;
-glCallListPROC glCallList = NULL;
-glCallListsPROC glCallLists = NULL;
-glClearPROC glClear = NULL;
-glClearAccumPROC glClearAccum = NULL;
-glClearColorPROC glClearColor = NULL;
-glClearDepthPROC glClearDepth = NULL;
-glClearIndexPROC glClearIndex = NULL;
-glClearStencilPROC glClearStencil = NULL;
-glClipPlanePROC glClipPlane = NULL;
-glColor3bPROC glColor3b = NULL;
-glColor3bvPROC glColor3bv = NULL;
-glColor3dPROC glColor3d = NULL;
-glColor3dvPROC glColor3dv = NULL;
-glColor3fPROC glColor3f = NULL;
-glColor3fvPROC glColor3fv = NULL;
-glColor3iPROC glColor3i = NULL;
-glColor3ivPROC glColor3iv = NULL;
-glColor3sPROC glColor3s = NULL;
-glColor3svPROC glColor3sv = NULL;
-glColor3ubPROC glColor3ub = NULL;
-glColor3ubvPROC glColor3ubv = NULL;
-glColor3uiPROC glColor3ui = NULL;
-glColor3uivPROC glColor3uiv = NULL;
-glColor3usPROC glColor3us = NULL;
-glColor3usvPROC glColor3usv = NULL;
-glColor4bPROC glColor4b = NULL;
-glColor4bvPROC glColor4bv = NULL;
-glColor4dPROC glColor4d = NULL;
-glColor4dvPROC glColor4dv = NULL;
-glColor4fPROC glColor4f = NULL;
-glColor4fvPROC glColor4fv = NULL;
-glColor4iPROC glColor4i = NULL;
-glColor4ivPROC glColor4iv = NULL;
-glColor4sPROC glColor4s = NULL;
-glColor4svPROC glColor4sv = NULL;
-glColor4ubPROC glColor4ub = NULL;
-glColor4ubvPROC glColor4ubv = NULL;
-glColor4uiPROC glColor4ui = NULL;
-glColor4uivPROC glColor4uiv = NULL;
-glColor4usPROC glColor4us = NULL;
-glColor4usvPROC glColor4usv = NULL;
-glColorMaskPROC glColorMask = NULL;
-glColorMaterialPROC glColorMaterial = NULL;
-glColorPointerPROC glColorPointer = NULL;
-glCopyPixelsPROC glCopyPixels = NULL;
-glCopyTexImage1DPROC glCopyTexImage1D = NULL;
-glCopyTexImage2DPROC glCopyTexImage2D = NULL;
-glCopyTexSubImage1DPROC glCopyTexSubImage1D = NULL;
-glCopyTexSubImage2DPROC glCopyTexSubImage2D = NULL;
-glCullFacePROC glCullFace = NULL;
-glDeleteListsPROC glDeleteLists = NULL;
-glDeleteTexturesPROC glDeleteTextures = NULL;
-glDepthFuncPROC glDepthFunc = NULL;
-glDepthMaskPROC glDepthMask = NULL;
-glDepthRangePROC glDepthRange = NULL;
-glDisablePROC glDisable = NULL;
-glDisableClientStatePROC glDisableClientState = NULL;
-glDrawArraysPROC glDrawArrays = NULL;
-glDrawBufferPROC glDrawBuffer = NULL;
-glDrawElementsPROC glDrawElements = NULL;
-glDrawPixelsPROC glDrawPixels = NULL;
-glEdgeFlagPROC glEdgeFlag = NULL;
-glEdgeFlagPointerPROC glEdgeFlagPointer = NULL;
-glEdgeFlagvPROC glEdgeFlagv = NULL;
-glEnablePROC glEnable = NULL;
-glEnableClientStatePROC glEnableClientState = NULL;
-glEndPROC glEnd = NULL;
-glEndListPROC glEndList = NULL;
-glEvalCoord1dPROC glEvalCoord1d = NULL;
-glEvalCoord1dvPROC glEvalCoord1dv = NULL;
-glEvalCoord1fPROC glEvalCoord1f = NULL;
-glEvalCoord1fvPROC glEvalCoord1fv = NULL;
-glEvalCoord2dPROC glEvalCoord2d = NULL;
-glEvalCoord2dvPROC glEvalCoord2dv = NULL;
-glEvalCoord2fPROC glEvalCoord2f = NULL;
-glEvalCoord2fvPROC glEvalCoord2fv = NULL;
-glEvalMesh1PROC glEvalMesh1 = NULL;
-glEvalMesh2PROC glEvalMesh2 = NULL;
-glEvalPoint1PROC glEvalPoint1 = NULL;
-glEvalPoint2PROC glEvalPoint2 = NULL;
-glFeedbackBufferPROC glFeedbackBuffer = NULL;
-glFinishPROC glFinish = NULL;
-glFlushPROC glFlush = NULL;
-glFogfPROC glFogf = NULL;
-glFogfvPROC glFogfv = NULL;
-glFogiPROC glFogi = NULL;
-glFogivPROC glFogiv = NULL;
-glFrontFacePROC glFrontFace = NULL;
-glFrustumPROC glFrustum = NULL;
-glGenListsPROC glGenLists = NULL;
-glGenTexturesPROC glGenTextures = NULL;
-glGetBooleanvPROC glGetBooleanv = NULL;
-glGetClipPlanePROC glGetClipPlane = NULL;
-glGetDoublevPROC glGetDoublev = NULL;
-glGetErrorPROC glGetError = NULL;
-glGetFloatvPROC glGetFloatv = NULL;
-glGetIntegervPROC glGetIntegerv = NULL;
-glGetLightfvPROC glGetLightfv = NULL;
-glGetLightivPROC glGetLightiv = NULL;
-glGetMapdvPROC glGetMapdv = NULL;
-glGetMapfvPROC glGetMapfv = NULL;
-glGetMapivPROC glGetMapiv = NULL;
-glGetMaterialfvPROC glGetMaterialfv = NULL;
-glGetMaterialivPROC glGetMaterialiv = NULL;
-glGetPixelMapfvPROC glGetPixelMapfv = NULL;
-glGetPixelMapuivPROC glGetPixelMapuiv = NULL;
-glGetPixelMapusvPROC glGetPixelMapusv = NULL;
-glGetPointervPROC glGetPointerv = NULL;
-glGetPolygonStipplePROC glGetPolygonStipple = NULL;
-glGetStringPROC glGetString = NULL;
-glGetTexEnvfvPROC glGetTexEnvfv = NULL;
-glGetTexEnvivPROC glGetTexEnviv = NULL;
-glGetTexGendvPROC glGetTexGendv = NULL;
-glGetTexGenfvPROC glGetTexGenfv = NULL;
-glGetTexGenivPROC glGetTexGeniv = NULL;
-glGetTexImagePROC glGetTexImage = NULL;
-glGetTexLevelParameterfvPROC glGetTexLevelParameterfv = NULL;
-glGetTexLevelParameterivPROC glGetTexLevelParameteriv = NULL;
-glGetTexParameterfvPROC glGetTexParameterfv = NULL;
-glGetTexParameterivPROC glGetTexParameteriv = NULL;
-glHintPROC glHint = NULL;
-glIndexMaskPROC glIndexMask = NULL;
-glIndexPointerPROC glIndexPointer = NULL;
-glIndexdPROC glIndexd = NULL;
-glIndexdvPROC glIndexdv = NULL;
-glIndexfPROC glIndexf = NULL;
-glIndexfvPROC glIndexfv = NULL;
-glIndexiPROC glIndexi = NULL;
-glIndexivPROC glIndexiv = NULL;
-glIndexsPROC glIndexs = NULL;
-glIndexsvPROC glIndexsv = NULL;
-glIndexubPROC glIndexub = NULL;
-glIndexubvPROC glIndexubv = NULL;
-glInitNamesPROC glInitNames = NULL;
-glInterleavedArraysPROC glInterleavedArrays = NULL;
-glIsEnabledPROC glIsEnabled = NULL;
-glIsListPROC glIsList = NULL;
-glIsTexturePROC glIsTexture = NULL;
-glLightModelfPROC glLightModelf = NULL;
-glLightModelfvPROC glLightModelfv = NULL;
-glLightModeliPROC glLightModeli = NULL;
-glLightModelivPROC glLightModeliv = NULL;
-glLightfPROC glLightf = NULL;
-glLightfvPROC glLightfv = NULL;
-glLightiPROC glLighti = NULL;
-glLightivPROC glLightiv = NULL;
-glLineStipplePROC glLineStipple = NULL;
-glLineWidthPROC glLineWidth = NULL;
-glListBasePROC glListBase = NULL;
-glLoadIdentityPROC glLoadIdentity = NULL;
-glLoadMatrixdPROC glLoadMatrixd = NULL;
-glLoadMatrixfPROC glLoadMatrixf = NULL;
-glLoadNamePROC glLoadName = NULL;
-glLogicOpPROC glLogicOp = NULL;
-glMap1dPROC glMap1d = NULL;
-glMap1fPROC glMap1f = NULL;
-glMap2dPROC glMap2d = NULL;
-glMap2fPROC glMap2f = NULL;
-glMapGrid1dPROC glMapGrid1d = NULL;
-glMapGrid1fPROC glMapGrid1f = NULL;
-glMapGrid2dPROC glMapGrid2d = NULL;
-glMapGrid2fPROC glMapGrid2f = NULL;
-glMaterialfPROC glMaterialf = NULL;
-glMaterialfvPROC glMaterialfv = NULL;
-glMaterialiPROC glMateriali = NULL;
-glMaterialivPROC glMaterialiv = NULL;
-glMatrixModePROC glMatrixMode = NULL;
-glMultMatrixdPROC glMultMatrixd = NULL;
-glMultMatrixfPROC glMultMatrixf = NULL;
-glNewListPROC glNewList = NULL;
-glNormal3bPROC glNormal3b = NULL;
-glNormal3bvPROC glNormal3bv = NULL;
-glNormal3dPROC glNormal3d = NULL;
-glNormal3dvPROC glNormal3dv = NULL;
-glNormal3fPROC glNormal3f = NULL;
-glNormal3fvPROC glNormal3fv = NULL;
-glNormal3iPROC glNormal3i = NULL;
-glNormal3ivPROC glNormal3iv = NULL;
-glNormal3sPROC glNormal3s = NULL;
-glNormal3svPROC glNormal3sv = NULL;
-glNormalPointerPROC glNormalPointer = NULL;
-glOrthoPROC glOrtho = NULL;
-glPassThroughPROC glPassThrough = NULL;
-glPixelMapfvPROC glPixelMapfv = NULL;
-glPixelMapuivPROC glPixelMapuiv = NULL;
-glPixelMapusvPROC glPixelMapusv = NULL;
-glPixelStorefPROC glPixelStoref = NULL;
-glPixelStoreiPROC glPixelStorei = NULL;
-glPixelTransferfPROC glPixelTransferf = NULL;
-glPixelTransferiPROC glPixelTransferi = NULL;
-glPixelZoomPROC glPixelZoom = NULL;
-glPointSizePROC glPointSize = NULL;
-glPolygonModePROC glPolygonMode = NULL;
-glPolygonOffsetPROC glPolygonOffset = NULL;
-glPolygonStipplePROC glPolygonStipple = NULL;
-glPopAttribPROC glPopAttrib = NULL;
-glPopClientAttribPROC glPopClientAttrib = NULL;
-glPopMatrixPROC glPopMatrix = NULL;
-glPopNamePROC glPopName = NULL;
-glPrioritizeTexturesPROC glPrioritizeTextures = NULL;
-glPushAttribPROC glPushAttrib = NULL;
-glPushClientAttribPROC glPushClientAttrib = NULL;
-glPushMatrixPROC glPushMatrix = NULL;
-glPushNamePROC glPushName = NULL;
-glRasterPos2dPROC glRasterPos2d = NULL;
-glRasterPos2dvPROC glRasterPos2dv = NULL;
-glRasterPos2fPROC glRasterPos2f = NULL;
-glRasterPos2fvPROC glRasterPos2fv = NULL;
-glRasterPos2iPROC glRasterPos2i = NULL;
-glRasterPos2ivPROC glRasterPos2iv = NULL;
-glRasterPos2sPROC glRasterPos2s = NULL;
-glRasterPos2svPROC glRasterPos2sv = NULL;
-glRasterPos3dPROC glRasterPos3d = NULL;
-glRasterPos3dvPROC glRasterPos3dv = NULL;
-glRasterPos3fPROC glRasterPos3f = NULL;
-glRasterPos3fvPROC glRasterPos3fv = NULL;
-glRasterPos3iPROC glRasterPos3i = NULL;
-glRasterPos3ivPROC glRasterPos3iv = NULL;
-glRasterPos3sPROC glRasterPos3s = NULL;
-glRasterPos3svPROC glRasterPos3sv = NULL;
-glRasterPos4dPROC glRasterPos4d = NULL;
-glRasterPos4dvPROC glRasterPos4dv = NULL;
-glRasterPos4fPROC glRasterPos4f = NULL;
-glRasterPos4fvPROC glRasterPos4fv = NULL;
-glRasterPos4iPROC glRasterPos4i = NULL;
-glRasterPos4ivPROC glRasterPos4iv = NULL;
-glRasterPos4sPROC glRasterPos4s = NULL;
-glRasterPos4svPROC glRasterPos4sv = NULL;
-glReadBufferPROC glReadBuffer = NULL;
-glReadPixelsPROC glReadPixels = NULL;
-glRectdPROC glRectd = NULL;
-glRectdvPROC glRectdv = NULL;
-glRectfPROC glRectf = NULL;
-glRectfvPROC glRectfv = NULL;
-glRectiPROC glRecti = NULL;
-glRectivPROC glRectiv = NULL;
-glRectsPROC glRects = NULL;
-glRectsvPROC glRectsv = NULL;
-glRenderModePROC glRenderMode = NULL;
-glRotatedPROC glRotated = NULL;
-glRotatefPROC glRotatef = NULL;
-glScaledPROC glScaled = NULL;
-glScalefPROC glScalef = NULL;
-glScissorPROC glScissor = NULL;
-glSelectBufferPROC glSelectBuffer = NULL;
-glShadeModelPROC glShadeModel = NULL;
-glStencilFuncPROC glStencilFunc = NULL;
-glStencilMaskPROC glStencilMask = NULL;
-glStencilOpPROC glStencilOp = NULL;
-glTexCoord1dPROC glTexCoord1d = NULL;
-glTexCoord1dvPROC glTexCoord1dv = NULL;
-glTexCoord1fPROC glTexCoord1f = NULL;
-glTexCoord1fvPROC glTexCoord1fv = NULL;
-glTexCoord1iPROC glTexCoord1i = NULL;
-glTexCoord1ivPROC glTexCoord1iv = NULL;
-glTexCoord1sPROC glTexCoord1s = NULL;
-glTexCoord1svPROC glTexCoord1sv = NULL;
-glTexCoord2dPROC glTexCoord2d = NULL;
-glTexCoord2dvPROC glTexCoord2dv = NULL;
-glTexCoord2fPROC glTexCoord2f = NULL;
-glTexCoord2fvPROC glTexCoord2fv = NULL;
-glTexCoord2iPROC glTexCoord2i = NULL;
-glTexCoord2ivPROC glTexCoord2iv = NULL;
-glTexCoord2sPROC glTexCoord2s = NULL;
-glTexCoord2svPROC glTexCoord2sv = NULL;
-glTexCoord3dPROC glTexCoord3d = NULL;
-glTexCoord3dvPROC glTexCoord3dv = NULL;
-glTexCoord3fPROC glTexCoord3f = NULL;
-glTexCoord3fvPROC glTexCoord3fv = NULL;
-glTexCoord3iPROC glTexCoord3i = NULL;
-glTexCoord3ivPROC glTexCoord3iv = NULL;
-glTexCoord3sPROC glTexCoord3s = NULL;
-glTexCoord3svPROC glTexCoord3sv = NULL;
-glTexCoord4dPROC glTexCoord4d = NULL;
-glTexCoord4dvPROC glTexCoord4dv = NULL;
-glTexCoord4fPROC glTexCoord4f = NULL;
-glTexCoord4fvPROC glTexCoord4fv = NULL;
-glTexCoord4iPROC glTexCoord4i = NULL;
-glTexCoord4ivPROC glTexCoord4iv = NULL;
-glTexCoord4sPROC glTexCoord4s = NULL;
-glTexCoord4svPROC glTexCoord4sv = NULL;
-glTexCoordPointerPROC glTexCoordPointer = NULL;
-glTexEnvfPROC glTexEnvf = NULL;
-glTexEnvfvPROC glTexEnvfv = NULL;
-glTexEnviPROC glTexEnvi = NULL;
-glTexEnvivPROC glTexEnviv = NULL;
-glTexGendPROC glTexGend = NULL;
-glTexGendvPROC glTexGendv = NULL;
-glTexGenfPROC glTexGenf = NULL;
-glTexGenfvPROC glTexGenfv = NULL;
-glTexGeniPROC glTexGeni = NULL;
-glTexGenivPROC glTexGeniv = NULL;
-glTexImage1DPROC glTexImage1D = NULL;
-glTexImage2DPROC glTexImage2D = NULL;
-glTexParameterfPROC glTexParameterf = NULL;
-glTexParameterfvPROC glTexParameterfv = NULL;
-glTexParameteriPROC glTexParameteri = NULL;
-glTexParameterivPROC glTexParameteriv = NULL;
-glTexSubImage1DPROC glTexSubImage1D = NULL;
-glTexSubImage2DPROC glTexSubImage2D = NULL;
-glTranslatedPROC glTranslated = NULL;
-glTranslatefPROC glTranslatef = NULL;
-glVertex2dPROC glVertex2d = NULL;
-glVertex2dvPROC glVertex2dv = NULL;
-glVertex2fPROC glVertex2f = NULL;
-glVertex2fvPROC glVertex2fv = NULL;
-glVertex2iPROC glVertex2i = NULL;
-glVertex2ivPROC glVertex2iv = NULL;
-glVertex2sPROC glVertex2s = NULL;
-glVertex2svPROC glVertex2sv = NULL;
-glVertex3dPROC glVertex3d = NULL;
-glVertex3dvPROC glVertex3dv = NULL;
-glVertex3fPROC glVertex3f = NULL;
-glVertex3fvPROC glVertex3fv = NULL;
-glVertex3iPROC glVertex3i = NULL;
-glVertex3ivPROC glVertex3iv = NULL;
-glVertex3sPROC glVertex3s = NULL;
-glVertex3svPROC glVertex3sv = NULL;
-glVertex4dPROC glVertex4d = NULL;
-glVertex4dvPROC glVertex4dv = NULL;
-glVertex4fPROC glVertex4f = NULL;
-glVertex4fvPROC glVertex4fv = NULL;
-glVertex4iPROC glVertex4i = NULL;
-glVertex4ivPROC glVertex4iv = NULL;
-glVertex4sPROC glVertex4s = NULL;
-glVertex4svPROC glVertex4sv = NULL;
-glVertexPointerPROC glVertexPointer = NULL;
-glViewportPROC glViewport = NULL;*/
-
 /*-------------------------------------*/
 /* WGL stuff */
 /*-------------------------------------*/
@@ -528,55 +189,6 @@
 /*-------------------------------------*/
 
 
-/*glBlendColorPROC glBlendColor = NULL;
-glBlendEquationPROC glBlendEquation = NULL;
-glColorTablePROC glColorTable = NULL;
-glColorTableParameterfvPROC glColorTableParameterfv = NULL;
-glColorTableParameterivPROC glColorTableParameteriv = NULL;
-glCopyColorTablePROC glCopyColorTable = NULL;
-glGetColorTablePROC glGetColorTable = NULL;
-glGetColorTableParameterfvPROC glGetColorTableParameterfv = NULL;
-glGetColorTableParameterivPROC glGetColorTableParameteriv = NULL;
-glColorSubTablePROC glColorSubTable = NULL;
-glCopyColorSubTablePROC glCopyColorSubTable = NULL;
-glConvolutionFilter1DPROC glConvolutionFilter1D = NULL;
-glConvolutionFilter2DPROC glConvolutionFilter2D = NULL;
-glConvolutionParameterfPROC glConvolutionParameterf = NULL;
-glConvolutionParameterfvPROC glConvolutionParameterfv = NULL;
-glConvolutionParameteriPROC glConvolutionParameteri = NULL;
-glConvolutionParameterivPROC glConvolutionParameteriv = NULL;
-glCopyConvolutionFilter1DPROC glCopyConvolutionFilter1D = NULL;
-glCopyConvolutionFilter2DPROC glCopyConvolutionFilter2D = NULL;
-glGetConvolutionFilterPROC glGetConvolutionFilter = NULL;
-glGetConvolutionParameterfvPROC glGetConvolutionParameterfv = NULL;
-glGetConvolutionParameterivPROC glGetConvolutionParameteriv = NULL;
-glGetSeparableFilterPROC glGetSeparableFilter = NULL;
-glSeparableFilter2DPROC glSeparableFilter2D = NULL;
-glGetHistogramPROC glGetHistogram = NULL;
-glGetHistogramParameterfvPROC glGetHistogramParameterfv = NULL;
-glGetHistogramParameterivPROC glGetHistogramParameteriv = NULL;
-glGetMinmaxPROC glGetMinmax = NULL;
-glGetMinmaxParameterfvPROC glGetMinmaxParameterfv = NULL;
-glGetMinmaxParameterivPROC glGetMinmaxParameteriv = NULL;
-glHistogramPROC glHistogram = NULL;
-glMinmaxPROC glMinmax = NULL;
-glResetHistogramPROC glResetHistogram = NULL;
-glResetMinmaxPROC glResetMinmax = NULL;*/
-
-/* EXT_cull_vertex */
-
-glCullParameterfvEXTPROC glCullParameterfvEXT = NULL;
-glCullParameterdvEXTPROC glCullParameterdvEXT = NULL;
-
-//glBlendFuncSeparateEXTPROC glBlendFuncSeparateEXT = NULL;
-//glBlendFuncSeparateINGRPROC glBlendFuncSeparateINGR = NULL;
-
-glElementPointerNVPROC glElementPointerNV = NULL;
-glDrawElementArrayNVPROC glDrawElementArrayNV = NULL;
-glDrawRangeElementArrayNVPROC glDrawRangeElementArrayNV = NULL;
-glMultiDrawElementArrayNVPROC glMultiDrawElementArrayNV = NULL;
-glMultiDrawRangeElementArrayNVPROC glMultiDrawRangeElementArrayNV = NULL;
-
 static bool extgl_error = false;
 
 struct ExtensionTypes extgl_Extensions;

Index: extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- extgl.h	9 Mar 2004 11:03:09 -0000	1.31
+++ extgl.h	9 Mar 2004 11:09:23 -0000	1.32
@@ -66,101 +66,6 @@
 
     http://www.uni-karlsruhe.de/~uli2/
 */
-/* These extensions are supported:
-GL_ARB_vertex_buffer_object
-GL_ARB_depth_texture
-GL_ARB_fragment_program
-GL_ARB_imaging
-GL_ARB_matrix_palette
-GL_ARB_multisample
-GL_ARB_multitexture
-GL_ARB_point_parameters
-GL_ARB_shadow
-GL_ARB_shadow_ambient
-GL_ARB_texture_compression
-GL_ARB_texture_env_add
-GL_ARB_texture_env_dot3
-GL_ARB_texture_env_combine
-GL_ARB_texture_env_crossbar
-GL_ARB_texture_border_clamp
-GL_ARB_texture_cube_map
-GL_ARB_texture_mirrored_repeat
-GL_ARB_transpose_matrix
-GL_ARB_vertex_blend
-GL_ARB_vertex_program
-GL_ARB_window_pos
-GL_EXT_abgr
-GL_EXT_bgra
-GL_EXT_blend_function_separate
-GL_EXT_compiled_vertex_array
-GL_EXT_cull_vertex
-GL_EXT_draw_range_elements
-GL_EXT_fog_coord
-GL_EXT_multi_draw_arrays
-GL_EXT_point_parameters
-GL_EXT_secondary_color
-GL_EXT_separate_specular_color
-GL_EXT_shadow_funcs
-GL_EXT_stencil_two_side
-GL_EXT_stencil_wrap
-GL_EXT_texture_compression_s3tc
-GL_EXT_texture_filter_anisotropic
-GL_EXT_texture_lod_bias
-GL_EXT_vertex_shader
-GL_EXT_vertex_weighting
-GL_ATI_element_array
-GL_ATI_envmap_bumpmap
-GL_ATI_fragment_shader
-GL_ATI_pn_triangles
-GL_ATI_text_fragment_shader
-GL_ATI_texture_mirror_once
-GL_ATI_vertex_array_object;
-GL_ATI_vertex_streams
-GL_ATIX_point_sprites
-GL_ATIX_texture_env_route
-GL_HP_occlusion_test
-GL_NV_blend_square
-GL_NV_copy_depth_to_color
-GL_NV_depth_clamp
-GL_NV_element_array
-GL_NV_evaluators
-GL_NV_fence
-GL_NV_float_buffer
-GL_NV_fog_distance
-GL_NV_fragment_program
-GL_NV_light_max_exponent
-GL_NV_occlusion_query
-GL_NV_packed_depth_stencil
-GL_NV_point_sprite
-GL_NV_primitive_restart
-GL_NV_register_combiners
-GL_NV_register_combiners2
-GL_NV_texgen_reflection
-GL_NV_texture_env_combine4
-GL_NV_texture_rectangle
-GL_NV_texture_shader
-GL_NV_texture_shader2
-GL_NV_texture_shader3
-GL_NV_vertex_array_range
-GL_NV_vertex_array_range2
-GL_NV_vertex_program
-GL_NV_vertex_program1_1
-GL_NV_vertex_program2
-GL_SGIS_generate_mipmap
-GL_SGIX_shadow
-GL_SGIX_depth_texture
-WGL_ARB_buffer_region
-WGL_ARB_extensions_string
-WGL_ARB_make_current_read;
-WGL_ARB_multisample
-WGL_ARB_pbuffer
-WGL_ARB_pixel_format
-WGL_ARB_render_texture
-WGL_EXT_extensions_string
-WGL_EXT_swap_control
-WGL_NV_render_depth_texture
-WGL_NV_render_texture_rectangle
-*/
 
 #ifndef __EXTGL_H__
 #define __EXTGL_H__
@@ -1347,683 +1252,6 @@
 #define GL_LOGIC_OP GL_INDEX_LOGIC_OP
 #define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT
 
-/* functions */
-/*typedef void (APIENTRY * glAccumPROC) (GLenum op, GLfloat value);
-typedef void (APIENTRY * glAlphaFuncPROC) (GLenum func, GLclampf ref);
-typedef GLboolean (APIENTRY * glAreTexturesResidentPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRY * glArrayElementPROC) (GLint i);
-typedef void (APIENTRY * glBeginPROC) (GLenum mode);
-typedef void (APIENTRY * glBindTexturePROC) (GLenum target, GLuint texture);
-typedef void (APIENTRY * glBitmapPROC) (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
-typedef void (APIENTRY * glBlendFuncPROC) (GLenum sfactor, GLenum dfactor);
-typedef void (APIENTRY * glCallListPROC) (GLuint list);
-typedef void (APIENTRY * glCallListsPROC) (GLsizei n, GLenum type, const GLvoid *lists);
-typedef void (APIENTRY * glClearPROC) (GLbitfield mask);
-typedef void (APIENTRY * glClearAccumPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-typedef void (APIENTRY * glClearColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRY * glClearDepthPROC) (GLclampd depth);
-typedef void (APIENTRY * glClearIndexPROC) (GLfloat c);
-typedef void (APIENTRY * glClearStencilPROC) (GLint s);
-typedef void (APIENTRY * glClipPlanePROC) (GLenum plane, const GLdouble *equation);
-typedef void (APIENTRY * glColor3bPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRY * glColor3bvPROC) (const GLbyte *v);
-typedef void (APIENTRY * glColor3dPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRY * glColor3dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glColor3fPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRY * glColor3fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glColor3iPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRY * glColor3ivPROC) (const GLint *v);
-typedef void (APIENTRY * glColor3sPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRY * glColor3svPROC) (const GLshort *v);
-typedef void (APIENTRY * glColor3ubPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRY * glColor3ubvPROC) (const GLubyte *v);
-typedef void (APIENTRY * glColor3uiPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRY * glColor3uivPROC) (const GLuint *v);
-typedef void (APIENTRY * glColor3usPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRY * glColor3usvPROC) (const GLushort *v);
-typedef void (APIENTRY * glColor4bPROC) (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
-typedef void (APIENTRY * glColor4bvPROC) (const GLbyte *v);
-typedef void (APIENTRY * glColor4dPROC) (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
-typedef void (APIENTRY * glColor4dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glColor4fPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-typedef void (APIENTRY * glColor4fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glColor4iPROC) (GLint red, GLint green, GLint blue, GLint alpha);
-typedef void (APIENTRY * glColor4ivPROC) (const GLint *v);
-typedef void (APIENTRY * glColor4sPROC) (GLshort red, GLshort green, GLshort blue, GLshort alpha);
-typedef void (APIENTRY * glColor4svPROC) (const GLshort *v);
-typedef void (APIENTRY * glColor4ubPROC) (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-typedef void (APIENTRY * glColor4ubvPROC) (const GLubyte *v);
-typedef void (APIENTRY * glColor4uiPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-typedef void (APIENTRY * glColor4uivPROC) (const GLuint *v);
-typedef void (APIENTRY * glColor4usPROC) (GLushort red, GLushort green, GLushort blue, GLushort alpha);
-typedef void (APIENTRY * glColor4usvPROC) (const GLushort *v);
-typedef void (APIENTRY * glColorMaskPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-typedef void (APIENTRY * glColorMaterialPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRY * glColorPointerPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * glCopyPixelsPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
-typedef void (APIENTRY * glCopyTexImage1DPROC) (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRY * glCopyTexImage2DPROC) (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRY * glCopyTexSubImage1DPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRY * glCopyTexSubImage2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRY * glCullFacePROC) (GLenum mode);
-typedef void (APIENTRY * glDeleteListsPROC) (GLuint list, GLsizei range);
-typedef void (APIENTRY * glDeleteTexturesPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRY * glDepthFuncPROC) (GLenum func);
-typedef void (APIENTRY * glDepthMaskPROC) (GLboolean flag);
-typedef void (APIENTRY * glDepthRangePROC) (GLclampd zNear, GLclampd zFar);
-typedef void (APIENTRY * glDisablePROC) (GLenum cap);
-typedef void (APIENTRY * glDisableClientStatePROC) (GLenum array);
-typedef void (APIENTRY * glDrawArraysPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRY * glDrawBufferPROC) (GLenum mode);
-typedef void (APIENTRY * glDrawElementsPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRY * glDrawPixelsPROC) (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * glEdgeFlagPROC) (GLboolean flag);
-typedef void (APIENTRY * glEdgeFlagPointerPROC) (GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * glEdgeFlagvPROC) (const GLboolean *flag);
-typedef void (APIENTRY * glEnablePROC) (GLenum cap);
-typedef void (APIENTRY * glEnableClientStatePROC) (GLenum array);
-typedef void (APIENTRY * glEndPROC) (void);
-typedef void (APIENTRY * glEndListPROC) (void);
-typedef void (APIENTRY * glEvalCoord1dPROC) (GLdouble u);
-typedef void (APIENTRY * glEvalCoord1dvPROC) (const GLdouble *u);
-typedef void (APIENTRY * glEvalCoord1fPROC) (GLfloat u);
-typedef void (APIENTRY * glEvalCoord1fvPROC) (const GLfloat *u);
-typedef void (APIENTRY * glEvalCoord2dPROC) (GLdouble u, GLdouble v);
-typedef void (APIENTRY * glEvalCoord2dvPROC) (const GLdouble *u);
-typedef void (APIENTRY * glEvalCoord2fPROC) (GLfloat u, GLfloat v);
-typedef void (APIENTRY * glEvalCoord2fvPROC) (const GLfloat *u);
-typedef void (APIENTRY * glEvalMesh1PROC) (GLenum mode, GLint i1, GLint i2);
-typedef void (APIENTRY * glEvalMesh2PROC) (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-typedef void (APIENTRY * glEvalPoint1PROC) (GLint i);
-typedef void (APIENTRY * glEvalPoint2PROC) (GLint i, GLint j);
-typedef void (APIENTRY * glFeedbackBufferPROC) (GLsizei size, GLenum type, GLfloat *buffer);
-typedef void (APIENTRY * glFinishPROC) (void);
-typedef void (APIENTRY * glFlushPROC) (void);
-typedef void (APIENTRY * glFogfPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * glFogfvPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * glFogiPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * glFogivPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRY * glFrontFacePROC) (GLenum mode);
-typedef void (APIENTRY * glFrustumPROC) (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef GLuint (APIENTRY * glGenListsPROC) (GLsizei range);
-typedef void (APIENTRY * glGenTexturesPROC) (GLsizei n, GLuint *textures);
-typedef void (APIENTRY * glGetBooleanvPROC) (GLenum pname, GLboolean *params);
-typedef void (APIENTRY * glGetClipPlanePROC) (GLenum plane, GLdouble *equation);
-typedef void (APIENTRY * glGetDoublevPROC) (GLenum pname, GLdouble *params);
-typedef GLenum (APIENTRY * glGetErrorPROC) (void);
-typedef void (APIENTRY * glGetFloatvPROC) (GLenum pname, GLfloat *params);
-typedef void (APIENTRY * glGetIntegervPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRY * glGetLightfvPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * glGetLightivPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRY * glGetMapdvPROC) (GLenum target, GLenum query, GLdouble *v);
-typedef void (APIENTRY * glGetMapfvPROC) (GLenum target, GLenum query, GLfloat *v);
-typedef void (APIENTRY * glGetMapivPROC) (GLenum target, GLenum query, GLint *v);
-typedef void (APIENTRY * glGetMaterialfvPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * glGetMaterialivPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRY * glGetPixelMapfvPROC) (GLenum map, GLfloat *values);
-typedef void (APIENTRY * glGetPixelMapuivPROC) (GLenum map, GLuint *values);
-typedef void (APIENTRY * glGetPixelMapusvPROC) (GLenum map, GLushort *values);
-typedef void (APIENTRY * glGetPointervPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRY * glGetPolygonStipplePROC) (GLubyte *mask);
-typedef const GLubyte * (APIENTRY * glGetStringPROC) (GLenum name);
-typedef void (APIENTRY * glGetTexEnvfvPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * glGetTexEnvivPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * glGetTexGendvPROC) (GLenum coord, GLenum pname, GLdouble *params);
-typedef void (APIENTRY * glGetTexGenfvPROC) (GLenum coord, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * glGetTexGenivPROC) (GLenum coord, GLenum pname, GLint *params);
-typedef void (APIENTRY * glGetTexImagePROC) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRY * glGetTexLevelParameterfvPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * glGetTexLevelParameterivPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
-typedef void (APIENTRY * glGetTexParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * glGetTexParameterivPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * glHintPROC) (GLenum target, GLenum mode);
-typedef void (APIENTRY * glIndexMaskPROC) (GLuint mask);
-typedef void (APIENTRY * glIndexPointerPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * glIndexdPROC) (GLdouble c);
-typedef void (APIENTRY * glIndexdvPROC) (const GLdouble *c);
-typedef void (APIENTRY * glIndexfPROC) (GLfloat c);
-typedef void (APIENTRY * glIndexfvPROC) (const GLfloat *c);
-typedef void (APIENTRY * glIndexiPROC) (GLint c);
-typedef void (APIENTRY * glIndexivPROC) (const GLint *c);
-typedef void (APIENTRY * glIndexsPROC) (GLshort c);
-typedef void (APIENTRY * glIndexsvPROC) (const GLshort *c);
-typedef void (APIENTRY * glIndexubPROC) (GLubyte c);
-typedef void (APIENTRY * glIndexubvPROC) (const GLubyte *c);
-typedef void (APIENTRY * glInitNamesPROC) (void);
-typedef void (APIENTRY * glInterleavedArraysPROC) (GLenum format, GLsizei stride, const GLvoid *pointer);
-typedef GLboolean (APIENTRY * glIsEnabledPROC) (GLenum cap);
-typedef GLboolean (APIENTRY * glIsListPROC) (GLuint list);
-typedef GLboolean (APIENTRY * glIsTexturePROC) (GLuint texture);
-typedef void (APIENTRY * glLightModelfPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * glLightModelfvPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * glLightModeliPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * glLightModelivPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRY * glLightfPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRY * glLightfvPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * glLightiPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRY * glLightivPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRY * glLineStipplePROC) (GLint factor, GLushort pattern);
-typedef void (APIENTRY * glLineWidthPROC) (GLfloat width);
-typedef void (APIENTRY * glListBasePROC) (GLuint base);
-typedef void (APIENTRY * glLoadIdentityPROC) (void);
-typedef void (APIENTRY * glLoadMatrixdPROC) (const GLdouble *m);
-typedef void (APIENTRY * glLoadMatrixfPROC) (const GLfloat *m);
-typedef void (APIENTRY * glLoadNamePROC) (GLuint name);
-typedef void (APIENTRY * glLogicOpPROC) (GLenum opcode);
-typedef void (APIENTRY * glMap1dPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-typedef void (APIENTRY * glMap1fPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-typedef void (APIENTRY * glMap2dPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-typedef void (APIENTRY * glMap2fPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-typedef void (APIENTRY * glMapGrid1dPROC) (GLint un, GLdouble u1, GLdouble u2);
-typedef void (APIENTRY * glMapGrid1fPROC) (GLint un, GLfloat u1, GLfloat u2);
-typedef void (APIENTRY * glMapGrid2dPROC) (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
-typedef void (APIENTRY * glMapGrid2fPROC) (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
-typedef void (APIENTRY * glMaterialfPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRY * glMaterialfvPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * glMaterialiPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRY * glMaterialivPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRY * glMatrixModePROC) (GLenum mode);
-typedef void (APIENTRY * glMultMatrixdPROC) (const GLdouble *m);
-typedef void (APIENTRY * glMultMatrixfPROC) (const GLfloat *m);
-typedef void (APIENTRY * glNewListPROC) (GLuint list, GLenum mode);
-typedef void (APIENTRY * glNormal3bPROC) (GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRY * glNormal3bvPROC) (const GLbyte *v);
-typedef void (APIENTRY * glNormal3dPROC) (GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRY * glNormal3dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glNormal3fPROC) (GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRY * glNormal3fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glNormal3iPROC) (GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRY * glNormal3ivPROC) (const GLint *v);
-typedef void (APIENTRY * glNormal3sPROC) (GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRY * glNormal3svPROC) (const GLshort *v);
-typedef void (APIENTRY * glNormalPointerPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * glOrthoPROC) (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRY * glPassThroughPROC) (GLfloat token);
-typedef void (APIENTRY * glPixelMapfvPROC) (GLenum map, GLsizei mapsize, const GLfloat *values);
-typedef void (APIENTRY * glPixelMapuivPROC) (GLenum map, GLsizei mapsize, const GLuint *values);
-typedef void (APIENTRY * glPixelMapusvPROC) (GLenum map, GLsizei mapsize, const GLushort *values);
-typedef void (APIENTRY * glPixelStorefPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * glPixelStoreiPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * glPixelTransferfPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * glPixelTransferiPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * glPixelZoomPROC) (GLfloat xfactor, GLfloat yfactor);
-typedef void (APIENTRY * glPointSizePROC) (GLfloat size);
-typedef void (APIENTRY * glPolygonModePROC) (GLenum face, GLenum mode);
-typedef void (APIENTRY * glPolygonOffsetPROC) (GLfloat factor, GLfloat units);
-typedef void (APIENTRY * glPolygonStipplePROC) (const GLubyte *mask);
-typedef void (APIENTRY * glPopAttribPROC) (void);
-typedef void (APIENTRY * glPopClientAttribPROC) (void);
-typedef void (APIENTRY * glPopMatrixPROC) (void);
-typedef void (APIENTRY * glPopNamePROC) (void);
-typedef void (APIENTRY * glPrioritizeTexturesPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-typedef void (APIENTRY * glPushAttribPROC) (GLbitfield mask);
-typedef void (APIENTRY * glPushClientAttribPROC) (GLbitfield mask);
-typedef void (APIENTRY * glPushMatrixPROC) (void);
-typedef void (APIENTRY * glPushNamePROC) (GLuint name);
-typedef void (APIENTRY * glRasterPos2dPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRY * glRasterPos2dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glRasterPos2fPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRY * glRasterPos2fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glRasterPos2iPROC) (GLint x, GLint y);
-typedef void (APIENTRY * glRasterPos2ivPROC) (const GLint *v);
-typedef void (APIENTRY * glRasterPos2sPROC) (GLshort x, GLshort y);
-typedef void (APIENTRY * glRasterPos2svPROC) (const GLshort *v);
-typedef void (APIENTRY * glRasterPos3dPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * glRasterPos3dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glRasterPos3fPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * glRasterPos3fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glRasterPos3iPROC) (GLint x, GLint y, GLint z);
-
-typedef void (APIENTRY * glRasterPos3ivPROC) (const GLint *v);
-typedef void (APIENTRY * glRasterPos3sPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRY * glRasterPos3svPROC) (const GLshort *v);
-typedef void (APIENTRY * glRasterPos4dPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRY * glRasterPos4dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glRasterPos4fPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * glRasterPos4fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glRasterPos4iPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRY * glRasterPos4ivPROC) (const GLint *v);
-typedef void (APIENTRY * glRasterPos4sPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRY * glRasterPos4svPROC) (const GLshort *v);
-typedef void (APIENTRY * glReadBufferPROC) (GLenum mode);
-typedef void (APIENTRY * glReadPixelsPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-typedef void (APIENTRY * glRectdPROC) (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-typedef void (APIENTRY * glRectdvPROC) (const GLdouble *v1, const GLdouble *v2);
-typedef void (APIENTRY * glRectfPROC) (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-typedef void (APIENTRY * glRectfvPROC) (const GLfloat *v1, const GLfloat *v2);
-typedef void (APIENTRY * glRectiPROC) (GLint x1, GLint y1, GLint x2, GLint y2);
-typedef void (APIENTRY * glRectivPROC) (const GLint *v1, const GLint *v2);
-typedef void (APIENTRY * glRectsPROC) (GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-typedef void (APIENTRY * glRectsvPROC) (const GLshort *v1, const GLshort *v2);
-typedef GLint (APIENTRY * glRenderModePROC) (GLenum mode);
-typedef void (APIENTRY * glRotatedPROC) (GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * glRotatefPROC) (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * glScaledPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * glScalefPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * glScissorPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRY * glSelectBufferPROC) (GLsizei size, GLuint *buffer);
-typedef void (APIENTRY * glShadeModelPROC) (GLenum mode);
-typedef void (APIENTRY * glStencilFuncPROC) (GLenum func, GLint ref, GLuint mask);
-typedef void (APIENTRY * glStencilMaskPROC) (GLuint mask);
-typedef void (APIENTRY * glStencilOpPROC) (GLenum fail, GLenum zfail, GLenum zpass);
-typedef void (APIENTRY * glTexCoord1dPROC) (GLdouble s);
-typedef void (APIENTRY * glTexCoord1dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glTexCoord1fPROC) (GLfloat s);
-typedef void (APIENTRY * glTexCoord1fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glTexCoord1iPROC) (GLint s);
-typedef void (APIENTRY * glTexCoord1ivPROC) (const GLint *v);
-typedef void (APIENTRY * glTexCoord1sPROC) (GLshort s);
-typedef void (APIENTRY * glTexCoord1svPROC) (const GLshort *v);
-typedef void (APIENTRY * glTexCoord2dPROC) (GLdouble s, GLdouble t);
-typedef void (APIENTRY * glTexCoord2dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glTexCoord2fPROC) (GLfloat s, GLfloat t);
-typedef void (APIENTRY * glTexCoord2fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glTexCoord2iPROC) (GLint s, GLint t);
-typedef void (APIENTRY * glTexCoord2ivPROC) (const GLint *v);
-typedef void (APIENTRY * glTexCoord2sPROC) (GLshort s, GLshort t);
-typedef void (APIENTRY * glTexCoord2svPROC) (const GLshort *v);
-typedef void (APIENTRY * glTexCoord3dPROC) (GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRY * glTexCoord3dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glTexCoord3fPROC) (GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRY * glTexCoord3fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glTexCoord3iPROC) (GLint s, GLint t, GLint r);
-typedef void (APIENTRY * glTexCoord3ivPROC) (const GLint *v);
-typedef void (APIENTRY * glTexCoord3sPROC) (GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRY * glTexCoord3svPROC) (const GLshort *v);
-typedef void (APIENTRY * glTexCoord4dPROC) (GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRY * glTexCoord4dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glTexCoord4fPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRY * glTexCoord4fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glTexCoord4iPROC) (GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRY * glTexCoord4ivPROC) (const GLint *v);
-typedef void (APIENTRY * glTexCoord4sPROC) (GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRY * glTexCoord4svPROC) (const GLshort *v);
-typedef void (APIENTRY * glTexCoordPointerPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * glTexEnvfPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRY * glTexEnvfvPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * glTexEnviPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRY * glTexEnvivPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * glTexGendPROC) (GLenum coord, GLenum pname, GLdouble param);
-typedef void (APIENTRY * glTexGendvPROC) (GLenum coord, GLenum pname, const GLdouble *params);
-typedef void (APIENTRY * glTexGenfPROC) (GLenum coord, GLenum pname, GLfloat param);
-typedef void (APIENTRY * glTexGenfvPROC) (GLenum coord, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * glTexGeniPROC) (GLenum coord, GLenum pname, GLint param);
-typedef void (APIENTRY * glTexGenivPROC) (GLenum coord, GLenum pname, const GLint *params);
-typedef void (APIENTRY * glTexImage1DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * glTexImage2DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * glTexParameterfPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRY * glTexParameterfvPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * glTexParameteriPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRY * glTexParameterivPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * glTexSubImage1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * glTexSubImage2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * glTranslatedPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * glTranslatefPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * glVertex2dPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRY * glVertex2dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glVertex2fPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRY * glVertex2fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glVertex2iPROC) (GLint x, GLint y);
-typedef void (APIENTRY * glVertex2ivPROC) (const GLint *v);
-typedef void (APIENTRY * glVertex2sPROC) (GLshort x, GLshort y);
-typedef void (APIENTRY * glVertex2svPROC) (const GLshort *v);
-typedef void (APIENTRY * glVertex3dPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * glVertex3dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glVertex3fPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * glVertex3fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glVertex3iPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRY * glVertex3ivPROC) (const GLint *v);
-typedef void (APIENTRY * glVertex3sPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRY * glVertex3svPROC) (const GLshort *v);
-typedef void (APIENTRY * glVertex4dPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRY * glVertex4dvPROC) (const GLdouble *v);
-typedef void (APIENTRY * glVertex4fPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * glVertex4fvPROC) (const GLfloat *v);
-typedef void (APIENTRY * glVertex4iPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRY * glVertex4ivPROC) (const GLint *v);
-typedef void (APIENTRY * glVertex4sPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRY * glVertex4svPROC) (const GLshort *v);
-typedef void (APIENTRY * glVertexPointerPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * glViewportPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
-
-extern glAccumPROC glAccum;
-extern glAlphaFuncPROC glAlphaFunc;
-extern glAreTexturesResidentPROC glAreTexturesResident;
-extern glArrayElementPROC glArrayElement;
-extern glBeginPROC glBegin;
-extern glBindTexturePROC glBindTexture;
-extern glBitmapPROC glBitmap;
-extern glBlendFuncPROC glBlendFunc;
-extern glCallListPROC glCallList;
-extern glCallListsPROC glCallLists;
-extern glClearPROC glClear;
-extern glClearAccumPROC glClearAccum;
-extern glClearColorPROC glClearColor;
-extern glClearDepthPROC glClearDepth;
-extern glClearIndexPROC glClearIndex;
-extern glClearStencilPROC glClearStencil;
-extern glClipPlanePROC glClipPlane;
-extern glColor3bPROC glColor3b;
-extern glColor3bvPROC glColor3bv;
-extern glColor3dPROC glColor3d;
-extern glColor3dvPROC glColor3dv;
-extern glColor3fPROC glColor3f;
-extern glColor3fvPROC glColor3fv;
-extern glColor3iPROC glColor3i;
-extern glColor3ivPROC glColor3iv;
-extern glColor3sPROC glColor3s;
-extern glColor3svPROC glColor3sv;
-extern glColor3ubPROC glColor3ub;
-extern glColor3ubvPROC glColor3ubv;
-extern glColor3uiPROC glColor3ui;
-extern glColor3uivPROC glColor3uiv;
-extern glColor3usPROC glColor3us;
-extern glColor3usvPROC glColor3usv;
-extern glColor4bPROC glColor4b;
-extern glColor4bvPROC glColor4bv;
-extern glColor4dPROC glColor4d;
-extern glColor4dvPROC glColor4dv;
-extern glColor4fPROC glColor4f;
-extern glColor4fvPROC glColor4fv;
-extern glColor4iPROC glColor4i;
-extern glColor4ivPROC glColor4iv;
-extern glColor4sPROC glColor4s;
-extern glColor4svPROC glColor4sv;
-extern glColor4ubPROC glColor4ub;
-extern glColor4ubvPROC glColor4ubv;
-extern glColor4uiPROC glColor4ui;
-extern glColor4uivPROC glColor4uiv;
-extern glColor4usPROC glColor4us;
-extern glColor4usvPROC glColor4usv;
-extern glColorMaskPROC glColorMask;
-extern glColorMaterialPROC glColorMaterial;
-extern glColorPointerPROC glColorPointer;
-extern glCopyPixelsPROC glCopyPixels;
-extern glCopyTexImage1DPROC glCopyTexImage1D;
-extern glCopyTexImage2DPROC glCopyTexImage2D;
-extern glCopyTexSubImage1DPROC glCopyTexSubImage1D;
-extern glCopyTexSubImage2DPROC glCopyTexSubImage2D;
-extern glCullFacePROC glCullFace;
-extern glDeleteListsPROC glDeleteLists;
-extern glDeleteTexturesPROC glDeleteTextures;
-extern glDepthFuncPROC glDepthFunc;
-extern glDepthMaskPROC glDepthMask;
-extern glDepthRangePROC glDepthRange;
-extern glDisablePROC glDisable;
-extern glDisableClientStatePROC glDisableClientState;
-extern glDrawArraysPROC glDrawArrays;
-extern glDrawBufferPROC glDrawBuffer;
-extern glDrawElementsPROC glDrawElements;
-extern glDrawPixelsPROC glDrawPixels;
-extern glEdgeFlagPROC glEdgeFlag;
-extern glEdgeFlagPointerPROC glEdgeFlagPointer;
-extern glEdgeFlagvPROC glEdgeFlagv;
-extern glEnablePROC glEnable;
-extern glEnableClientStatePROC glEnableClientState;
-extern glEndPROC glEnd;
-extern glEndListPROC glEndList;
-extern glEvalCoord1dPROC glEvalCoord1d;
-extern glEvalCoord1dvPROC glEvalCoord1dv;
-extern glEvalCoord1fPROC glEvalCoord1f;
-extern glEvalCoord1fvPROC glEvalCoord1fv;
-extern glEvalCoord2dPROC glEvalCoord2d;
-extern glEvalCoord2dvPROC glEvalCoord2dv;
-extern glEvalCoord2fPROC glEvalCoord2f;
-extern glEvalCoord2fvPROC glEvalCoord2fv;
-extern glEvalMesh1PROC glEvalMesh1;
-extern glEvalMesh2PROC glEvalMesh2;
-extern glEvalPoint1PROC glEvalPoint1;
-extern glEvalPoint2PROC glEvalPoint2;
-extern glFeedbackBufferPROC glFeedbackBuffer;
-extern glFinishPROC glFinish;
-extern glFlushPROC glFlush;
-extern glFogfPROC glFogf;
-extern glFogfvPROC glFogfv;
-extern glFogiPROC glFogi;
-extern glFogivPROC glFogiv;
-extern glFrontFacePROC glFrontFace;
-extern glFrustumPROC glFrustum;
-extern glGenListsPROC glGenLists;
-extern glGenTexturesPROC glGenTextures;
-extern glGetBooleanvPROC glGetBooleanv;
-extern glGetClipPlanePROC glGetClipPlane;
-extern glGetDoublevPROC glGetDoublev;
-extern glGetErrorPROC glGetError;
-extern glGetFloatvPROC glGetFloatv;
-extern glGetIntegervPROC glGetIntegerv;
-extern glGetLightfvPROC glGetLightfv;
-extern glGetLightivPROC glGetLightiv;
-extern glGetMapdvPROC glGetMapdv;
-extern glGetMapfvPROC glGetMapfv;
-extern glGetMapivPROC glGetMapiv;
-extern glGetMaterialfvPROC glGetMaterialfv;
-extern glGetMaterialivPROC glGetMaterialiv;
-extern glGetPixelMapfvPROC glGetPixelMapfv;
-extern glGetPixelMapuivPROC glGetPixelMapuiv;
-extern glGetPixelMapusvPROC glGetPixelMapusv;
-extern glGetPointervPROC glGetPointerv;
-extern glGetPolygonStipplePROC glGetPolygonStipple;
-extern glGetStringPROC glGetString;
-extern glGetTexEnvfvPROC glGetTexEnvfv;
-extern glGetTexEnvivPROC glGetTexEnviv;
-extern glGetTexGendvPROC glGetTexGendv;
-extern glGetTexGenfvPROC glGetTexGenfv;
-extern glGetTexGenivPROC glGetTexGeniv;
-extern glGetTexImagePROC glGetTexImage;
-extern glGetTexLevelParameterfvPROC glGetTexLevelParameterfv;
-extern glGetTexLevelParameterivPROC glGetTexLevelParameteriv;
-extern glGetTexParameterfvPROC glGetTexParameterfv;
-extern glGetTexParameterivPROC glGetTexParameteriv;
-extern glHintPROC glHint;
-extern glIndexMaskPROC glIndexMask;
-extern glIndexPointerPROC glIndexPointer;
-extern glIndexdPROC glIndexd;
-extern glIndexdvPROC glIndexdv;
-extern glIndexfPROC glIndexf;
-extern glIndexfvPROC glIndexfv;
-extern glIndexiPROC glIndexi;
-extern glIndexivPROC glIndexiv;
-extern glIndexsPROC glIndexs;
-extern glIndexsvPROC glIndexsv;
-extern glIndexubPROC glIndexub;
-extern glIndexubvPROC glIndexubv;
-extern glInitNamesPROC glInitNames;
-extern glInterleavedArraysPROC glInterleavedArrays;
-extern glIsEnabledPROC glIsEnabled;
-extern glIsListPROC glIsList;
-extern glIsTexturePROC glIsTexture;
-extern glLightModelfPROC glLightModelf;
-extern glLightModelfvPROC glLightModelfv;
-extern glLightModeliPROC glLightModeli;
-extern glLightModelivPROC glLightModeliv;
-extern glLightfPROC glLightf;
-extern glLightfvPROC glLightfv;
-extern glLightiPROC glLighti;
-extern glLightivPROC glLightiv;
-extern glLineStipplePROC glLineStipple;
-extern glLineWidthPROC glLineWidth;
-extern glListBasePROC glListBase;
-extern glLoadIdentityPROC glLoadIdentity;
-extern glLoadMatrixdPROC glLoadMatrixd;
-extern glLoadMatrixfPROC glLoadMatrixf;
-extern glLoadNamePROC glLoadName;
-extern glLogicOpPROC glLogicOp;
-extern glMap1dPROC glMap1d;
-extern glMap1fPROC glMap1f;
-extern glMap2dPROC glMap2d;
-extern glMap2fPROC glMap2f;
-extern glMapGrid1dPROC glMapGrid1d;
-extern glMapGrid1fPROC glMapGrid1f;
-extern glMapGrid2dPROC glMapGrid2d;
-extern glMapGrid2fPROC glMapGrid2f;
-extern glMaterialfPROC glMaterialf;
-extern glMaterialfvPROC glMaterialfv;
-extern glMaterialiPROC glMateriali;
-extern glMaterialivPROC glMaterialiv;
-extern glMatrixModePROC glMatrixMode;
-extern glMultMatrixdPROC glMultMatrixd;
-extern glMultMatrixfPROC glMultMatrixf;
-extern glNewListPROC glNewList;
-extern glNormal3bPROC glNormal3b;
-extern glNormal3bvPROC glNormal3bv;
-extern glNormal3dPROC glNormal3d;
-extern glNormal3dvPROC glNormal3dv;
-extern glNormal3fPROC glNormal3f;
-extern glNormal3fvPROC glNormal3fv;
-extern glNormal3iPROC glNormal3i;
-extern glNormal3ivPROC glNormal3iv;
-extern glNormal3sPROC glNormal3s;
-extern glNormal3svPROC glNormal3sv;
-extern glNormalPointerPROC glNormalPointer;
-extern glOrthoPROC glOrtho;
-extern glPassThroughPROC glPassThrough;
-extern glPixelMapfvPROC glPixelMapfv;
-extern glPixelMapuivPROC glPixelMapuiv;
-extern glPixelMapusvPROC glPixelMapusv;
-extern glPixelStorefPROC glPixelStoref;
-extern glPixelStoreiPROC glPixelStorei;
-extern glPixelTransferfPROC glPixelTransferf;
-extern glPixelTransferiPROC glPixelTransferi;
-extern glPixelZoomPROC glPixelZoom;
-extern glPointSizePROC glPointSize;
-extern glPolygonModePROC glPolygonMode;
-extern glPolygonOffsetPROC glPolygonOffset;
-extern glPolygonStipplePROC glPolygonStipple;
-extern glPopAttribPROC glPopAttrib;
-extern glPopClientAttribPROC glPopClientAttrib;
-extern glPopMatrixPROC glPopMatrix;
-extern glPopNamePROC glPopName;
-extern glPrioritizeTexturesPROC glPrioritizeTextures;
-extern glPushAttribPROC glPushAttrib;
-extern glPushClientAttribPROC glPushClientAttrib;
-extern glPushMatrixPROC glPushMatrix;
-extern glPushNamePROC glPushName;
-extern glRasterPos2dPROC glRasterPos2d;
-extern glRasterPos2dvPROC glRasterPos2dv;
-extern glRasterPos2fPROC glRasterPos2f;
-extern glRasterPos2fvPROC glRasterPos2fv;
-extern glRasterPos2iPROC glRasterPos2i;
-extern glRasterPos2ivPROC glRasterPos2iv;
-extern glRasterPos2sPROC glRasterPos2s;
-extern glRasterPos2svPROC glRasterPos2sv;
-extern glRasterPos3dPROC glRasterPos3d;
-extern glRasterPos3dvPROC glRasterPos3dv;
-extern glRasterPos3fPROC glRasterPos3f;
-extern glRasterPos3fvPROC glRasterPos3fv;
-extern glRasterPos3iPROC glRasterPos3i;
-
-extern glRasterPos3ivPROC glRasterPos3iv;
-extern glRasterPos3sPROC glRasterPos3s;
-extern glRasterPos3svPROC glRasterPos3sv;
-extern glRasterPos4dPROC glRasterPos4d;
-extern glRasterPos4dvPROC glRasterPos4dv;
-extern glRasterPos4fPROC glRasterPos4f;
-extern glRasterPos4fvPROC glRasterPos4fv;
-extern glRasterPos4iPROC glRasterPos4i;
-extern glRasterPos4ivPROC glRasterPos4iv;
-extern glRasterPos4sPROC glRasterPos4s;
-extern glRasterPos4svPROC glRasterPos4sv;
-extern glReadBufferPROC glReadBuffer;
-extern glReadPixelsPROC glReadPixels;
-extern glRectdPROC glRectd;
-extern glRectdvPROC glRectdv;
-extern glRectfPROC glRectf;
-extern glRectfvPROC glRectfv;
-extern glRectiPROC glRecti;
-extern glRectivPROC glRectiv;
-extern glRectsPROC glRects;
-extern glRectsvPROC glRectsv;
-extern glRenderModePROC glRenderMode;
-extern glRotatedPROC glRotated;
-extern glRotatefPROC glRotatef;
-extern glScaledPROC glScaled;
-extern glScalefPROC glScalef;
-extern glScissorPROC glScissor;
-extern glSelectBufferPROC glSelectBuffer;
-extern glShadeModelPROC glShadeModel;
-extern glStencilFuncPROC glStencilFunc;
-extern glStencilMaskPROC glStencilMask;
-extern glStencilOpPROC glStencilOp;
-extern glTexCoord1dPROC glTexCoord1d;
-extern glTexCoord1dvPROC glTexCoord1dv;
-extern glTexCoord1fPROC glTexCoord1f;
-extern glTexCoord1fvPROC glTexCoord1fv;
-extern glTexCoord1iPROC glTexCoord1i;
-extern glTexCoord1ivPROC glTexCoord1iv;
-extern glTexCoord1sPROC glTexCoord1s;
-extern glTexCoord1svPROC glTexCoord1sv;
-extern glTexCoord2dPROC glTexCoord2d;
-extern glTexCoord2dvPROC glTexCoord2dv;
-extern glTexCoord2fPROC glTexCoord2f;
-extern glTexCoord2fvPROC glTexCoord2fv;
-extern glTexCoord2iPROC glTexCoord2i;
-extern glTexCoord2ivPROC glTexCoord2iv;
-extern glTexCoord2sPROC glTexCoord2s;
-extern glTexCoord2svPROC glTexCoord2sv;
-extern glTexCoord3dPROC glTexCoord3d;
-extern glTexCoord3dvPROC glTexCoord3dv;
-extern glTexCoord3fPROC glTexCoord3f;
-extern glTexCoord3fvPROC glTexCoord3fv;
-extern glTexCoord3iPROC glTexCoord3i;
-extern glTexCoord3ivPROC glTexCoord3iv;
-extern glTexCoord3sPROC glTexCoord3s;
-extern glTexCoord3svPROC glTexCoord3sv;
-extern glTexCoord4dPROC glTexCoord4d;
-extern glTexCoord4dvPROC glTexCoord4dv;
-extern glTexCoord4fPROC glTexCoord4f;
-extern glTexCoord4fvPROC glTexCoord4fv;
-extern glTexCoord4iPROC glTexCoord4i;
-extern glTexCoord4ivPROC glTexCoord4iv;
-extern glTexCoord4sPROC glTexCoord4s;
-extern glTexCoord4svPROC glTexCoord4sv;
-extern glTexCoordPointerPROC glTexCoordPointer;
-extern glTexEnvfPROC glTexEnvf;
-extern glTexEnvfvPROC glTexEnvfv;
-extern glTexEnviPROC glTexEnvi;
-extern glTexEnvivPROC glTexEnviv;
-extern glTexGendPROC glTexGend;
-extern glTexGendvPROC glTexGendv;
-extern glTexGenfPROC glTexGenf;
-extern glTexGenfvPROC glTexGenfv;
-extern glTexGeniPROC glTexGeni;
-extern glTexGenivPROC glTexGeniv;
-extern glTexImage1DPROC glTexImage1D;
-extern glTexImage2DPROC glTexImage2D;
-extern glTexParameterfPROC glTexParameterf;
-extern glTexParameterfvPROC glTexParameterfv;
-extern glTexParameteriPROC glTexParameteri;
-extern glTexParameterivPROC glTexParameteriv;
-extern glTexSubImage1DPROC glTexSubImage1D;
-extern glTexSubImage2DPROC glTexSubImage2D;
-extern glTranslatedPROC glTranslated;
-extern glTranslatefPROC glTranslatef;
-extern glVertex2dPROC glVertex2d;
-extern glVertex2dvPROC glVertex2dv;
-extern glVertex2fPROC glVertex2f;
-extern glVertex2fvPROC glVertex2fv;
-extern glVertex2iPROC glVertex2i;
-extern glVertex2ivPROC glVertex2iv;
-extern glVertex2sPROC glVertex2s;
-extern glVertex2svPROC glVertex2sv;
-extern glVertex3dPROC glVertex3d;
-extern glVertex3dvPROC glVertex3dv;
-extern glVertex3fPROC glVertex3f;
-extern glVertex3fvPROC glVertex3fv;
-extern glVertex3iPROC glVertex3i;
-extern glVertex3ivPROC glVertex3iv;
-extern glVertex3sPROC glVertex3s;
-extern glVertex3svPROC glVertex3sv;
-extern glVertex4dPROC glVertex4d;
-extern glVertex4dvPROC glVertex4dv;
-extern glVertex4fPROC glVertex4f;
-extern glVertex4fvPROC glVertex4fv;
-extern glVertex4iPROC glVertex4i;
-extern glVertex4ivPROC glVertex4iv;
-extern glVertex4sPROC glVertex4s;
-extern glVertex4svPROC glVertex4sv;
-extern glVertexPointerPROC glVertexPointer;
-extern glViewportPROC glViewport;
-*/
 /* OpenGL 1.2 */
 
 #define GL_RESCALE_NORMAL                                       0x803A
@@ -2412,9 +1640,9 @@
 #define GL_BUFFER_MAPPED_ARB                            0x88BC
 #define GL_BUFFER_MAP_POINTER_ARB                       0x88BD
 
-typedef int GLintptrARB;
+/*typedef int GLintptrARB;
 typedef unsigned int GLsizeiptrARB;
-
+*/
 /*-------------------------------------------------------------------*/
 /*------------ARB_MULTISAMPLE----------------------------------------*/
 /*-------------------------------------------------------------------*/
@@ -2771,12 +1999,6 @@
 #define GL_CULL_VERTEX_EYE_POSITION_EXT                         0x81AB
 #define GL_CULL_VERTEX_OBJECT_POSITION_EXT                      0x81AC
 
-typedef void (APIENTRY * glCullParameterfvEXTPROC) (GLenum pname, GLfloat *params);
-typedef void (APIENTRY * glCullParameterdvEXTPROC) (GLenum pname, GLdouble *params);
-
-extern glCullParameterfvEXTPROC glCullParameterfvEXT;
-extern glCullParameterdvEXTPROC glCullParameterdvEXT;
-
 /*-------------------------------------------------------------------*/
 /*------------GL_ATI_POINT_CULL_MODE---------------------------------*/
 /*-------------------------------------------------------------------*/
@@ -2800,18 +2022,6 @@
 #define GL_ELEMENT_ARRAY_TYPE_NV                                0x8769
 #define GL_ELEMENT_ARRAY_POINTER_NV                             0x876A
 
-typedef void (APIENTRY * glElementPointerNVPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRY * glDrawElementArrayNVPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRY * glDrawRangeElementArrayNVPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRY * glMultiDrawElementArrayNVPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRY * glMultiDrawRangeElementArrayNVPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-
-extern glElementPointerNVPROC glElementPointerNV;
-extern glDrawElementArrayNVPROC glDrawElementArrayNV;
-extern ...
 
[truncated message content]

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

Modified Files:
	common_tools.cpp common_tools.h extal.cpp extal.h extgl.cpp 
	extgl.h org_lwjgl_openal_AL10.cpp org_lwjgl_openal_ALC.cpp 
	org_lwjgl_opengl_GL11.cpp 
Removed Files:
	org_lwjgl_openal_AL10.h org_lwjgl_openal_ALC.h 
Log Message:
Converted openal to dynamic java native methods

Index: common_tools.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- common_tools.cpp	9 Mar 2004 09:25:08 -0000	1.9
+++ common_tools.cpp	9 Mar 2004 11:03:08 -0000	1.10
@@ -142,7 +142,7 @@
 	return clazz;
 }
 
-void ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions) {
+bool ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions) {
 	JNINativeMethod *methods = (JNINativeMethod *)malloc(num_functions*sizeof(JNINativeMethod));
 	for (int i = 0; i < num_functions; i++) {
 		JavaMethodAndExtFunction *function = functions + i;
@@ -153,7 +153,7 @@
 				if (ext_set != NULL)
 					ext_removeExtension(env, ext_set, ext_name);
 				free(methods);
-				return;
+				return false;
 			}
 			void **ext_function_pointer_pointer = function->ext_function_pointer;
 			*ext_function_pointer_pointer = ext_func_pointer;
@@ -167,5 +167,6 @@
 	free(methods);
 	if (result != 0)
 		printfDebug("Could not register natives for extension %s\n", ext_name);
+	return true;
 }
 

Index: common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- common_tools.h	9 Mar 2004 09:25:08 -0000	1.9
+++ common_tools.h	9 Mar 2004 11:03:08 -0000	1.10
@@ -99,6 +99,6 @@
 
 extern void doExtension(JNIEnv *env, jobject ext_set, const char *method_name, const char *ext);
 extern jclass ext_ResetClass(JNIEnv *env, const char *class_name);
-extern void ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions);
+extern bool ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions);
 
 #endif

Index: extal.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- extal.cpp	8 Mar 2004 15:21:10 -0000	1.16
+++ extal.cpp	9 Mar 2004 11:03:08 -0000	1.17
@@ -48,77 +48,6 @@
  * @author Brian Matzon <br...@ma...>
  * @version $Revision$
  */
-alEnablePROC alEnable = NULL;
-alDisablePROC alDisable = NULL;
-alIsEnabledPROC alIsEnabled = NULL;
-alHintPROC alHint = NULL;
-alGetBooleanPROC alGetBoolean = NULL;
-alGetIntegerPROC alGetInteger = NULL;
-alGetFloatPROC alGetFloat = NULL;
-alGetDoublePROC alGetDouble = NULL;
-alGetBooleanvPROC alGetBooleanv = NULL;
-alGetIntegervPROC alGetIntegerv = NULL;
-alGetFloatvPROC alGetFloatv = NULL;
-alGetDoublevPROC alGetDoublev = NULL;
-alGetStringPROC alGetString = NULL;
-alGetErrorPROC alGetError = NULL;
-alIsExtensionPresentPROC alIsExtensionPresent = NULL;
-alGetProcAddressPROC alGetProcAddress = NULL;
-alGetEnumValuePROC alGetEnumValue = NULL;
-alListeneriPROC alListeneri = NULL;
-alListenerfPROC alListenerf = NULL;
-alListener3fPROC alListener3f = NULL;
-alListenerfvPROC alListenerfv = NULL;
-alGetListeneriPROC alGetListeneri = NULL;
-alGetListenerfPROC alGetListenerf = NULL;
-alGetListener3fPROC alGetListener3f = NULL;
-alGetListenerfvPROC alGetListenerfv = NULL;
-alGenSourcesPROC alGenSources = NULL;
-alDeleteSourcesPROC alDeleteSources = NULL;
-alIsSourcePROC alIsSource = NULL;
-alSourceiPROC alSourcei = NULL;
-alSourcefPROC alSourcef = NULL;
-alSource3fPROC alSource3f = NULL;
-alSourcefvPROC alSourcefv = NULL;
-alGetSourceiPROC alGetSourcei = NULL;
-alGetSourcefPROC alGetSourcef = NULL;
-alGetSource3fPROC alGetSource3f = NULL;
-alGetSourcefvPROC alGetSourcefv = NULL;
-alSourcePlayvPROC alSourcePlayv = NULL;
-alSourcePausevPROC alSourcePausev = NULL;
-alSourceStopvPROC alSourceStopv = NULL;
-alSourceRewindvPROC alSourceRewindv = NULL;
-alSourcePlayPROC alSourcePlay = NULL;
-alSourcePausePROC alSourcePause = NULL;
-alSourceStopPROC alSourceStop = NULL;
-alSourceRewindPROC alSourceRewind = NULL;
-alGenBuffersPROC alGenBuffers = NULL;
-alDeleteBuffersPROC alDeleteBuffers = NULL;
-alIsBufferPROC alIsBuffer = NULL;
-alBufferDataPROC alBufferData = NULL;
-alGetBufferiPROC alGetBufferi = NULL;
-alGetBufferfPROC alGetBufferf = NULL;
-alSourceQueueBuffersPROC alSourceQueueBuffers = NULL;
-alSourceUnqueueBuffersPROC alSourceUnqueueBuffers = NULL;
-alDistanceModelPROC alDistanceModel = NULL;
-alDopplerFactorPROC alDopplerFactor = NULL;
-alDopplerVelocityPROC alDopplerVelocity = NULL;
-alcGetStringPROC alcGetString = NULL;
-alcGetIntegervPROC alcGetIntegerv = NULL;
-alcOpenDevicePROC alcOpenDevice = NULL;
-alcCloseDevicePROC alcCloseDevice = NULL;
-alcCreateContextPROC alcCreateContext = NULL;
-alcMakeContextCurrentPROC alcMakeContextCurrent = NULL;
-alcProcessContextPROC alcProcessContext = NULL;
-alcGetCurrentContextPROC alcGetCurrentContext = NULL;
-alcGetContextsDevicePROC alcGetContextsDevice = NULL;
-alcSuspendContextPROC alcSuspendContext = NULL;
-alcDestroyContextPROC alcDestroyContext = NULL;
-alcGetErrorPROC alcGetError = NULL;
-alcIsExtensionPresentPROC alcIsExtensionPresent = NULL;
-alcGetProcAddressPROC alcGetProcAddress = NULL;
-alcGetEnumValuePROC alcGetEnumValue = NULL;
-
 #ifdef _WIN32
 EAXSet	eaxSet;																				 // EAXSet function, ret$
 EAXGet	eaxGet;																				 // EAXGet function, ret$
@@ -145,14 +74,11 @@
 /* Unloads OpenAL */
 static void UnLoadOpenAL(void);
 
-/* Gets a pointer to the named function */
-static void* GetFunctionPointer(const char* function);
-
 /* Loads OpenAL basic functions */
-static bool LoadAL(void);
+extern bool LoadAL(JNIEnv *env);
 
 /* Loads OpenAL ALC functions */
-static bool LoadALC(void);
+extern bool LoadALC(JNIEnv *env);
 
 /* Loads any extensions to OpenAL */
 static bool LoadALExtensions(void);
@@ -184,7 +110,7 @@
  * @param function Name of function
  * @return pointer to named function, or NULL if not found
  */
-static void* GetFunctionPointer(const char* function) {
+static void* extal_GetProcAddress(const char* function) {
 	void *p = NativeGetFunctionPointer(function);
 	if (p == NULL) {
 		printfDebug("Could not locate symbol %s\n", function);
@@ -306,13 +232,13 @@
 	}
 
 	//load basic OpenAL functions
-	if(!LoadAL()) {
+	if(!LoadAL(env)) {
 		throwOpenALException(env, "Could not load OpenAL function pointers.");
 		return;
 	}
 
 	//load OpenAL context functions
-	if(!LoadALC()) {
+	if(!LoadALC(env)) {
 		throwOpenALException(env, "Could not load ALC function pointers.");
 		return;
 	}
@@ -333,166 +259,6 @@
 }
 
 /**
- * Loads the basic OpenAL functions
- *
- * @return true if all methods were loaded, false if one of the methods could not be loaded
- */
-static bool LoadAL() {
-	alEnable = (alEnablePROC) GetFunctionPointer("alEnable");
-	alDisable = (alDisablePROC) GetFunctionPointer("alDisable");
-	alIsEnabled = (alIsEnabledPROC) GetFunctionPointer("alIsEnabled");
-	//alHint = (alHintPROC) GetFunctionPointer("alHint");
-	alGetBoolean = (alGetBooleanPROC) GetFunctionPointer("alGetBoolean");
-	alGetInteger = (alGetIntegerPROC) GetFunctionPointer("alGetInteger");
-	alGetFloat = (alGetFloatPROC) GetFunctionPointer("alGetFloat");
-	alGetDouble = (alGetDoublePROC) GetFunctionPointer("alGetDouble");
-	alGetBooleanv = (alGetBooleanvPROC) GetFunctionPointer("alGetBooleanv");
-	alGetIntegerv = (alGetIntegervPROC) GetFunctionPointer("alGetIntegerv");
-	alGetFloatv = (alGetFloatvPROC) GetFunctionPointer("alGetFloatv");
-	alGetDoublev = (alGetDoublevPROC) GetFunctionPointer("alGetDoublev");
-	alGetString = (alGetStringPROC) GetFunctionPointer("alGetString");
-	alGetError = (alGetErrorPROC) GetFunctionPointer("alGetError");
-	alIsExtensionPresent = (alIsExtensionPresentPROC) GetFunctionPointer("alIsExtensionPresent");
-	alGetProcAddress = (alGetProcAddressPROC) GetFunctionPointer("alGetProcAddress");
-	alGetEnumValue = (alGetEnumValuePROC) GetFunctionPointer("alGetEnumValue");
-	alListeneri = (alListeneriPROC) GetFunctionPointer("alListeneri");
-	alListenerf = (alListenerfPROC) GetFunctionPointer("alListenerf");
-	alListener3f = (alListener3fPROC) GetFunctionPointer("alListener3f");
-	alListenerfv = (alListenerfvPROC) GetFunctionPointer("alListenerfv");
-	alGetListeneri = (alGetListeneriPROC) GetFunctionPointer("alGetListeneri");
-	alGetListenerf = (alGetListenerfPROC) GetFunctionPointer("alGetListenerf");
-	alGetListener3f = (alGetListener3fPROC) GetFunctionPointer("alGetListener3f");
-	alGetListenerfv = (alGetListenerfvPROC) GetFunctionPointer("alGetListenerfv");
-	alGenSources = (alGenSourcesPROC) GetFunctionPointer("alGenSources");
-	alDeleteSources = (alDeleteSourcesPROC) GetFunctionPointer("alDeleteSources");
-	alIsSource = (alIsSourcePROC) GetFunctionPointer("alIsSource");
-	alSourcei = (alSourceiPROC) GetFunctionPointer("alSourcei");
-	alSourcef = (alSourcefPROC) GetFunctionPointer("alSourcef");
-	alSource3f = (alSource3fPROC) GetFunctionPointer("alSource3f");
-	alSourcefv = (alSourcefvPROC) GetFunctionPointer("alSourcefv");
-	alGetSourcei = (alGetSourceiPROC) GetFunctionPointer("alGetSourcei");
-	alGetSourcef = (alGetSourcefPROC) GetFunctionPointer("alGetSourcef");
-	alGetSource3f = (alGetSource3fPROC) GetFunctionPointer("alGetSource3f");
-	alGetSourcefv = (alGetSourcefvPROC) GetFunctionPointer("alGetSourcefv");
-	alSourcePlayv = (alSourcePlayvPROC) GetFunctionPointer("alSourcePlayv");
-	alSourcePausev = (alSourcePausevPROC) GetFunctionPointer("alSourcePausev");
-	alSourceStopv = (alSourceStopvPROC) GetFunctionPointer("alSourceStopv");
-	alSourceRewindv = (alSourceRewindvPROC) GetFunctionPointer("alSourceRewindv");
-	alSourcePlay = (alSourcePlayPROC) GetFunctionPointer("alSourcePlay");
-	alSourcePause = (alSourcePausePROC) GetFunctionPointer("alSourcePause");
-	alSourceStop = (alSourceStopPROC) GetFunctionPointer("alSourceStop");
-	alSourceRewind = (alSourceRewindPROC) GetFunctionPointer("alSourceRewind");
-	alGenBuffers = (alGenBuffersPROC) GetFunctionPointer("alGenBuffers");
-	alDeleteBuffers = (alDeleteBuffersPROC) GetFunctionPointer("alDeleteBuffers");
-	alIsBuffer = (alIsBufferPROC) GetFunctionPointer("alIsBuffer");
-	alBufferData = (alBufferDataPROC) GetFunctionPointer("alBufferData");
-	alGetBufferi = (alGetBufferiPROC) GetFunctionPointer("alGetBufferi");
-	alGetBufferf = (alGetBufferfPROC) GetFunctionPointer("alGetBufferf");
-	alSourceQueueBuffers = (alSourceQueueBuffersPROC) GetFunctionPointer("alSourceQueueBuffers");
-	alSourceUnqueueBuffers = (alSourceUnqueueBuffersPROC) GetFunctionPointer("alSourceUnqueueBuffers");
-	alDistanceModel = (alDistanceModelPROC) GetFunctionPointer("alDistanceModel");
-	alDopplerFactor = (alDopplerFactorPROC) GetFunctionPointer("alDopplerFactor");
-	alDopplerVelocity = (alDopplerVelocityPROC) GetFunctionPointer("alDopplerVelocity");
-
-	return 
-		alEnable != NULL &&
-		alDisable != NULL &&
-		alIsEnabled != NULL &&
-		//alHint != NULL &&
-		alGetBoolean != NULL &&
-		alGetInteger != NULL &&
-		alGetFloat != NULL &&
-		alGetDouble != NULL &&
-		alGetBooleanv != NULL &&
-		alGetIntegerv != NULL &&
-		alGetFloatv != NULL &&
-		alGetDoublev != NULL &&
-		alGetString != NULL &&
-		alGetError != NULL &&
-		alIsExtensionPresent != NULL &&
-		alGetProcAddress != NULL &&
-		alGetEnumValue != NULL &&
-		alListeneri != NULL &&
-		alListenerf != NULL &&
-		alListener3f != NULL &&
-		alListenerfv != NULL &&
-		alGetListeneri != NULL &&
-		alGetListenerf != NULL &&
-		alGetListener3f != NULL &&
-		alGetListenerfv != NULL &&
-		alGenSources != NULL &&
-		alDeleteSources != NULL &&
-		alIsSource != NULL &&
-		alSourcei != NULL &&
-		alSourcef != NULL &&
-		alSource3f != NULL &&
-		alSourcefv != NULL &&
-		alGetSourcei != NULL &&
-		alGetSourcef != NULL &&
-		alGetSource3f != NULL &&
-		alGetSourcefv != NULL &&
-		alSourcePlayv != NULL &&
-		alSourcePausev != NULL &&
-		alSourceStopv != NULL &&
-		alSourceRewindv != NULL &&
-		alSourcePlay != NULL &&
-		alSourcePause != NULL &&
-		alSourceStop != NULL &&
-		alSourceRewind != NULL &&
-		alGenBuffers != NULL &&
-		alDeleteBuffers != NULL &&
-		alIsBuffer != NULL &&
-		alBufferData != NULL &&
-		alGetBufferi != NULL &&
-		alGetBufferf != NULL &&
-		alSourceQueueBuffers != NULL &&
-		alSourceUnqueueBuffers != NULL &&
-		alDistanceModel != NULL &&
-		alDopplerFactor != NULL &&
-		alDopplerVelocity != NULL;
-}
-
-/**
- * Loads the context OpenAL functions
- *
- * @return true if all methods were loaded, false if one of the methods could not be loaded
- */
-static bool LoadALC() {
-	alcGetString						= (alcGetStringPROC) GetFunctionPointer("alcGetString");
-	alcGetIntegerv					= (alcGetIntegervPROC) GetFunctionPointer("alcGetIntegerv");
-	alcOpenDevice					 = (alcOpenDevicePROC) GetFunctionPointer("alcOpenDevice");
-	alcCloseDevice					= (alcCloseDevicePROC) GetFunctionPointer("alcCloseDevice");
-	alcCreateContext				= (alcCreateContextPROC) GetFunctionPointer("alcCreateContext");
-	alcMakeContextCurrent	 = (alcMakeContextCurrentPROC) GetFunctionPointer("alcMakeContextCurrent");
-	alcProcessContext			 = (alcProcessContextPROC) GetFunctionPointer("alcProcessContext");
-	alcGetCurrentContext		= (alcGetCurrentContextPROC) GetFunctionPointer("alcGetCurrentContext");
-	alcGetContextsDevice		= (alcGetContextsDevicePROC) GetFunctionPointer("alcGetContextsDevice");
-	alcSuspendContext			 = (alcSuspendContextPROC) GetFunctionPointer("alcSuspendContext");
-	alcDestroyContext			 = (alcDestroyContextPROC) GetFunctionPointer("alcDestroyContext");
-	alcGetError						 = (alcGetErrorPROC) GetFunctionPointer("alcGetError");
-	alcIsExtensionPresent	 = (alcIsExtensionPresentPROC) GetFunctionPointer("alcIsExtensionPresent");
-	alcGetProcAddress			 = (alcGetProcAddressPROC) GetFunctionPointer("alcGetProcAddress");
-	alcGetEnumValue				 = (alcGetEnumValuePROC) GetFunctionPointer("alcGetEnumValue");
-
-	return	
-		alcGetString != NULL &&
-		alcGetIntegerv != NULL &&
-		alcOpenDevice != NULL &&
-		alcCloseDevice != NULL &&
-		alcCreateContext != NULL &&
-		alcMakeContextCurrent != NULL &&
-		alcProcessContext != NULL &&
-		alcGetCurrentContext != NULL &&
-		alcGetContextsDevice != NULL &&
-		alcSuspendContext != NULL &&
-		alcDestroyContext != NULL &&
-		alcGetError != NULL &&
-		alcIsExtensionPresent != NULL &&
-		alcGetProcAddress != NULL &&
-		alcGetEnumValue != NULL;
-}
-
-/**
  * Loads the OpenAL extensions functions
  *
  * @return true if all methods were loaded, false if one of the methods could not be loaded
@@ -500,3 +266,8 @@
 static bool LoadALExtensions() {
 	return true;
 }
+
+bool extal_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions) {
+	return ext_InitializeClass(env, clazz, ext_set, ext_name, &extal_GetProcAddress, num_functions, functions);
+}
+

Index: extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- extal.h	6 Jan 2004 19:22:12 -0000	1.23
+++ extal.h	9 Mar 2004 11:03:09 -0000	1.24
@@ -51,6 +51,9 @@
 #endif
 
 #include <jni.h>
+#include "common_tools.h"
+
+bool extal_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions);
 
 #ifdef __cplusplus
 extern "C" {
@@ -142,156 +145,6 @@
 void InitializeOpenAL(JNIEnv *env, jobjectArray oalPaths);
 void DeInitializeOpenAL();
 
-//alc
-typedef ALCubyte*   (ALCAPIENTRY *alcGetStringPROC)(ALCdevice *device,ALCenum param);
-typedef ALCvoid     (ALCAPIENTRY *alcGetIntegervPROC)(ALCdevice *device,ALCenum param,ALCsizei size,ALCint *data);
-typedef ALCdevice*  (ALCAPIENTRY *alcOpenDevicePROC)(ALCubyte *deviceName);
-typedef ALCvoid     (ALCAPIENTRY *alcCloseDevicePROC)(ALCdevice *device);
-typedef ALCcontext* (ALCAPIENTRY *alcCreateContextPROC)(ALCdevice *device,ALCint *attrList);
-typedef ALCboolean  (ALCAPIENTRY *alcMakeContextCurrentPROC)(ALCcontext *context);
-typedef ALCvoid	    (ALCAPIENTRY *alcProcessContextPROC)(ALCcontext *context);
-typedef ALCcontext* (ALCAPIENTRY *alcGetCurrentContextPROC)(ALCvoid);
-typedef ALCdevice*  (ALCAPIENTRY *alcGetContextsDevicePROC)(ALCcontext *context);
-typedef ALCvoid	    (ALCAPIENTRY *alcSuspendContextPROC)(ALCcontext *context);
-typedef ALCvoid     (ALCAPIENTRY *alcDestroyContextPROC)(ALCcontext *context);
-typedef ALCenum	    (ALCAPIENTRY *alcGetErrorPROC)(ALCdevice *device);
-typedef ALCboolean  (ALCAPIENTRY *alcIsExtensionPresentPROC)(ALCdevice *device,ALCubyte *extName);
-typedef ALCvoid*    (ALCAPIENTRY *alcGetProcAddressPROC)(ALCdevice *device,ALCubyte *funcName);
-typedef ALCenum	    (ALCAPIENTRY *alcGetEnumValuePROC)(ALCdevice *device,ALCubyte *enumName);
-
-//al
-typedef ALvoid	    (ALAPIENTRY *alEnablePROC)( ALenum capability );
-typedef ALvoid	    (ALAPIENTRY *alDisablePROC)( ALenum capability ); 
-typedef ALboolean   (ALAPIENTRY *alIsEnabledPROC)( ALenum capability ); 
-typedef ALvoid	    (ALAPIENTRY *alHintPROC)( ALenum target, ALenum mode );
-typedef ALboolean   (ALAPIENTRY *alGetBooleanPROC)( ALenum param );
-typedef ALint		(ALAPIENTRY *alGetIntegerPROC)( ALenum param );
-typedef ALfloat	    (ALAPIENTRY *alGetFloatPROC)( ALenum param );
-typedef ALdouble	(ALAPIENTRY *alGetDoublePROC)( ALenum param );
-typedef ALvoid	    (ALAPIENTRY *alGetBooleanvPROC)( ALenum param, ALboolean* data );
-typedef ALvoid	    (ALAPIENTRY *alGetIntegervPROC)( ALenum param, ALint* data );
-typedef ALvoid	    (ALAPIENTRY *alGetFloatvPROC)( ALenum param, ALfloat* data );
-typedef ALvoid	    (ALAPIENTRY *alGetDoublevPROC)( ALenum param, ALdouble* data );
-typedef ALubyte*	(ALAPIENTRY *alGetStringPROC)( ALenum param );
-typedef ALenum	    (ALAPIENTRY *alGetErrorPROC)( ALvoid );
-typedef ALboolean   (ALAPIENTRY *alIsExtensionPresentPROC)( ALubyte* fname );
-typedef ALvoid*	    (ALAPIENTRY *alGetProcAddressPROC)( ALubyte* fname );
-typedef ALenum	    (ALAPIENTRY *alGetEnumValuePROC)( ALubyte* ename );
-typedef ALvoid	    (ALAPIENTRY *alListeneriPROC)( ALenum param, ALint value );
-typedef ALvoid	    (ALAPIENTRY *alListenerfPROC)( ALenum param, ALfloat value );
-typedef ALvoid	    (ALAPIENTRY *alListener3fPROC)( ALenum param, ALfloat v1, ALfloat v2, ALfloat v3 ); 
-typedef ALvoid	    (ALAPIENTRY *alListenerfvPROC)( ALenum param, ALfloat* values ); 
-typedef ALvoid	    (ALAPIENTRY *alGetListeneriPROC)( ALenum param, ALint* value );
-typedef ALvoid	    (ALAPIENTRY *alGetListenerfPROC)( ALenum param, ALfloat* value );
-typedef ALvoid	    (ALAPIENTRY *alGetListener3fPROC)( ALenum param, ALfloat* v1, ALfloat* v2, ALfloat* v3 ); 
-typedef ALvoid	    (ALAPIENTRY *alGetListenerfvPROC)( ALenum param, ALfloat* values ); 
-typedef ALvoid	    (ALAPIENTRY *alGenSourcesPROC)( ALsizei n, ALuint* sources ); 
-typedef ALvoid	    (ALAPIENTRY *alDeleteSourcesPROC)( ALsizei n, ALuint* sources );
-typedef ALboolean   (ALAPIENTRY *alIsSourcePROC)( ALuint id ); 
-typedef ALvoid	    (ALAPIENTRY *alSourceiPROC)( ALuint source, ALenum param, ALint value ); 
-typedef ALvoid	    (ALAPIENTRY *alSourcefPROC)( ALuint source, ALenum param, ALfloat value ); 
-typedef ALvoid	    (ALAPIENTRY *alSource3fPROC)( ALuint source, ALenum param, ALfloat v1, ALfloat v2, ALfloat v3 );
-typedef ALvoid	    (ALAPIENTRY *alSourcefvPROC)( ALuint source, ALenum param, ALfloat* values ); 
-typedef ALvoid	    (ALAPIENTRY *alGetSourceiPROC)( ALuint source,  ALenum param, ALint* value );
-typedef ALvoid	    (ALAPIENTRY *alGetSourcefPROC)( ALuint source,  ALenum param, ALfloat* value );
-typedef ALvoid	    (ALAPIENTRY *alGetSource3fPROC)( ALuint source,  ALenum param, ALfloat* v1, ALfloat* v2, ALfloat* v3 );
-typedef ALvoid	    (ALAPIENTRY *alGetSourcefvPROC)( ALuint source, ALenum param, ALfloat* values );
-typedef ALvoid	    (ALAPIENTRY *alSourcePlayvPROC)( ALsizei n, ALuint *sources );
-typedef ALvoid	    (ALAPIENTRY *alSourcePausevPROC)( ALsizei n, ALuint *sources );
-typedef ALvoid	    (ALAPIENTRY *alSourceStopvPROC)( ALsizei n, ALuint *sources );
-typedef ALvoid	    (ALAPIENTRY *alSourceRewindvPROC)(ALsizei n,ALuint *sources);
-typedef ALvoid	    (ALAPIENTRY *alSourcePlayPROC)( ALuint source );
-typedef ALvoid	    (ALAPIENTRY *alSourcePausePROC)( ALuint source );
-typedef ALvoid	    (ALAPIENTRY *alSourceStopPROC)( ALuint source );
-typedef ALvoid	    (ALAPIENTRY *alSourceRewindPROC)( ALuint source );
-typedef ALvoid 	    (ALAPIENTRY *alGenBuffersPROC)( ALsizei n, ALuint* buffers );
-typedef ALvoid	    (ALAPIENTRY *alDeleteBuffersPROC)( ALsizei n, ALuint* buffers );
-typedef ALboolean   (ALAPIENTRY *alIsBufferPROC)( ALuint buffer );
-typedef ALvoid	    (ALAPIENTRY *alBufferDataPROC)( ALuint   buffer,
-										 ALenum   format,
-										 ALvoid*  data,
-										 ALsizei  size,
-										 ALsizei  freq );
-typedef ALvoid	    (ALAPIENTRY *alGetBufferiPROC)( ALuint buffer, ALenum param, ALint*   value );
-typedef ALvoid	    (ALAPIENTRY *alGetBufferfPROC)( ALuint buffer, ALenum param, ALfloat* value );
-typedef ALvoid	    (ALAPIENTRY *alSourceQueueBuffersPROC)( ALuint source, ALsizei n, ALuint* buffers );
-typedef ALvoid	    (ALAPIENTRY *alSourceUnqueueBuffersPROC)( ALuint source, ALsizei n, ALuint* buffers );
-typedef ALvoid	    (ALAPIENTRY *alDistanceModelPROC)( ALenum value );
-typedef ALvoid	    (ALAPIENTRY *alDopplerFactorPROC)( ALfloat value );
-typedef ALvoid	    (ALAPIENTRY *alDopplerVelocityPROC)( ALfloat value );
-
-extern alcGetStringPROC alcGetString;
-extern alcGetIntegervPROC alcGetIntegerv;
-extern alcOpenDevicePROC alcOpenDevice;
-extern alcCloseDevicePROC alcCloseDevice;
-extern alcCreateContextPROC alcCreateContext;
-extern alcMakeContextCurrentPROC alcMakeContextCurrent;
-extern alcProcessContextPROC alcProcessContext;
-extern alcGetCurrentContextPROC alcGetCurrentContext;
-extern alcGetContextsDevicePROC alcGetContextsDevice;
-extern alcSuspendContextPROC alcSuspendContext;
-extern alcDestroyContextPROC alcDestroyContext;
-extern alcGetErrorPROC alcGetError;
-extern alcIsExtensionPresentPROC alcIsExtensionPresent;
-extern alcGetProcAddressPROC alcGetProcAddress;
-extern alcGetEnumValuePROC alcGetEnumValue;
-
-extern alEnablePROC alEnable;
-extern alDisablePROC alDisable;
-extern alIsEnabledPROC alIsEnabled;
-extern alHintPROC alHint;
-extern alGetBooleanPROC alGetBoolean;
-extern alGetIntegerPROC alGetInteger;
-extern alGetFloatPROC alGetFloat;
-extern alGetDoublePROC alGetDouble;
-extern alGetBooleanvPROC alGetBooleanv;
-extern alGetIntegervPROC alGetIntegerv;
-extern alGetFloatvPROC alGetFloatv;
-extern alGetDoublevPROC alGetDoublev;
-extern alGetStringPROC alGetString;
-extern alGetErrorPROC alGetError;
-extern alIsExtensionPresentPROC alIsExtensionPresent;
-extern alGetProcAddressPROC alGetProcAddress;
-extern alGetEnumValuePROC alGetEnumValue;
-extern alListeneriPROC alListeneri;
-extern alListenerfPROC alListenerf;
-extern alListener3fPROC alListener3f;
-extern alListenerfvPROC alListenerfv; 
-extern alGetListeneriPROC alGetListeneri;
-extern alGetListenerfPROC alGetListenerf;
-extern alGetListener3fPROC alGetListener3f;
-extern alGetListenerfvPROC alGetListenerfv;
-extern alGenSourcesPROC alGenSources;
-extern alDeleteSourcesPROC alDeleteSources;
-extern alIsSourcePROC alIsSource;
-extern alSourceiPROC alSourcei;
-extern alSourcefPROC alSourcef;
-extern alSource3fPROC alSource3f;
-extern alSourcefvPROC alSourcefv;
-extern alGetSourceiPROC alGetSourcei;
-extern alGetSourcefPROC alGetSourcef;
-extern alGetSource3fPROC alGetSource3f;
-extern alGetSourcefvPROC alGetSourcefv;
-extern alSourcePlayvPROC alSourcePlayv;
-extern alSourcePausevPROC alSourcePausev;
-extern alSourceStopvPROC alSourceStopv;
-extern alSourceRewindvPROC alSourceRewindv;
-extern alSourcePlayPROC alSourcePlay;
-extern alSourcePausePROC alSourcePause;
-extern alSourceStopPROC alSourceStop;
-extern alSourceRewindPROC alSourceRewind;
-extern alGenBuffersPROC alGenBuffers;
-extern alDeleteBuffersPROC alDeleteBuffers;
-extern alIsBufferPROC alIsBuffer;
-extern alBufferDataPROC alBufferData;
-extern alGetBufferiPROC alGetBufferi;
-extern alGetBufferfPROC alGetBufferf;
-extern alSourceQueueBuffersPROC alSourceQueueBuffers;
-extern alSourceUnqueueBuffersPROC alSourceUnqueueBuffers;
-extern alDistanceModelPROC alDistanceModel;
-extern alDopplerFactorPROC alDopplerFactor;
-extern alDopplerVelocityPROC alDopplerVelocity;
-
 #ifdef _WIN32
 typedef ALenum (*EAXSet)(const GUID*, ALuint, ALuint, ALvoid*, ALuint);
 typedef ALenum (*EAXGet)(const GUID*, ALuint, ALuint, ALvoid*, ALuint);
@@ -300,6 +153,8 @@
 extern EAXGet  eaxGet;
 #endif
 
+typedef ALvoid      (ALAPIENTRY *alEnablePROC)( ALenum capability );
+extern alEnablePROC alEnable;
 #ifdef __cplusplus
 }
 #endif

Index: extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- extgl.cpp	9 Mar 2004 09:25:08 -0000	1.28
+++ extgl.cpp	9 Mar 2004 11:03:09 -0000	1.29
@@ -577,7 +577,7 @@
 glMultiDrawElementArrayNVPROC glMultiDrawElementArrayNV = NULL;
 glMultiDrawRangeElementArrayNVPROC glMultiDrawRangeElementArrayNV = NULL;
 
-bool extgl_error = false;
+static bool extgl_error = false;
 
 struct ExtensionTypes extgl_Extensions;
 
@@ -641,8 +641,8 @@
 #endif
 }
 
-void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions) {
-	ext_InitializeClass(env, clazz, ext_set, ext_name, &extgl_GetProcAddress, num_functions, functions);
+bool extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions) {
+	return ext_InitializeClass(env, clazz, ext_set, ext_name, &extgl_GetProcAddress, num_functions, functions);
 }
 
 
@@ -1165,7 +1165,7 @@
 	extgl_Extensions.GL_SGIX_shadow = GLQueryExtension(env, ext_set, "GL_SGIX_shadow");
 }
 
-extern void extgl_InitOpenGL1_1(JNIEnv *env);
+extern bool extgl_InitOpenGL1_1(JNIEnv *env);
 //extern void extgl_InitARBFragmentProgram(JNIEnv *env, jobject ext_set);
 extern void extgl_InitARBImaging(JNIEnv *env, jobject ext_set);
 extern void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set);
@@ -1228,8 +1228,8 @@
 bool extgl_Initialize(JNIEnv *env, jobject ext_set)
 {
 	extgl_error = false;
-	extgl_InitOpenGL1_1(env);
-	if (extgl_error)
+	bool result = extgl_InitOpenGL1_1(env);
+	if (!result)
 		return false;
 
 	extgl_InitSupportedExtensions(env, ext_set);

Index: extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- extgl.h	9 Mar 2004 09:25:08 -0000	1.30
+++ extgl.h	9 Mar 2004 11:03:09 -0000	1.31
@@ -3267,7 +3267,7 @@
 };
 
 extern struct ExtensionTypes extgl_Extensions;
-extern bool extgl_error;
+//extern bool extgl_error;
 
 typedef GLenum (APIENTRY * glGetErrorPROC) (void);
 typedef const GLubyte * (APIENTRY * glGetStringPROC) (GLenum name);
@@ -3289,7 +3289,7 @@
 bool extgl_InitAGL(JNIEnv *env);
 #endif
 void extgl_Close(void);
-void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions);
+bool extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions);
 
 #define EXTGL_SANITY_CHECK(e,x)		if (extgl_error) { \
 						extgl_Extensions.x = false; \

Index: org_lwjgl_openal_AL10.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_AL10.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_openal_AL10.cpp	26 Feb 2004 21:51:58 -0000	1.1
+++ org_lwjgl_openal_AL10.cpp	9 Mar 2004 11:03:10 -0000	1.2
@@ -39,19 +39,131 @@
  * @author  Brian Matzon <br...@ma...>
  * @version $Revision$
  */
-#include "org_lwjgl_openal_AL10.h"
 
 /* OpenAL includes */
 #include "checkALerror.h"
 #include "extal.h"
 
+//al
+typedef ALvoid	    (ALAPIENTRY *alDisablePROC)( ALenum capability ); 
+typedef ALboolean   (ALAPIENTRY *alIsEnabledPROC)( ALenum capability ); 
+//typedef ALvoid	    (ALAPIENTRY *alHintPROC)( ALenum target, ALenum mode );
+typedef ALboolean   (ALAPIENTRY *alGetBooleanPROC)( ALenum param );
+typedef ALint		(ALAPIENTRY *alGetIntegerPROC)( ALenum param );
+typedef ALfloat	    (ALAPIENTRY *alGetFloatPROC)( ALenum param );
+//typedef ALvoid	    (ALAPIENTRY *alGetBooleanvPROC)( ALenum param, ALboolean* data );
+typedef ALvoid	    (ALAPIENTRY *alGetIntegervPROC)( ALenum param, ALint* data );
+typedef ALvoid	    (ALAPIENTRY *alGetFloatvPROC)( ALenum param, ALfloat* data );
+typedef ALubyte*	(ALAPIENTRY *alGetStringPROC)( ALenum param );
+typedef ALenum	    (ALAPIENTRY *alGetErrorPROC)( ALvoid );
+typedef ALboolean   (ALAPIENTRY *alIsExtensionPresentPROC)( ALubyte* fname );
+//typedef ALvoid*	    (ALAPIENTRY *alGetProcAddressPROC)( ALubyte* fname );
+typedef ALenum	    (ALAPIENTRY *alGetEnumValuePROC)( ALubyte* ename );
+typedef ALvoid	    (ALAPIENTRY *alListeneriPROC)( ALenum param, ALint value );
+typedef ALvoid	    (ALAPIENTRY *alListenerfPROC)( ALenum param, ALfloat value );
+typedef ALvoid	    (ALAPIENTRY *alListener3fPROC)( ALenum param, ALfloat v1, ALfloat v2, ALfloat v3 ); 
+typedef ALvoid	    (ALAPIENTRY *alListenerfvPROC)( ALenum param, ALfloat* values ); 
+typedef ALvoid	    (ALAPIENTRY *alGetListeneriPROC)( ALenum param, ALint* value );
+typedef ALvoid	    (ALAPIENTRY *alGetListenerfPROC)( ALenum param, ALfloat* value );
+//typedef ALvoid	    (ALAPIENTRY *alGetListener3fPROC)( ALenum param, ALfloat* v1, ALfloat* v2, ALfloat* v3 ); 
+typedef ALvoid	    (ALAPIENTRY *alGetListenerfvPROC)( ALenum param, ALfloat* values ); 
+typedef ALvoid	    (ALAPIENTRY *alGenSourcesPROC)( ALsizei n, ALuint* sources ); 
+typedef ALvoid	    (ALAPIENTRY *alDeleteSourcesPROC)( ALsizei n, ALuint* sources );
+typedef ALboolean   (ALAPIENTRY *alIsSourcePROC)( ALuint id ); 
+typedef ALvoid	    (ALAPIENTRY *alSourceiPROC)( ALuint source, ALenum param, ALint value ); 
+typedef ALvoid	    (ALAPIENTRY *alSourcefPROC)( ALuint source, ALenum param, ALfloat value ); 
+typedef ALvoid	    (ALAPIENTRY *alSource3fPROC)( ALuint source, ALenum param, ALfloat v1, ALfloat v2, ALfloat v3 );
+typedef ALvoid	    (ALAPIENTRY *alSourcefvPROC)( ALuint source, ALenum param, ALfloat* values ); 
+typedef ALvoid	    (ALAPIENTRY *alGetSourceiPROC)( ALuint source,  ALenum param, ALint* value );
+typedef ALvoid	    (ALAPIENTRY *alGetSourcefPROC)( ALuint source,  ALenum param, ALfloat* value );
+//typedef ALvoid	    (ALAPIENTRY *alGetSource3fPROC)( ALuint source,  ALenum param, ALfloat* v1, ALfloat* v2, ALfloat* v3 );
+typedef ALvoid	    (ALAPIENTRY *alGetSourcefvPROC)( ALuint source, ALenum param, ALfloat* values );
+typedef ALvoid	    (ALAPIENTRY *alSourcePlayvPROC)( ALsizei n, ALuint *sources );
+typedef ALvoid	    (ALAPIENTRY *alSourcePausevPROC)( ALsizei n, ALuint *sources );
+typedef ALvoid	    (ALAPIENTRY *alSourceStopvPROC)( ALsizei n, ALuint *sources );
+typedef ALvoid	    (ALAPIENTRY *alSourceRewindvPROC)(ALsizei n,ALuint *sources);
+typedef ALvoid	    (ALAPIENTRY *alSourcePlayPROC)( ALuint source );
+typedef ALvoid	    (ALAPIENTRY *alSourcePausePROC)( ALuint source );
+typedef ALvoid	    (ALAPIENTRY *alSourceStopPROC)( ALuint source );
+typedef ALvoid	    (ALAPIENTRY *alSourceRewindPROC)( ALuint source );
+typedef ALvoid 	    (ALAPIENTRY *alGenBuffersPROC)( ALsizei n, ALuint* buffers );
+typedef ALvoid	    (ALAPIENTRY *alDeleteBuffersPROC)( ALsizei n, ALuint* buffers );
+typedef ALboolean   (ALAPIENTRY *alIsBufferPROC)( ALuint buffer );
+typedef ALvoid	    (ALAPIENTRY *alBufferDataPROC)( ALuint   buffer,
+										 ALenum   format,
+										 ALvoid*  data,
+										 ALsizei  size,
+										 ALsizei  freq );
+typedef ALvoid	    (ALAPIENTRY *alGetBufferiPROC)( ALuint buffer, ALenum param, ALint*   value );
+typedef ALvoid	    (ALAPIENTRY *alGetBufferfPROC)( ALuint buffer, ALenum param, ALfloat* value );
+typedef ALvoid	    (ALAPIENTRY *alSourceQueueBuffersPROC)( ALuint source, ALsizei n, ALuint* buffers );
+typedef ALvoid	    (ALAPIENTRY *alSourceUnqueueBuffersPROC)( ALuint source, ALsizei n, ALuint* buffers );
+typedef ALvoid	    (ALAPIENTRY *alDistanceModelPROC)( ALenum value );
+typedef ALvoid	    (ALAPIENTRY *alDopplerFactorPROC)( ALfloat value );
+typedef ALvoid	    (ALAPIENTRY *alDopplerVelocityPROC)( ALfloat value );
+
+
+alEnablePROC alEnable;
+static alDisablePROC alDisable;
+static alIsEnabledPROC alIsEnabled;
+//static alHintPROC alHint;
+static alGetBooleanPROC alGetBoolean;
+static alGetIntegerPROC alGetInteger;
+static alGetFloatPROC alGetFloat;
+//static alGetBooleanvPROC alGetBooleanv;
+static alGetIntegervPROC alGetIntegerv;
+static alGetFloatvPROC alGetFloatv;
+static alGetStringPROC alGetString;
+static alGetErrorPROC alGetError;
+static alIsExtensionPresentPROC alIsExtensionPresent;
+//static alGetProcAddressPROC alGetProcAddress;
+static alGetEnumValuePROC alGetEnumValue;
+static alListeneriPROC alListeneri;
+static alListenerfPROC alListenerf;
+static alListener3fPROC alListener3f;
+static alListenerfvPROC alListenerfv;
+static alGetListeneriPROC alGetListeneri;
+static alGetListenerfPROC alGetListenerf;
+//static alGetListener3fPROC alGetListener3f;
+static alGetListenerfvPROC alGetListenerfv;
+static alGenSourcesPROC alGenSources;
+static alDeleteSourcesPROC alDeleteSources;
+static alIsSourcePROC alIsSource;
+static alSourceiPROC alSourcei;
+static alSourcefPROC alSourcef;
+static alSource3fPROC alSource3f;
+static alSourcefvPROC alSourcefv;
+static alGetSourceiPROC alGetSourcei;
+static alGetSourcefPROC alGetSourcef;
+//static alGetSource3fPROC alGetSource3f;
+static alGetSourcefvPROC alGetSourcefv;
+static alSourcePlayvPROC alSourcePlayv;
+static alSourcePausevPROC alSourcePausev;
+static alSourceStopvPROC alSourceStopv;
+static alSourceRewindvPROC alSourceRewindv;
+static alSourcePlayPROC alSourcePlay;
+static alSourcePausePROC alSourcePause;
+static alSourceStopPROC alSourceStop;
+static alSourceRewindPROC alSourceRewind;
+static alGenBuffersPROC alGenBuffers;
+static alDeleteBuffersPROC alDeleteBuffers;
+static alIsBufferPROC alIsBuffer;
+static alBufferDataPROC alBufferData;
+static alGetBufferiPROC alGetBufferi;
+static alGetBufferfPROC alGetBufferf;
+static alSourceQueueBuffersPROC alSourceQueueBuffers;
+static alSourceUnqueueBuffersPROC alSourceUnqueueBuffers;
+static alDistanceModelPROC alDistanceModel;
+static alDopplerFactorPROC alDopplerFactor;
+static alDopplerVelocityPROC alDopplerVelocity;
+
 /**
  * This function enables a feature of the OpenAL driver.
  *
  * C Specification:
  * ALvoid alEnable(ALenum capability);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alEnable (JNIEnv *env, jclass clazz, jint capability) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alEnable (JNIEnv *env, jclass clazz, jint capability) {
 	alEnable((ALenum) capability);
 	CHECK_AL_ERROR
 }
@@ -62,7 +174,7 @@
  * C Specification:
  * ALvoid alDisable(ALenum capability);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDisable (JNIEnv *env, jclass clazz, jint capability) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alDisable (JNIEnv *env, jclass clazz, jint capability) {
 	alDisable((ALenum) capability);
 	CHECK_AL_ERROR
 }
@@ -73,7 +185,7 @@
  * C Specification:
  * Alboolean alIsEnabled(ALenum capability);
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsEnabled (JNIEnv *env, jclass clazz, jint capability) {
+static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsEnabled (JNIEnv *env, jclass clazz, jint capability) {
 	jboolean result = (jboolean) alIsEnabled((ALenum) capability);
 	
 	CHECK_AL_ERROR
@@ -86,11 +198,11 @@
  * C Specification
  * ALvoid alHint(ALenum target, ALenum mode);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alHint (JNIEnv *env, jclass clazz, jint target, jint mode) {
-	//alHint((ALint)target, (ALint)mode);
+/*static void JNICALL Java_org_lwjgl_openal_AL10_alHint (JNIEnv *env, jclass clazz, jint target, jint mode) {
+	alHint((ALint)target, (ALint)mode);
 	//cannot link with above statement
 	return;
-}
+}*/
 
 
 /**
@@ -99,7 +211,7 @@
  * C Specification:
  * Alboolean alGetBoolean(ALenum pname);
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alGetBoolean (JNIEnv *env, jclass clazz, jint pname) {
+static jboolean JNICALL Java_org_lwjgl_openal_AL10_alGetBoolean (JNIEnv *env, jclass clazz, jint pname) {
 	jboolean result = (jboolean) alGetBoolean((ALenum) pname);
 
 	CHECK_AL_ERROR
@@ -112,20 +224,31 @@
  * C Specification:
  * Alint alGetInteger(ALenum pname);
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetInteger (JNIEnv *env, jclass clazz, jint pname) {
+static jint JNICALL Java_org_lwjgl_openal_AL10_alGetInteger (JNIEnv *env, jclass clazz, jint pname) {
 	jint result = (jint) alGetInteger((ALenum) pname);
 
 	CHECK_AL_ERROR
 	return result;
 }
 
+/** 
+ * This function retrieves a integer OpenAL state.
+ * 
+ * C Specification:
+ * ALvoid nalGetIntegerv(ALenum pname,ALint *data);
+ */
+static void JNICALL Java_org_lwjgl_openal_AL10_nalGetIntegerv (JNIEnv *env, jclass clazz, jint pname, jobject data, int offset) {
+	alGetIntegerv((ALenum) pname, offset + (ALint*) env->GetDirectBufferAddress(data));
+	CHECK_AL_ERROR
+}
+
 /**
  * This function returns a floating point OpenAL state.
  * 
  * C Specification:
  * ALfloat alGetFloat(ALenum pname);
  */
-JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetFloat (JNIEnv *env, jclass clazz, jint pname) {
+static jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetFloat (JNIEnv *env, jclass clazz, jint pname) {
 	jfloat result = (jfloat) alGetFloat((ALenum) pname);
 
 	CHECK_AL_ERROR
@@ -138,7 +261,7 @@
  * C Specification:
  * ALvoid alGetFloatv(ALenum pname,ALfloat *data);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetFloatv (JNIEnv *env, jclass clazz, jint pname, jobject data, int offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalGetFloatv (JNIEnv *env, jclass clazz, jint pname, jobject data, int offset) {
 	alGetFloatv((ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(data));
 	CHECK_AL_ERROR
 }
@@ -149,7 +272,7 @@
  * C Specification:
  * ALubyte * alGetString(ALenum pname);
  */
-JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_AL10_alGetString (JNIEnv *env, jclass clazz, jint param) {
+static jstring JNICALL Java_org_lwjgl_openal_AL10_alGetString (JNIEnv *env, jclass clazz, jint param) {
   jstring string = env->NewStringUTF((char*) alGetString(param));
 	CHECK_AL_ERROR
 	return string;
@@ -161,7 +284,7 @@
  * C Specification:
  * ALenum alGetError(ALvoid);
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetError (JNIEnv *env, jclass clazz) {
+static jint JNICALL Java_org_lwjgl_openal_AL10_alGetError (JNIEnv *env, jclass clazz) {
 	jint result = (jint) alGetError();
 
 	// Don't think we should be checking for errors here..?
@@ -175,7 +298,7 @@
  * C Specification:
  * ALboolean alIsExtensionPresent(ALubyte *extName);
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsExtensionPresent (JNIEnv *env, jclass clazz, jstring fname) {
+static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsExtensionPresent (JNIEnv *env, jclass clazz, jstring fname) {
 	ALubyte* functionname = (ALubyte*) (env->GetStringUTFChars(fname, 0));
 	jboolean result = (jboolean) alIsExtensionPresent(functionname);
 	env->ReleaseStringUTFChars((jstring)functionname, 0);
@@ -190,7 +313,7 @@
  * C Specification:
  * ALenum alGetEnumValue(ALubyte *enumName);
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetEnumValue (JNIEnv *env, jclass clazz, jstring ename) {
+static jint JNICALL Java_org_lwjgl_openal_AL10_alGetEnumValue (JNIEnv *env, jclass clazz, jstring ename) {
 	ALubyte* functionname = (ALubyte*) (env->GetStringUTFChars(ename, 0));
 	jint result = (jint) alGetEnumValue(functionname);
 	env->ReleaseStringUTFChars((jstring)functionname, 0);
@@ -205,7 +328,7 @@
  * C Specification:
  * ALvoid alListeneri(ALenum pname,ALint value);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListeneri (JNIEnv *env, jclass clazz, jint pname, jint value) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alListeneri (JNIEnv *env, jclass clazz, jint pname, jint value) {
 	alListeneri((ALenum) pname, (ALint) value);
 	CHECK_AL_ERROR
 }
@@ -216,7 +339,7 @@
  * C Specification:
  * ALvoid alListenerf(ALenum pname,ALfloat value);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListenerf (JNIEnv *env, jclass clazz, jint pname, jfloat value) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alListenerf (JNIEnv *env, jclass clazz, jint pname, jfloat value) {
 	alListenerf((ALenum) pname, (ALfloat) value);
 	CHECK_AL_ERROR
 }
@@ -226,7 +349,7 @@
  * Method:    nalListenerf
  * Signature: (ILjava/nio/FloatBuffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) {
   alListenerfv((ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(values));
 }
 
@@ -236,7 +359,7 @@
  * C Specification:
  * ALvoid alListener3f(ALenum pname,ALfloat v1,ALfloat v2,ALfloat v3);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListener3f (JNIEnv *env, jclass clazz, jint pname, jfloat v1, jfloat v2, jfloat v3) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alListener3f (JNIEnv *env, jclass clazz, jint pname, jfloat v1, jfloat v2, jfloat v3) {
 	alListener3f((ALenum) pname, (ALfloat) v1, (ALfloat) v2, (ALfloat) v3);
 	CHECK_AL_ERROR
 }
@@ -248,7 +371,7 @@
  * C Specification:
  * ALvoid alGetListeneri(ALenum pname,ALint *value);
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetListeneri (JNIEnv *env, jclass clazz, jint pname) {
+static jint JNICALL Java_org_lwjgl_openal_AL10_alGetListeneri (JNIEnv *env, jclass clazz, jint pname) {
 	ALint value = 0;
 	alGetListeneri((ALenum) pname, &value);
 	CHECK_AL_ERROR
@@ -261,7 +384,7 @@
  * C Specification:
  * ALvoid alGetListenerf(ALenum pname,ALfloat *value);
  */
-JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetListenerf (JNIEnv *env, jclass clazz, jint pname) {
+static jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetListenerf (JNIEnv *env, jclass clazz, jint pname) {
 	ALfloat value = 0.0f;
 	alGetListenerf((ALenum) pname, &value);
 	CHECK_AL_ERROR
@@ -274,7 +397,7 @@
  * C Specification:
  * ALvoid alGetListenerfv(ALenum pname,ALfloat *values);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalGetListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) {
 	alGetListenerfv((ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(values));
 	CHECK_AL_ERROR
 }
@@ -285,7 +408,7 @@
  * C Specification:
  * ALvoid alGenSources(ALsizei n,ALuint *sources);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGenSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalGenSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
 	alGenSources(n, offset + (ALuint*) env->GetDirectBufferAddress(sources));
 	CHECK_AL_ERROR
 }
@@ -296,7 +419,7 @@
  * C Specification:
  * ALvoid alDeleteSources(ALsizei n,ALuint *sources);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
 	alDeleteSources(n, offset + (ALuint*) env->GetDirectBufferAddress(sources));
 	CHECK_AL_ERROR
 }
@@ -307,7 +430,7 @@
  * C Specification:
  * Alboolean alIsSource(ALuint source);
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsSource (JNIEnv *env, jclass clazz, jint source) {
+static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsSource (JNIEnv *env, jclass clazz, jint source) {
 	jboolean result = (jboolean) alIsSource((ALuint) source);
 
 	CHECK_AL_ERROR
@@ -320,7 +443,7 @@
  * C Specification:
  * ALvoid alSourcei(ALuint source,ALenum pname,ALint value);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcei (JNIEnv *env, jclass clazz, jint source, jint pname, jint value) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alSourcei (JNIEnv *env, jclass clazz, jint source, jint pname, jint value) {
 	alSourcei((ALuint) source, (ALenum) pname, (ALint) value);
 	CHECK_AL_ERROR
 }
@@ -331,7 +454,7 @@
  * C Specification:
  * ALvoid alSourcef(ALuint source,ALenum pname,ALfloat value);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcef (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat value) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alSourcef (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat value) {
 	alSourcef((ALuint) source, (ALenum) pname, (ALfloat) value);
 	CHECK_AL_ERROR
 }
@@ -341,7 +464,7 @@
  * Method:    nalSourcefv
  * Signature: (IILjava/nio/FloatBuffer;I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) {
   alSourcefv((ALuint) source, (ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(values));
 	CHECK_AL_ERROR
 }
@@ -352,7 +475,7 @@
  * C Specification:
  * ALvoid alSource3f(ALuint source,ALenum pname,ALfloat v1,ALfloat v2,ALfloat v3);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSource3f (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat v1, jfloat v2, jfloat v3) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alSource3f (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat v1, jfloat v2, jfloat v3) {
 	alSource3f((ALuint) source, (ALenum) pname, (ALfloat) v1, (ALfloat) v2, (ALfloat) v3);
 	CHECK_AL_ERROR
 }
@@ -363,7 +486,7 @@
  * C Specification:
  * ALvoid alGetSourcei(ALuint source,ALenum pname,ALint *value);
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetSourcei (JNIEnv *env, jclass clazz, jint source, jint pname) {
+static jint JNICALL Java_org_lwjgl_openal_AL10_alGetSourcei (JNIEnv *env, jclass clazz, jint source, jint pname) {
 	ALint value = 0;
 	alGetSourcei((ALuint) source, (ALenum) pname, &value);
 	CHECK_AL_ERROR
@@ -376,7 +499,7 @@
  * C Specification:
  * ALvoid alGetSourcef(ALuint source,ALenum pname,ALfloat *value);
  */
-JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetSourcef (JNIEnv *env, jclass clazz, jint source, jint pname) {
+static jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetSourcef (JNIEnv *env, jclass clazz, jint source, jint pname) {
 	ALfloat value = 0.0f;
 	alGetSourcef((ALuint) source, (ALenum) pname, &value);
 	CHECK_AL_ERROR
@@ -389,7 +512,7 @@
  * C Specification:
  * ALvoid alGetSourcefv(ALuint source,ALenum pname,ALfloat *values);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalGetSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) {
 	alGetSourcefv((ALuint) source, (ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(values));
 	CHECK_AL_ERROR
 }
@@ -400,7 +523,7 @@
  * C Specification:
  * ALvoid alSourcePlayv(ALsizei n,ALuint *sources);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePlayv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePlayv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
 	alSourcePlayv(n, offset + (ALuint*) env->GetDirectBufferAddress(sources));
 	CHECK_AL_ERROR
 }
@@ -411,7 +534,7 @@
  * C Specification:
  * ALvoid alSourcePausev(ALsizei n,ALuint *sources);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePausev (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePausev (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
 	alSourcePausev(n, offset + (ALuint*) env->GetDirectBufferAddress(sources));
 	CHECK_AL_ERROR
 }
@@ -422,7 +545,7 @@
  * C Specification:
  * ALvoid alSourceStopv(ALsizei n,ALuint *sources);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceStopv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalSourceStopv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
 	alSourceStopv(n, offset + (ALuint*) env->GetDirectBufferAddress(sources));
 	CHECK_AL_ERROR
 }
@@ -433,7 +556,7 @@
  * C Specification:
  * ALvoid alSourceRewindv(ALsizei n,ALuint *sources);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceRewindv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalSourceRewindv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) {
 	alSourceRewindv(n, offset + (ALuint*) env->GetDirectBufferAddress(sources));
 	CHECK_AL_ERROR
 }
@@ -444,7 +567,7 @@
  * C Specification:
  * ALvoid alSourcePlay(ALuint source);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePlay (JNIEnv *env, jclass clazz, jint source) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alSourcePlay (JNIEnv *env, jclass clazz, jint source) {
 	alSourcePlay((ALuint) source);
 	CHECK_AL_ERROR
 }
@@ -455,7 +578,7 @@
  * C Specification:
  * ALvoid alSourcePause(ALuint source);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePause (JNIEnv *env, jclass clazz, jint source) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alSourcePause (JNIEnv *env, jclass clazz, jint source) {
 	alSourcePause((ALuint) source);
 	CHECK_AL_ERROR
 }
@@ -466,7 +589,7 @@
  * C Specification:
  * ALvoid alSourceStop(ALuint source);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceStop (JNIEnv *env, jclass clazz, jint source) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alSourceStop (JNIEnv *env, jclass clazz, jint source) {
 	alSourceStop((ALuint) source);
 	CHECK_AL_ERROR
 }
@@ -477,7 +600,7 @@
  * C Specification:
  * ALvoid alSourceRewind(ALuint source);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceRewind (JNIEnv *env, jclass clazz, jint source) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alSourceRewind (JNIEnv *env, jclass clazz, jint source) {
 	alSourceRewind((ALuint) source);
 	CHECK_AL_ERROR
 }
@@ -488,7 +611,7 @@
  * C Specification:
  * ALvoid alGenBuffers(ALsizei n,ALuint *buffers);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGenBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalGenBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) {
 	alGenBuffers(n, offset + (ALuint*) env->GetDirectBufferAddress(buffers));
 	CHECK_AL_ERROR
 }
@@ -499,7 +622,7 @@
  * C Specification:
  * ALvoid alDeleteBuffers(ALsizei n,ALuint *buffers);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) {
 	alDeleteBuffers(n, offset + (ALuint*) env->GetDirectBufferAddress(buffers));
 	CHECK_AL_ERROR
 }
@@ -510,7 +633,7 @@
  * C Specification:
  * Alboolean alIsBuffer(ALuint buffer);
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsBuffer (JNIEnv *env, jclass clazz, jint buffer) {
+static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsBuffer (JNIEnv *env, jclass clazz, jint buffer) {
 	jboolean result = (jboolean) alIsBuffer((ALuint) buffer);
 
 	CHECK_AL_ERROR
@@ -523,7 +646,7 @@
  * C Specification:
  * ALvoid alBufferData(ALuint buffer,ALenum format,ALvoid *data,ALsizei size,ALsizei freq);
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalBufferData (JNIEnv *env, jclass clazz, jint buffer, jint format, jobject data, jint offset, jint size, jint freq) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalBufferData (JNIEnv *env, jclass clazz, jint buffer, jint format, jobject data, jint offset, jint size, jint freq) {
 	alBufferData(buffer, format, (void*) (offset + (ALubyte *)env->GetDirectBufferAddress(data)), size, freq);
 	CHECK_AL_ERROR
 }
@@ -534,7 +657,7 @@
  * C Specification:
  * ALvoid alGetBufferi(ALuint buffer,ALenum pname,ALint *value);
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetBufferi (JNIEnv *env, jclass clazz, jint buffer, jint pname) {
+static jint JNICALL Java_org_lwjgl_openal_AL10_alGetBufferi (JNIEnv *env, jclass clazz, jint buffer, jint pname) {
 	ALint value = 0;
 	alGetBufferi((ALuint) buffer, (ALenum) pname, &value);
 	CHECK_AL_ERROR
@@ -547,7 +670,7 @@
  * C Specification:
  * ALvoid alGetBufferf(ALuint buffer,ALenum pname,ALfloat *value);
  */
-JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetBufferf (JNIEnv *env, jclass clazz, jint buffer, jint pname) {
+static jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetBufferf (JNIEnv *env, jclass clazz, jint buffer, jint pname) {
 	ALfloat value = 0.0f;
 	alGetBufferf((ALuint) buffer, (ALenum) pname, &value);
 	CHECK_AL_ERROR
@@ -560,7 +683,7 @@
  * C Specification:
  * ALvoid alSourceQueueBuffers( ALuint source, ALsizei n, ALuint* buffers );
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceQueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalSourceQueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) {
 	alSourceQueueBuffers((ALuint) source, (ALsizei) n, offset + (ALuint*) env->GetDirectBufferAddress(buffers));
 	CHECK_AL_ERROR
 }
@@ -571,7 +694,7 @@
  * C Specification:
  * ALvoid alSourceUnqueueBuffers( ALuint source, ALsizei n, ALuint* buffers );
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceUnqueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) {
+static void JNICALL Java_org_lwjgl_openal_AL10_nalSourceUnqueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) {
 	alSourceUnqueueBuffers((ALuint) source, (ALsizei) n, offset + (ALuint*) env->GetDirectBufferAddress(buffers));
 	CHECK_AL_ERROR
 }
@@ -583,7 +706,7 @@
  * ALvoid alDistanceModel( ALenum value );
  */
 
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDistanceModel (JNIEnv *env, jclass clazz, jint value) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alDistanceModel (JNIEnv *env, jclass clazz, jint value) {
 	alDistanceModel((ALenum) value);
 	CHECK_AL_ERROR
 }
@@ -594,7 +717,7 @@
  * C Specification:
  * ALvoid alDopplerFactor( ALfloat value );
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerFactor (JNIEnv *env, jclass clazz, jfloat value) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alDopplerFactor (JNIEnv *env, jclass clazz, jfloat value) {
 	alDopplerFactor((ALfloat) value);
 	CHECK_AL_ERROR
 }
@@ -605,7 +728,69 @@
  * C Specification:
  * ALvoid alDopplerVelocity( ALfloat value );
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerVelocity (JNIEnv *env, jclass clazz, jfloat value) {
+static void JNICALL Java_org_lwjgl_openal_AL10_alDopplerVelocity (JNIEnv *env, jclass clazz, jfloat value) {
 	alDopplerVelocity((ALfloat) value);
 	CHECK_AL_ERROR
 }
+
+/**
+ * Loads the basic OpenAL functions
+ *
+ * @return true if all methods were loaded, false if one of the methods could not be loaded
+ */
+bool LoadAL(JNIEnv *env) {
+	JavaMethodAndExtFunction functions[] = {
+		{"alEnable", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alEnable, "alEnable", (void**)&alEnable},
+		{"alDisable", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alDisable, "alDisable", (void**)&alDisable},
+		{"alIsEnabled", "(I)Z", (void*)&Java_org_lwjgl_openal_AL10_alIsEnabled, "alIsEnabled", (void**)&alIsEnabled},
+//		{"alHint", "(II)V", (void*)&Java_org_lwjgl_openal_AL10_alHint, "alHint", (void**)&alHint},
+		{"alGetBoolean", "(I)Z", (void*)&Java_org_lwjgl_openal_AL10_alGetBoolean, "alGetBoolean", (void**)&alGetBoolean},
+		{"alGetInteger", "(I)I", (void*)&Java_org_lwjgl_openal_AL10_alGetInteger, "alGetInteger", (void**)&alGetInteger},
+		{"alGetFloat", "(I)F", (void*)&Java_org_lwjgl_openal_AL10_alGetFloat, "alGetFloat", (void**)&alGetFloat},
+		{"nalGetIntegerv", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGetIntegerv, "alGetIntegerv", (void**)&alGetIntegerv},
+		{"nalGetFloatv", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGetFloatv, "alGetFloatv", (void**)&alGetFloatv},
+		{"alGetString", "(I)Ljava/lang/String;", (void*)&Java_org_lwjgl_openal_AL10_alGetString, "alGetString", (void**)&alGetString},
+		{"alGetError", "()I", (void*)&Java_org_lwjgl_openal_AL10_alGetError, "alGetError", (void**)&alGetError},
+		{"alIsExtensionPresent", "(Ljava/lang/String;)Z", (void*)&Java_org_lwjgl_openal_AL10_alIsExtensionPresent, "alIsExtensionPresent", (void**)&alIsExtensionPresent},
+		{"alGetEnumValue", "(Ljava/lang/String;)I", (void*)&Java_org_lwjgl_openal_AL10_alGetEnumValue, "alGetEnumValue", (void**)&alGetEnumValue},
+		{"alListeneri", "(II)V", (void*)&Java_org_lwjgl_openal_AL10_alListeneri, "alListeneri", (void**)&alListeneri},
+		{"alListenerf", "(IF)V", (void*)&Java_org_lwjgl_openal_AL10_alListenerf, "alListenerf", (void**)&alListenerf},
+		{"nalListenerfv", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalListenerfv, "alListenerfv", (void**)&alListenerfv},
+		{"alListener3f", "(IFFF)V", (void*)&Java_org_lwjgl_openal_AL10_alListener3f, "alListener3f", (void**)&alListener3f},
+		{"alGetListeneri", "(I)I", (void*)&Java_org_lwjgl_openal_AL10_alGetListeneri, "alGetListeneri", (void**)&alGetListeneri},
+		{"alGetListenerf", "(I)F", (void*)&Java_org_lwjgl_openal_AL10_alGetListenerf, "alGetListenerf", (void**)&alGetListenerf},
+		{"nalGetListenerfv", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGetListenerfv, "alGetListenerfv", (void**)&alGetListenerfv},
+		{"nalGenSources", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGenSources, "alGenSources", (void**)&alGenSources},
+		{"nalDeleteSources", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalDeleteSources, "alDeleteSources", (void**)&alDeleteSources},
+		{"alIsSource", "(I)Z", (void*)&Java_org_lwjgl_openal_AL10_alIsSource, "alIsSource", (void**)&alIsSource},
+		{"alSourcei", "(III)V", (void*)&Java_org_lwjgl_openal_AL10_alSourcei, "alSourcei", (void**)&alSourcei},
+		{"alSourcef", "(IIF)V", (void*)&Java_org_lwjgl_openal_AL10_alSourcef, "alSourcef", (void**)&alSourcef},
+		{"nalSourcefv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourcefv, "alSourcefv", (void**)&alSourcefv},
+		{"alSource3f", "(IIFFF)V", (void*)&Java_org_lwjgl_openal_AL10_alSource3f, "alSource3f", (void**)&alSource3f},
+		{"alGetSourcei", "(II)I", (void*)&Java_org_lwjgl_openal_AL10_alGetSourcei, "alGetSou...
 
[truncated message content]

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

Modified Files:
	AL10.java ALC.java 
Log Message:
Converted openal to dynamic java native methods

Index: AL10.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL10.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AL10.java	26 Feb 2004 21:51:57 -0000	1.1
+++ AL10.java	9 Mar 2004 11:03:08 -0000	1.2
@@ -443,8 +443,6 @@
 	  */
 	public static native float alGetFloat(int pname);
 
-	private static native void nalGetBooleanv(int pname, ByteBuffer data, int offset);
-
 	/**
    * Like OpenGL, AL uses a simplified interface for querying global state. 
    * 

Index: ALC.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/ALC.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ALC.java	17 Aug 2003 16:38:56 -0000	1.13
+++ ALC.java	9 Mar 2004 11:03:08 -0000	1.14
@@ -170,21 +170,11 @@
 			return;
 		}
 
-		if (!nCreate()) {
-			throw new OpenALException("ALC instance could not be created.");
-		}
 		init();
 		created = true;
 	}
 
 	/**
-	 * Native method to create ALC instance
-	 * 
-	 * @return true if the ALC creation process succeeded
-	 */
-	protected static native boolean nCreate();
-
-	/**
 	 * Calls whatever destruction rutines that are needed
 	 */
 	protected static void destroy() {
@@ -192,15 +182,9 @@
 			return;
 		}
 		created = false;
-		nDestroy();
 	}
 
 	/**
-	 * Native method the destroy the ALC
-	 */
-	protected static native void nDestroy();
-
-	/**
 	 * The application can obtain certain strings from ALC.
 	 * 
 	 * <code>ALC_DEFAULT_DEVICE_SPECIFIER</code> - The specifer string for the default device
@@ -410,4 +394,4 @@
 	}
 
 	native static int nalcGetEnumValue(int device, String enumName);
-}
\ No newline at end of file
+}

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30501/src/native

Modified Files:
	build.sh 
Log Message:
Don't let the build script do a make distclean

Index: build.sh
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- build.sh	25 Nov 2003 22:01:28 -0000	1.3
+++ build.sh	9 Mar 2004 09:36:53 -0000	1.4
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-make distclean
 ./autogen.sh
 ./configure
 make

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/nv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28178/src/native/common/nv

Modified Files:
	org_lwjgl_opengl_NVEvaluators.cpp org_lwjgl_opengl_NVFence.cpp 
	org_lwjgl_opengl_NVFragmentProgram.cpp 
	org_lwjgl_opengl_NVHalfFloat.cpp 
	org_lwjgl_opengl_NVOcclusionQuery.cpp 
	org_lwjgl_opengl_NVPixelDataRange.cpp 
	org_lwjgl_opengl_NVPointSprite.cpp 
	org_lwjgl_opengl_NVPrimitiveRestart.cpp 
	org_lwjgl_opengl_NVProgram.cpp 
	org_lwjgl_opengl_NVRegisterCombiners.cpp 
	org_lwjgl_opengl_NVRegisterCombiners2.cpp 
	org_lwjgl_opengl_NVVertexArrayRange.cpp 
	org_lwjgl_opengl_NVVertexProgram.cpp 
Log Message:
Generalized function pointer initialization

Index: org_lwjgl_opengl_NVEvaluators.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVEvaluators.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVEvaluators.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -166,7 +166,7 @@
 
 void extgl_InitNVEvaluators(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglGetMapControlPointsNV", "(IIIIIZLjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglGetMapControlPointsNV, "glGetMapControlPointsNV", (void**)&glGetMapControlPointsNV},
 		{"nglMapControlPointsNV", "(IIIIIIIZLjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglMapControlPointsNV, "glMapControlPointsNV", (void**)&glMapControlPointsNV},
 		{"nglMapParameterfvNV", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterfvNV, "glMapParameterfvNV", (void**)&glMapParameterfvNV},
@@ -178,7 +178,7 @@
 		{"glEvalMapsNV", "(II)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_glEvalMapsNV, "glEvalMapsNV", (void**)&glEvalMapsNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVEvaluators");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVEvaluators");
 	if (extgl_Extensions.GL_NV_evaluators)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_evaluators", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVFence.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVFence.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVFence.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVFence.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -137,7 +137,7 @@
 
 void extgl_InitNVFence(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglGenFencesNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFence_nglGenFencesNV, "glGenFencesNV", (void**)&glGenFencesNV},
 		{"nglDeleteFencesNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFence_nglDeleteFencesNV, "glDeleteFencesNV", (void**)&glDeleteFencesNV},
 		{"glSetFenceNV", "(II)V", (void*)&Java_org_lwjgl_opengl_NVFence_glSetFenceNV, "glSetFenceNV", (void**)&glSetFenceNV},
@@ -147,7 +147,7 @@
 		{"nglGetFenceivNV", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFence_nglGetFenceivNV, "glGetFenceivNV", (void**)&glGetFenceivNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVFence");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVFence");
 	if (extgl_Extensions.GL_NV_fence)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_fence", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVFragmentProgram.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVFragmentProgram.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVFragmentProgram.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -97,14 +97,14 @@
 
 void extgl_InitNVFragmentProgram(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglProgramNamedParameter4fNV", "(IILjava/nio/ByteBuffer;IFFFF)V", (void*)&Java_org_lwjgl_opengl_NVFragmentProgram_nglProgramNamedParameter4fNV, "glProgramNamedParameter4fNV", (void**)&glProgramNamedParameter4fNV},
 		{"nglGetProgramNamedParameterfvNV", "(IILjava/nio/ByteBuffer;ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramNamedParameterfvNV, "glGetProgramNamedParameterfvNV", (void**)&glGetProgramNamedParameterfvNV},
 		{"glProgramLocalParameter4fARB", "(IIFFFF)V", (void*)&Java_org_lwjgl_opengl_NVFragmentProgram_glProgramLocalParameter4fARB, "glProgramLocalParameter4fARB", (void**)&glProgramLocalParameter4fARB},
 		{"nglGetProgramLocalParameterfvARB", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramLocalParameterfvARB, "glGetProgramLocalParameterfvARB", (void**)&glGetProgramLocalParameterfvARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVFragmentProgram");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVFragmentProgram");
 	if (extgl_Extensions.GL_NV_fragment_program)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_fragment_program", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVHalfFloat.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_NVHalfFloat.cpp	7 Mar 2004 16:01:45 -0000	1.5
+++ org_lwjgl_opengl_NVHalfFloat.cpp	9 Mar 2004 09:25:10 -0000	1.6
@@ -359,7 +359,7 @@
 
 void extgl_InitNVHalfFloat(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glVertex2hNV", "(SS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertex2hNV, "glVertex2hNV", (void**)&glVertex2hNV},
 		{"glVertex3hNV", "(SSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertex3hNV, "glVertex3hNV", (void**)&glVertex3hNV},
 		{"glVertex4hNV", "(SSSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertex4hNV, "glVertex4hNV", (void**)&glVertex4hNV},
@@ -386,7 +386,7 @@
 		{"nglVertexAttribs4hvNV", "(IILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs4hvNV, "glVertexAttribs4hvNV", (void**)&glVertexAttribs4hvNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVHalfFloat");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVHalfFloat");
 	if (extgl_Extensions.GL_NV_half_float)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_half_float", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVOcclusionQuery.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVOcclusionQuery.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVOcclusionQuery.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -137,7 +137,7 @@
 
 void extgl_InitNVOcclusionQuery(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglGenOcclusionQueriesNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_nglGenOcclusionQueriesNV, "glGenOcclusionQueriesNV", (void**)&glGenOcclusionQueriesNV},
 		{"nglDeleteOcclusionQueriesNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_nglDeleteOcclusionQueriesNV, "glDeleteOcclusionQueriesNV", (void**)&glDeleteOcclusionQueriesNV},
 		{"glIsOcclusionQueryNV", "(I)Z", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_glIsOcclusionQueryNV, "glIsOcclusionQueryNV", (void**)&glIsOcclusionQueryNV},
@@ -147,7 +147,7 @@
 		{"nglGetOcclusionQueryuivNV", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryuivNV, "glGetOcclusionQueryuivNV", (void**)&glGetOcclusionQueryuivNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVOcclusionQuery");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVOcclusionQuery");
 	if (extgl_Extensions.GL_NV_occlusion_query)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_occlusion_query", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVPixelDataRange.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVPixelDataRange.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVPixelDataRange.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -68,12 +68,12 @@
 
 void extgl_InitNVPixelDataRange(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglPixelDataRangeNV", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_NVPixelDataRange_nglPixelDataRangeNV, "glPixelDataRangeNV", (void**)&glPixelDataRangeNV},
 		{"glFlushPixelDataRangeNV", "(I)V", (void*)&Java_org_lwjgl_opengl_NVPixelDataRange_glFlushPixelDataRangeNV, "glFlushPixelDataRangeNV", (void**)&glFlushPixelDataRangeNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVPixelDataRange");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVPixelDataRange");
 	if (extgl_Extensions.GL_NV_pixel_data_range)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_pixel_data_range", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVPointSprite.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVPointSprite.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVPointSprite.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -68,12 +68,12 @@
 
 void extgl_InitNVPointSprite(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glPointParameteriNV", "(II)V", (void*)&Java_org_lwjgl_opengl_NVPointSprite_glPointParameteriNV, "glPointParameteriNV", (void**)&glPointParameteriNV},
 		{"nglPointParameterivNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVPointSprite_nglPointParameterivNV, "glPointParameterivNV", (void**)&glPointParameterivNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVPointSprite");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVPointSprite");
 	if (extgl_Extensions.GL_NV_point_sprite)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_point_sprite", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVPrimitiveRestart.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVPrimitiveRestart.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVPrimitiveRestart.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -67,12 +67,12 @@
 
 void extgl_InitNVPrimitiveRestart(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glPrimitiveRestartNV", "()V", (void*)&Java_org_lwjgl_opengl_NVPrimitiveRestart_glPrimitiveRestartNV, "glPrimitiveRestartNV", (void**)&glPrimitiveRestartNV},
 		{"glPrimitiveRestartIndexNV", "(I)V", (void*)&Java_org_lwjgl_opengl_NVPrimitiveRestart_glPrimitiveRestartIndexNV, "glPrimitiveRestartIndexNV", (void**)&glPrimitiveRestartIndexNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVPrimitiveRestart");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVPrimitiveRestart");
 	if (extgl_Extensions.GL_NV_primitive_restart)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_primitive_restart", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVProgram.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVProgram.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVProgram.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVProgram.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -168,7 +168,7 @@
 
 void extgl_InitNVProgram(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglLoadProgramNV", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_NVProgram_nglLoadProgramNV, "glLoadProgramNV", (void**)&glLoadProgramNV},
 		{"glBindProgramNV", "(II)V", (void*)&Java_org_lwjgl_opengl_NVProgram_glBindProgramNV, "glBindProgramNV", (void**)&glBindProgramNV},
 		{"nglDeleteProgramsNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVProgram_nglDeleteProgramsNV, "glDeleteProgramsNV", (void**)&glDeleteProgramsNV},
@@ -180,6 +180,6 @@
 		{"nglRequestResidentProgramsNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVProgram_nglRequestResidentProgramsNV, "glRequestResidentProgramsNV", (void**)&glRequestResidentProgramsNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVProgram");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVProgram");
 	extgl_InitializeClass(env, clazz, NULL, "<NVProgram>", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVRegisterCombiners.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVRegisterCombiners.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVRegisterCombiners.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -218,7 +218,7 @@
 
 void extgl_InitNVRegisterCombiners(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glCombinerParameterfNV", "(IF)V", (void*)&Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerParameterfNV, "glCombinerParameterfNV", (void**)&glCombinerParameterfNV},
 		{"nglCombinerParameterfvNV", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVRegisterCombiners_nglCombinerParameterfvNV, "glCombinerParameterfvNV", (void**)&glCombinerParameterfvNV},
 		{"glCombinerParameteriNV", "(II)V", (void*)&Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerParameteriNV, "glCombinerParameteriNV", (void**)&glCombinerParameteriNV},
@@ -234,7 +234,7 @@
 		{"nglGetFinalCombinerInputParameterivNV", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetFinalCombinerInputParameterivNV, "glGetFinalCombinerInputParameterivNV", (void**)&glGetFinalCombinerInputParameterivNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVRegisterCombiners");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVRegisterCombiners");
 	if (extgl_Extensions.GL_NV_register_combiners)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_register_combiners", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVRegisterCombiners2.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVRegisterCombiners2.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVRegisterCombiners2.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -69,12 +69,12 @@
 
 void extgl_InitNVRegisterCombiners2(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglCombinerStageParameterfvNV", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVRegisterCombiners2_nglCombinerStageParameterfvNV, "glCombinerStageParameterfvNV", (void**)&glCombinerStageParameterfvNV},
 		{"nglGetCombinerStageParameterfvNV", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVRegisterCombiners2_nglGetCombinerStageParameterfvNV, "glGetCombinerStageParameterfvNV", (void**)&glGetCombinerStageParameterfvNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVRegisterCombiners2");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVRegisterCombiners2");
 	if (extgl_Extensions.GL_NV_register_combiners2)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_register_combiners2", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVVertexArrayRange.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVVertexArrayRange.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVVertexArrayRange.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -120,7 +120,7 @@
 
 void extgl_InitNVVertexArrayRange(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglVertexArrayRangeNV", "(ILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_NVVertexArrayRange_nglVertexArrayRangeNV, "glVertexArrayRangeNV", (void**)&glVertexArrayRangeNV},
 		{"glFlushVertexArrayRangeNV", "()V", (void*)&Java_org_lwjgl_opengl_NVVertexArrayRange_glFlushVertexArrayRangeNV, "glFlushVertexArrayRangeNV", (void**)&glFlushVertexArrayRangeNV},
 #ifdef _X11
@@ -133,7 +133,7 @@
 #endif
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVVertexArrayRange");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVVertexArrayRange");
 	if (extgl_Extensions.GL_NV_vertex_array_range)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_vertex_array_range", num_functions, functions);
 }

Index: org_lwjgl_opengl_NVVertexProgram.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_NVVertexProgram.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_NVVertexProgram.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -398,7 +398,7 @@
 
 void extgl_InitNVVertexProgram(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglExecuteProgramNV", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVVertexProgram_nglExecuteProgramNV, "glExecuteProgramNV", (void**)&glExecuteProgramNV},
 		{"nglGetProgramParameterfvNV", "(IIILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVVertexProgram_nglGetProgramParameterfvNV, "glGetProgramParameterfvNV", (void**)&glGetProgramParameterfvNV},
 		{"nglGetTrackMatrixivNV", "(IIILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVVertexProgram_nglGetTrackMatrixivNV, "glGetTrackMatrixivNV", (void**)&glGetTrackMatrixivNV},
@@ -430,7 +430,7 @@
 		{"nglVertexAttribs4ubvNV", "(IILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4ubvNV, "glVertexAttribs4ubvNV", (void**)&glVertexAttribs4ubvNV}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVVertexProgram");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVVertexProgram");
 	if (extgl_Extensions.GL_NV_vertex_program)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_NV_vertex_program", num_functions, functions);
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/arb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28178/src/native/common/arb

Modified Files:
	org_lwjgl_opengl_ARBImaging.cpp 
	org_lwjgl_opengl_ARBMatrixPalette.cpp 
	org_lwjgl_opengl_ARBMultisample.cpp 
	org_lwjgl_opengl_ARBMultitexture.cpp 
	org_lwjgl_opengl_ARBOcclusionQuery.cpp 
	org_lwjgl_opengl_ARBPointParameters.cpp 
	org_lwjgl_opengl_ARBProgram.cpp 
	org_lwjgl_opengl_ARBShaderObjects.cpp 
	org_lwjgl_opengl_ARBTextureCompression.cpp 
	org_lwjgl_opengl_ARBTransposeMatrix.cpp 
	org_lwjgl_opengl_ARBVertexBlend.cpp 
	org_lwjgl_opengl_ARBVertexBufferObject.cpp 
	org_lwjgl_opengl_ARBVertexProgram.cpp 
	org_lwjgl_opengl_ARBVertexShader.cpp 
	org_lwjgl_opengl_ARBWindowPos.cpp 
Log Message:
Generalized function pointer initialization

Index: org_lwjgl_opengl_ARBImaging.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBImaging.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBImaging.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -548,7 +548,7 @@
 
 void extgl_InitARBImaging(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglColorTable", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglColorTable, "glColorTable", (void**)&glColorTable},
 		{"nglColorSubTable", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable, "glColorSubTable", (void**)&glColorSubTable},
 		{"nglColorTableParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv, "glColorTableParameteriv", (void**)&glColorTableParameteriv},
@@ -585,7 +585,7 @@
 		{"nglGetSeparableFilter", "(IIILjava/nio/Buffer;ILjava/nio/Buffer;ILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter, "glGetSeparableFilter", (void**)&glGetSeparableFilter}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBImaging");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBImaging");
 	if (extgl_Extensions.GL_ARB_imaging)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_imaging", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBMatrixPalette.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBMatrixPalette.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBMatrixPalette.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -121,7 +121,7 @@
 
 void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glCurrentPaletteMatrixARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatrixARB, "glCurrentPaletteMatrixARB", (void**)&glCurrentPaletteMatrixARB},
 		{"nglMatrixIndexPointerARB", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARB, "glMatrixIndexPointerARB", (void**)&glMatrixIndexPointerARB},
 		{"nglMatrixIndexPointerARBVBO", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBVBO, NULL, NULL},
@@ -130,7 +130,7 @@
 		{"nglMatrixIndexusvARB", "(ILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB, "glMatrixIndexusvARB", (void**)&glMatrixIndexusvARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBMatrixPalette");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBMatrixPalette");
 	if (extgl_Extensions.GL_ARB_matrix_palette)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_matrix_palette", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBMultisample.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBMultisample.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBMultisample.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -54,11 +54,11 @@
 
 void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glSampleCoverageARB", "(FZ)V", (void*)&Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB, "glSampleCoverageARB", (void**)&glSampleCoverageARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBMultisample");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBMultisample");
 	if (extgl_Extensions.GL_ARB_multisample)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_multisample", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBMultitexture.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBMultitexture.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBMultitexture.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -223,7 +223,7 @@
 
 void extgl_InitARBMultitexture(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glClientActiveTextureARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureARB, "glClientActiveTextureARB", (void**)&glClientActiveTextureARB},
 		{"glActiveTextureARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB, "glActiveTextureARB", (void**)&glActiveTextureARB},
 		{"glMultiTexCoord1fARB", "(IF)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB, "glMultiTexCoord1fARB", (void**)&glMultiTexCoord1fARB},
@@ -240,7 +240,7 @@
 		{"glMultiTexCoord4sARB", "(ISSSS)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB, "glMultiTexCoord4sARB", (void**)&glMultiTexCoord4sARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBMultitexture");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBMultitexture");
 	if (extgl_Extensions.GL_ARB_multitexture)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_multitexture", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBOcclusionQuery.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBOcclusionQuery.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBOcclusionQuery.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -151,7 +151,7 @@
 
 void extgl_InitARBOcclusionQuery(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglGenQueriesARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB, "glGenQueriesARB", (void**)&glGenQueriesARB},
 		{"nglDeleteQueriesARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB, "glDeleteQueriesARB", (void**)&glDeleteQueriesARB},
 		{"glIsQueryARB", "(I)Z", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB, "glIsQueryARB", (void**)&glIsQueryARB},
@@ -162,7 +162,7 @@
 		{"nglGetQueryObjectuivARB", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuivARB, "glGetQueryObjectuivARB", (void**)&glGetQueryObjectuivARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBOcclusionQuery");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBOcclusionQuery");
 	if (extgl_Extensions.GL_ARB_occlusion_query)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_occlusion_query", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBPointParameters.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBPointParameters.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBPointParameters.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -68,12 +68,12 @@
 
 void extgl_InitARBPointParameters(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glPointParameterfARB", "(IF)V", (void*)&Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfARB, "glPointParameterfARB", (void**)&glPointParameterfARB},
 		{"nglPointParameterfvARB", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfvARB, "glPointParameterfvARB", (void**)&glPointParameterfvARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBPointParameters");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBPointParameters");
 	if (extgl_Extensions.GL_ARB_point_parameters)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_point_parameters", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBProgram.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBProgram.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBProgram.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -221,7 +221,7 @@
 
 void extgl_InitARBProgram(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglProgramStringARB", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBProgram_nglProgramStringARB, "glProgramStringARB", (void**)&glProgramStringARB},
 		{"glBindProgramARB", "(II)V", (void*)&Java_org_lwjgl_opengl_ARBProgram_glBindProgramARB, "glBindProgramARB", (void**)&glBindProgramARB},
 		{"nglDeleteProgramsARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBProgram_nglDeleteProgramsARB, "glDeleteProgramsARB", (void**)&glDeleteProgramsARB},
@@ -237,7 +237,7 @@
 		{"glIsProgramARB", "(I)Z", (void*)&Java_org_lwjgl_opengl_ARBProgram_glIsProgramARB, "glIsProgramARB", (void**)&glIsProgramARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBProgram");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBProgram");
 	extgl_InitializeClass(env, clazz, NULL, "<ARBProgram>", num_functions, functions);
 }
 

Index: org_lwjgl_opengl_ARBShaderObjects.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_ARBShaderObjects.cpp	7 Mar 2004 16:01:44 -0000	1.5
+++ org_lwjgl_opengl_ARBShaderObjects.cpp	9 Mar 2004 09:25:09 -0000	1.6
@@ -647,7 +647,7 @@
 
 void extgl_InitARBShaderObjects(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glDeleteObjectARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBShaderObjects_glDeleteObjectARB, "glDeleteObjectARB", (void**)&glDeleteObjectARB},
 		{"glGetHandleARB", "(I)I", (void*)&Java_org_lwjgl_opengl_ARBShaderObjects_glGetHandleARB, "glGetHandleARB", (void**)&glGetHandleARB},
 		{"glDetachObjectARB", "(II)V", (void*)&Java_org_lwjgl_opengl_ARBShaderObjects_glDetachObjectARB, "glDetachObjectARB", (void**)&glDetachObjectARB},
@@ -691,7 +691,7 @@
 		{"nglGetShaderSourceARB", "(IILjava/nio/IntBuffer;ILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBShaderObjects_nglGetShaderSourceARB, "glGetShaderSourceARB", (void**)&glGetShaderSourceARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBShaderObjects");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBShaderObjects");
 	if (extgl_Extensions.GL_ARB_shader_objects)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_shader_objects", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBTextureCompression.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBTextureCompression.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBTextureCompression.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -139,7 +139,7 @@
 
 void extgl_InitARBTextureCompression(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglCompressedTexImage1DARB", "(IIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage1DARB, "glCompressedTexImage1DARB", (void**)&glCompressedTexImage1DARB},
 		{"nglCompressedTexImage2DARB", "(IIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage2DARB, "glCompressedTexImage2DARB", (void**)&glCompressedTexImage2DARB},
 		{"nglCompressedTexImage3DARB", "(IIIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage3DARB, "glCompressedTexImage3DARB", (void**)&glCompressedTexImage3DARB},
@@ -149,7 +149,7 @@
 		{"nglGetCompressedTexImageARB", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompressedTexImageARB, "glGetCompressedTexImageARB", (void**)&glGetCompressedTexImageARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBTextureCompression");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBTextureCompression");
 	if (extgl_Extensions.GL_ARB_texture_compression)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_texture_compression", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBTransposeMatrix.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBTransposeMatrix.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBTransposeMatrix.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -69,12 +69,12 @@
 
 void extgl_InitARBTransposeMatrix(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglLoadTransposeMatrixfARB", "(Ljava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBTransposeMatrix_nglLoadTransposeMatrixfARB, "glLoadTransposeMatrixfARB", (void**)&glLoadTransposeMatrixfARB},
 		{"nglMultTransposeMatrixfARB", "(Ljava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBTransposeMatrix_nglMultTransposeMatrixfARB, "glMultTransposeMatrixfARB", (void**)&glMultTransposeMatrixfARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBTransposeMatrix");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBTransposeMatrix");
 	if (extgl_Extensions.GL_ARB_transpose_matrix)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_transpose_matrix", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBVertexBlend.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBVertexBlend.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBVertexBlend.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -177,7 +177,7 @@
 
 void extgl_InitARBVertexBlend(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglWeightbvARB", "(ILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightbvARB, "glWeightbvARB", (void**)&glWeightbvARB},
 		{"nglWeightfvARB", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightfvARB, "glWeightfvARB", (void**)&glWeightfvARB},
 		{"nglWeightivARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightivARB, "glWeightivARB", (void**)&glWeightivARB},
@@ -190,7 +190,7 @@
 		{"glVertexBlendARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBVertexBlend_glVertexBlendARB, "glVertexBlendARB", (void**)&glVertexBlendARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBVertexBlend");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBVertexBlend");
 	if (extgl_Extensions.GL_ARB_vertex_blend)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_vertex_blend", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBVertexBufferObject.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_ARBVertexBufferObject.cpp	7 Mar 2004 16:01:44 -0000	1.5
+++ org_lwjgl_opengl_ARBVertexBufferObject.cpp	9 Mar 2004 09:25:09 -0000	1.6
@@ -202,7 +202,7 @@
 
 void extgl_InitARBVertexBufferObject(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglBindBufferARB", "(II)V", (void*)&Java_org_lwjgl_opengl_ARBVertexBufferObject_nglBindBufferARB, "glBindBufferARB", (void**)&glBindBufferARB},
 		{"nglDeleteBuffersARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBVertexBufferObject_nglDeleteBuffersARB, "glDeleteBuffersARB", (void**)&glDeleteBuffersARB},
 		{"nglGenBuffersARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBVertexBufferObject_nglGenBuffersARB, "glGenBuffersARB", (void**)&glGenBuffersARB},
@@ -216,7 +216,7 @@
 		{"glGetBufferPointerARB", "(III)Ljava/nio/ByteBuffer;", (void*)&Java_org_lwjgl_opengl_ARBVertexBufferObject_glGetBufferPointerARB, "glGetBufferPointervARB", (void**)&glGetBufferPointervARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBVertexBufferObject");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBVertexBufferObject");
 	if (extgl_Extensions.GL_ARB_vertex_buffer_object)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_vertex_buffer_object", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBVertexProgram.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBVertexProgram.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBVertexProgram.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -275,7 +275,7 @@
 
 void extgl_InitARBVertexProgram(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glVertexAttrib1sARB", "(IS)V", (void*)&Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib1sARB, "glVertexAttrib1sARB", (void**)&glVertexAttrib1sARB},
 		{"glVertexAttrib1fARB", "(IF)V", (void*)&Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib1fARB, "glVertexAttrib1fARB", (void**)&glVertexAttrib1fARB},
 		{"glVertexAttrib2sARB", "(ISS)V", (void*)&Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib2sARB, "glVertexAttrib2sARB", (void**)&glVertexAttrib2sARB},
@@ -294,7 +294,7 @@
 		{"glGetVertexAttribPointerARB", "(III)Ljava/nio/ByteBuffer;", (void*)&Java_org_lwjgl_opengl_ARBVertexProgram_glGetVertexAttribPointerARB, "glGetVertexAttribPointervARB", (void**)&glGetVertexAttribPointervARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBVertexProgram");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBVertexProgram");
 	if (extgl_Extensions.GL_ARB_vertex_program)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_vertex_program", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBVertexShader.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBVertexShader.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBVertexShader.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -97,13 +97,13 @@
 
 void extgl_InitARBVertexShader(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglBindAttribLocationARB", "(IILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBVertexShader_nglBindAttribLocationARB, "glBindAttribLocationARB", (void**)&glBindAttribLocationARB},
 		{"nglGetActiveAttribARB", "(IIILjava/nio/IntBuffer;ILjava/nio/IntBuffer;ILjava/nio/IntBuffer;ILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBVertexShader_nglGetActiveAttribARB, "glGetActiveAttribARB", (void**)&glGetActiveAttribARB},
 		{"nglGetAttribLocationARB", "(ILjava/nio/ByteBuffer;I)I", (void*)&Java_org_lwjgl_opengl_ARBVertexShader_nglGetAttribLocationARB, "glGetAttribLocationARB", (void**)&glGetAttribLocationARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBVertexShader");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBVertexShader");
 	if (extgl_Extensions.GL_ARB_vertex_shader)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_vertex_shader", num_functions, functions);
 }

Index: org_lwjgl_opengl_ARBWindowPos.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ARBWindowPos.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ARBWindowPos.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -119,7 +119,7 @@
 
 void extgl_InitARBWindowPos(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glWindowPos2fARB", "(FF)V", (void*)&Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos2fARB, "glWindowPos2fARB", (void**)&glWindowPos2fARB},
 		{"glWindowPos2iARB", "(II)V", (void*)&Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos2iARB, "glWindowPos2iARB", (void**)&glWindowPos2iARB},
 		{"glWindowPos2sARB", "(SS)V", (void*)&Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos2sARB, "glWindowPos2sARB", (void**)&glWindowPos2sARB},
@@ -128,7 +128,7 @@
 		{"glWindowPos3sARB", "(SSS)V", (void*)&Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos3sARB, "glWindowPos3sARB", (void**)&glWindowPos3sARB}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBWindowPos");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBWindowPos");
 	if (extgl_Extensions.GL_ARB_window_pos)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_window_pos", num_functions, functions);
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28178/src/native/common/ext

Modified Files:
	org_lwjgl_opengl_EXTBlendFuncSeparate.cpp 
	org_lwjgl_opengl_EXTCompiledVertexArray.cpp 
	org_lwjgl_opengl_EXTDrawRangeElements.cpp 
	org_lwjgl_opengl_EXTFogCoord.cpp 
	org_lwjgl_opengl_EXTMultiDrawArrays.cpp 
	org_lwjgl_opengl_EXTPointParameters.cpp 
	org_lwjgl_opengl_EXTSecondaryColor.cpp 
	org_lwjgl_opengl_EXTStencilTwoSide.cpp 
	org_lwjgl_opengl_EXTVertexShader.cpp 
	org_lwjgl_opengl_EXTVertexWeighting.cpp 
Log Message:
Generalized function pointer initialization

Index: org_lwjgl_opengl_EXTBlendFuncSeparate.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTBlendFuncSeparate.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_EXTBlendFuncSeparate.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -54,11 +54,11 @@
 
 void extgl_InitEXTBlendFuncSeparate(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glBlendFuncSeparateEXT", "(IIII)V", (void*)&Java_org_lwjgl_opengl_EXTBlendFuncSeparate_glBlendFuncSeparateEXT, "glBlendFuncSeparateEXT", (void**)&glBlendFuncSeparateEXT}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTBlendFuncSeparate");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTBlendFuncSeparate");
 	if (extgl_Extensions.GL_EXT_blend_func_separate)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_blend_func_separate", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTCompiledVertexArray.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTCompiledVertexArray.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_EXTCompiledVertexArray.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -67,12 +67,12 @@
 
 void extgl_InitEXTCompiledVertexArray(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glLockArraysEXT", "(II)V", (void*)&Java_org_lwjgl_opengl_EXTCompiledVertexArray_glLockArraysEXT, "glLockArraysEXT", (void**)&glLockArraysEXT},
 		{"glUnlockArraysEXT", "()V", (void*)&Java_org_lwjgl_opengl_EXTCompiledVertexArray_glUnlockArraysEXT, "glUnlockArraysEXT", (void**)&glUnlockArraysEXT}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTCompiledVertexArray");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTCompiledVertexArray");
 	if (extgl_Extensions.GL_EXT_compiled_vertex_array)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_compiled_vertex_array", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTDrawRangeElements.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTDrawRangeElements.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_EXTDrawRangeElements.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -66,12 +66,12 @@
 
 void extgl_InitEXTDrawRangeElements(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglDrawRangeElementsEXT", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXT, "glDrawRangeElementsEXT", (void**)&glDrawRangeElementsEXT},
 		{"nglDrawRangeElementsEXTVBO", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTVBO, NULL, NULL}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTDrawRangeElements");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTDrawRangeElements");
 	if (extgl_Extensions.GL_EXT_draw_range_elements)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_draw_range_elements", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTFogCoord.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTFogCoord.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_EXTFogCoord.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -79,13 +79,13 @@
 
 void extgl_InitEXTFogCoord(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glFogCoordfEXT", "(F)V", (void*)&Java_org_lwjgl_opengl_EXTFogCoord_glFogCoordfEXT, "glFogCoordfEXT", (void**)&glFogCoordfEXT},
 		{"nglFogCoordPointerEXT", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT, "glFogCoordPointerEXT", (void**)&glFogCoordPointerEXT},
 		{"nglFogCoordPointerEXTVBO", "(III)V", (void*)&Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTVBO, NULL, NULL}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTFogCoord");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTFogCoord");
 	if (extgl_Extensions.GL_EXT_fog_coord)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_fog_coord", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTMultiDrawArrays.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTMultiDrawArrays.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_EXTMultiDrawArrays.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -56,11 +56,11 @@
 
 void extgl_InitEXTMultiDrawArrays(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglMultiDrawArraysEXT", "(ILjava/nio/IntBuffer;ILjava/nio/IntBuffer;II)V", (void*)&Java_org_lwjgl_opengl_EXTMultiDrawArrays_nglMultiDrawArraysEXT, "glMultiDrawArraysEXT", (void**)&glMultiDrawArraysEXT}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTMultiDrawArrays");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTMultiDrawArrays");
 	if (extgl_Extensions.GL_EXT_multi_draw_arrays)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_multi_draw_arrays", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTPointParameters.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTPointParameters.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_EXTPointParameters.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -68,12 +68,12 @@
 
 void extgl_InitEXTPointParameters(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glPointParameterfEXT", "(IF)V", (void*)&Java_org_lwjgl_opengl_EXTPointParameters_glPointParameterfEXT, "glPointParameterfEXT", (void**)&glPointParameterfEXT},
 		{"nglPointParameterfvEXT", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTPointParameters_nglPointParameterfvEXT, "glPointParameterfvEXT", (void**)&glPointParameterfvEXT}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTPointParameters");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTPointParameters");
 	if (extgl_Extensions.GL_EXT_point_parameters)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_point_parameters", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTSecondaryColor.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTSecondaryColor.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_EXTSecondaryColor.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -105,7 +105,7 @@
 
 void extgl_InitEXTSecondaryColor(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glSecondaryColor3bEXT", "(BBB)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3bEXT, "glSecondaryColor3bEXT", (void**)&glSecondaryColor3bEXT},
 		{"glSecondaryColor3fEXT", "(FFF)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3fEXT, "glSecondaryColor3fEXT", (void**)&glSecondaryColor3fEXT},
 		{"glSecondaryColor3ubEXT", "(BBB)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3ubEXT, "glSecondaryColor3ubEXT", (void**)&glSecondaryColor3ubEXT},
@@ -113,7 +113,7 @@
 		{"nglSecondaryColorPointerEXTVBO", "(IIII)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTVBO, NULL, NULL}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTSecondaryColor");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTSecondaryColor");
 	if (extgl_Extensions.GL_EXT_secondary_color)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_secondary_color", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTStencilTwoSide.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTStencilTwoSide.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_EXTStencilTwoSide.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -54,11 +54,11 @@
 
 void extgl_InitEXTStencilTwoSide(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glActiveStencilFaceEXT", "(I)V", (void*)&Java_org_lwjgl_opengl_EXTStencilTwoSide_glActiveStencilFaceEXT, "glActiveStencilFaceEXT", (void**)&glActiveStencilFaceEXT}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTStencilTwoSide");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTStencilTwoSide");
 	if (extgl_Extensions.GL_EXT_stencil_two_side)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_stencil_two_side", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTVertexShader.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTVertexShader.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_EXTVertexShader.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -614,7 +614,7 @@
 
 void extgl_InitEXTVertexShader(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glBeginVertexShaderEXT", "()V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBeginVertexShaderEXT, "glBeginVertexShaderEXT", (void**)&glBeginVertexShaderEXT},
 		{"glEndVertexShaderEXT", "()V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glEndVertexShaderEXT, "glEndVertexShaderEXT", (void**)&glEndVertexShaderEXT},
 		{"glBindVertexShaderEXT", "(I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBindVertexShaderEXT, "glBindVertexShaderEXT", (void**)&glBindVertexShaderEXT},
@@ -659,7 +659,7 @@
 		{"nglGetLocalConstantFloatvEXT", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantFloatvEXT, "glGetLocalConstantFloatvEXT", (void**)&glGetLocalConstantFloatvEXT}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTVertexShader");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTVertexShader");
 	if (extgl_Extensions.GL_EXT_vertex_shader)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_vertex_shader", num_functions, functions);
 }

Index: org_lwjgl_opengl_EXTVertexWeighting.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_EXTVertexWeighting.cpp	7 Mar 2004 16:01:45 -0000	1.4
+++ org_lwjgl_opengl_EXTVertexWeighting.cpp	9 Mar 2004 09:25:10 -0000	1.5
@@ -79,13 +79,13 @@
 
 void extgl_InitEXTVertexWeighting(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glVertexWeightfEXT", "(F)V", (void*)&Java_org_lwjgl_opengl_EXTVertexWeighting_glVertexWeightfEXT, "glVertexWeightfEXT", (void**)&glVertexWeightfEXT},
 		{"nglVertexWeightPointerEXT", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXT, "glVertexWeightPointerEXT", (void**)&glVertexWeightPointerEXT},
 		{"nglVertexWeightPointerEXTVBO", "(IIII)V", (void*)&Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXTVBO, NULL, NULL}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTVertexWeighting");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTVertexWeighting");
 	if (extgl_Extensions.GL_EXT_vertex_weighting)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_vertex_weighting", num_functions, functions);
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ati
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28178/src/native/common/ati

Modified Files:
	org_lwjgl_opengl_ATIDrawBuffers.cpp 
	org_lwjgl_opengl_ATIElementArray.cpp 
	org_lwjgl_opengl_ATIEnvmapBumpmap.cpp 
	org_lwjgl_opengl_ATIFragmentShader.cpp 
	org_lwjgl_opengl_ATIMapObjectBuffer.cpp 
	org_lwjgl_opengl_ATIPnTriangles.cpp 
	org_lwjgl_opengl_ATISeparateStencil.cpp 
	org_lwjgl_opengl_ATIVertexArrayObject.cpp 
	org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp 
	org_lwjgl_opengl_ATIVertexStreams.cpp 
Log Message:
Generalized function pointer initialization

Index: org_lwjgl_opengl_ATIDrawBuffers.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIDrawBuffers.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIDrawBuffers.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -55,11 +55,11 @@
 
 void extgl_InitATIDrawBuffers(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglDrawBuffersATI", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIDrawBuffers_nglDrawBuffersATI, "glDrawBuffersATI", (void**)&glDrawBuffersATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIDrawBuffers");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIDrawBuffers");
 	if (extgl_Extensions.GL_ATI_draw_buffers)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_draw_buffers", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATIElementArray.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIElementArray.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIElementArray.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -92,14 +92,14 @@
 
 void extgl_InitATIElementArray(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglElementPointerATI", "(ILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATI, "glElementPointerATI", (void**)&glElementPointerATI},
 		{"nglElementPointerATIVBO", "(II)V", (void*)&Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIVBO, NULL, NULL},
 		{"glDrawElementArrayATI", "(II)V", (void*)&Java_org_lwjgl_opengl_ATIElementArray_glDrawElementArrayATI, "glDrawElementArrayATI", (void**)&glDrawElementArrayATI},
 		{"glDrawRangeElementArrayATI", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ATIElementArray_glDrawRangeElementArrayATI, "glDrawRangeElementArrayATI", (void**)&glDrawRangeElementArrayATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIElementArray");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIElementArray");
 	if (extgl_Extensions.GL_ATI_element_array)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_element_array", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATIEnvmapBumpmap.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIEnvmapBumpmap.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIEnvmapBumpmap.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -97,14 +97,14 @@
 
 void extgl_InitATIEnvmapBumpmap(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglTexBumpParameterfvATI", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterfvATI, "glTexBumpParameterfvATI", (void**)&glTexBumpParameterfvATI},
 		{"nglTexBumpParameterivATI", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterivATI, "glTexBumpParameterivATI", (void**)&glTexBumpParameterivATI},
 		{"nglGetTexBumpParameterfvATI", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterfvATI, "glGetTexBumpParameterfvATI", (void**)&glGetTexBumpParameterfvATI},
 		{"nglGetTexBumpParameterivATI", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterivATI, "glGetTexBumpParameterivATI", (void**)&glGetTexBumpParameterivATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIEnvmapBumpmap");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIEnvmapBumpmap");
 	if (extgl_Extensions.GL_ATI_envmap_bumpmap)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_envmap_bumpmap", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATIFragmentShader.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIFragmentShader.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIFragmentShader.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -225,7 +225,7 @@
 
 void extgl_InitATIFragmentShader(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glGenFragmentShadersATI", "(I)I", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glGenFragmentShadersATI, "glGenFragmentShadersATI", (void**)&glGenFragmentShadersATI},
 		{"glBindFragmentShaderATI", "(I)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glBindFragmentShaderATI, "glBindFragmentShaderATI", (void**)&glBindFragmentShaderATI},
 		{"glDeleteFragmentShaderATI", "(I)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glDeleteFragmentShaderATI, "glDeleteFragmentShaderATI", (void**)&glDeleteFragmentShaderATI},
@@ -242,7 +242,7 @@
 		{"nglSetFragmentShaderConstantATI", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_nglSetFragmentShaderConstantATI, "glSetFragmentShaderConstantATI", (void**)&glSetFragmentShaderConstantATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIFragmentShader");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIFragmentShader");
 	if (extgl_Extensions.GL_ATI_fragment_shader)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_fragment_shader", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATIMapObjectBuffer.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIMapObjectBuffer.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIMapObjectBuffer.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -74,12 +74,12 @@
 
 void extgl_InitATIMapObjectBuffer(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glMapObjectBufferATI", "(IILjava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;", (void*)&Java_org_lwjgl_opengl_ATIMapObjectBuffer_glMapObjectBufferATI, "glMapObjectBufferATI", (void**)&glMapObjectBufferATI},
 		{"glUnmapObjectBufferATI", "(I)V", (void*)&Java_org_lwjgl_opengl_ATIMapObjectBuffer_glUnmapObjectBufferATI, "glUnmapObjectBufferATI", (void**)&glUnmapObjectBufferATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIMapObjectBuffer");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIMapObjectBuffer");
 	if (extgl_Extensions.GL_ATI_map_object_buffer)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_map_object_buffer", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATIPnTriangles.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIPnTriangles.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIPnTriangles.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -67,12 +67,12 @@
 
 void extgl_InitATIPNTriangles(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glPNTrianglesfATI", "(IF)V", (void*)&Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesfATI, "glPNTrianglesfATI", (void**)&glPNTrianglesfATI},
 		{"glPNTrianglesiATI", "(II)V", (void*)&Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesiATI, "glPNTrianglesiATI", (void**)&glPNTrianglesiATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIPnTriangles");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIPnTriangles");
 	if (extgl_Extensions.GL_ATI_pn_triangles)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_pn_triangles", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATISeparateStencil.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATISeparateStencil.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATISeparateStencil.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -67,12 +67,12 @@
 
 void extgl_InitATISeparateStencil(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glStencilOpSeparateATI", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ATISeparateStencil_glStencilOpSeparateATI, "glStencilOpSeparateATI", (void**)&glStencilOpSeparateATI},
 		{"glStencilFuncSeparateATI", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ATISeparateStencil_glStencilFuncSeparateATI, "glStencilFuncSeparateATI", (void**)&glStencilFuncSeparateATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATISeparateStencil");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATISeparateStencil");
 	if (extgl_Extensions.GL_ATI_separate_stencil)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_separate_stencil", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATIVertexArrayObject.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIVertexArrayObject.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIVertexArrayObject.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -207,7 +207,7 @@
 
 void extgl_InitATIVertexArrayObject(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglNewObjectBufferATI", "(ILjava/nio/Buffer;II)I", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBufferATI, "glNewObjectBufferATI", (void**)&glNewObjectBufferATI},
 		{"glIsObjectBufferATI", "(I)Z", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_glIsObjectBufferATI, "glIsObjectBufferATI", (void**)&glIsObjectBufferATI},
 		{"nglUpdateObjectBufferATI", "(IIILjava/nio/Buffer;II)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglUpdateObjectBufferATI, "glUpdateObjectBufferATI", (void**)&glUpdateObjectBufferATI},
@@ -222,7 +222,7 @@
 		{"nglGetVariantArrayObjectivATI", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectivATI, "glGetVariantArrayObjectivATI", (void**)&glGetVariantArrayObjectivATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIVertexArrayObject");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIVertexArrayObject");
 	if (extgl_Extensions.GL_ATI_vertex_array_object)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_vertex_array_object", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -82,13 +82,13 @@
 
 void extgl_InitATIVertexAttribArrayObject(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glVertexAttribArrayObjectATI", "(IIIZIII)V", (void*)&Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_glVertexAttribArrayObjectATI, "glVertexAttribArrayObjectATI", (void**)&glVertexAttribArrayObjectATI},
 		{"nglGetVertexAttribArrayObjectfvATI", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectfvATI, "glGetVertexAttribArrayObjectfvATI", (void**)&glGetVertexAttribArrayObjectfvATI},
 		{"nglGetVertexAttribArrayObjectivATI", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectivATI, "glGetVertexAttribArrayObjectivATI", (void**)&glGetVertexAttribArrayObjectivATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIVertexAttribArrayObject");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIVertexAttribArrayObject");
 	if (extgl_Extensions.GL_ATI_vertex_attrib_array_object)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_vertex_attrib_array_object", num_functions, functions);
 }

Index: org_lwjgl_opengl_ATIVertexStreams.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_ATIVertexStreams.cpp	7 Mar 2004 16:01:44 -0000	1.4
+++ org_lwjgl_opengl_ATIVertexStreams.cpp	9 Mar 2004 09:25:09 -0000	1.5
@@ -288,7 +288,7 @@
 
 void extgl_InitATIVertexStreams(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glVertexStream1fATI", "(IF)V", (void*)&Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1fATI, "glVertexStream1fATI", (void**)&glVertexStream1fATI},
 		{"glVertexStream1iATI", "(II)V", (void*)&Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1iATI, "glVertexStream1iATI", (void**)&glVertexStream1iATI},
 		{"glVertexStream1sATI", "(IS)V", (void*)&Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1sATI, "glVertexStream1sATI", (void**)&glVertexStream1sATI},
@@ -310,7 +310,7 @@
 		{"glVertexBlendEnviATI", "(II)V", (void*)&Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnviATI, "glVertexBlendEnviATI", (void**)&glVertexBlendEnviATI}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIVertexStreams");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ATIVertexStreams");
 	if (extgl_Extensions.GL_ATI_vertex_streams)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_vertex_streams", num_functions, functions);
 }

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

Modified Files:
	common_tools.cpp common_tools.h extgl.cpp extgl.h 
	org_lwjgl_opengl_GL11.cpp org_lwjgl_opengl_GL12.cpp 
	org_lwjgl_opengl_GL13.cpp org_lwjgl_opengl_GL14.cpp 
	org_lwjgl_opengl_GL15.cpp 
Log Message:
Generalized function pointer initialization

Index: common_tools.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- common_tools.cpp	24 Dec 2003 07:32:03 -0000	1.8
+++ common_tools.cpp	9 Mar 2004 09:25:08 -0000	1.9
@@ -37,6 +37,7 @@
  * @version $Revision$
  */
 
+#include <stdlib.h>
 #include "common_tools.h"
 
 bool debug = false;
@@ -115,3 +116,56 @@
 void throwException(JNIEnv * env, const char * err) {
 	throwGeneralException(env, "java/lang/Exception", err);
 }
+
+void doExtension(JNIEnv *env, jobject ext_set, const char *method_name, const char *ext) {
+	jclass clazz = env->GetObjectClass(ext_set);
+	jmethodID id = env->GetMethodID(clazz, method_name, "(Ljava/lang/Object;)Z");
+	if (id == NULL)
+		return;
+	jstring ext_string = env->NewStringUTF(ext);
+	if (ext_string == NULL) {
+		printf("Could not allocate java string from %s\n", ext);
+		return;
+	}
+	env->CallBooleanMethod(ext_set, id, ext_string);
+}
+
+static void ext_removeExtension(JNIEnv *env, jobject ext_set, const char *ext) {
+	doExtension(env, ext_set, "remove", ext);
+}
+
+jclass ext_ResetClass(JNIEnv *env, const char *class_name) {
+	jclass clazz = env->FindClass(class_name);
+	jint result = env->UnregisterNatives(clazz);
+	if (result != 0)
+		printfDebug("Could not unregister natives for class %s\n", class_name);
+	return clazz;
+}
+
+void ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions) {
+	JNINativeMethod *methods = (JNINativeMethod *)malloc(num_functions*sizeof(JNINativeMethod));
+	for (int i = 0; i < num_functions; i++) {
+		JavaMethodAndExtFunction *function = functions + i;
+		if (function->ext_function_name != NULL) {
+			void *ext_func_pointer = gpa(function->ext_function_name);
+			if (ext_func_pointer == NULL) {
+				printf("NOTICE: %s disabled because of missing driver symbols\n", ext_name);
+				if (ext_set != NULL)
+					ext_removeExtension(env, ext_set, ext_name);
+				free(methods);
+				return;
+			}
+			void **ext_function_pointer_pointer = function->ext_function_pointer;
+			*ext_function_pointer_pointer = ext_func_pointer;
+		}
+		JNINativeMethod *method = methods + i;
+		method->name = function->method_name;
+		method->signature = function->signature;
+		method->fnPtr = function->method_pointer;
+	}
+	jint result = env->RegisterNatives(clazz, methods, num_functions);
+	free(methods);
+	if (result != 0)
+		printfDebug("Could not register natives for extension %s\n", ext_name);
+}
+

Index: common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- common_tools.h	20 Jan 2004 10:11:02 -0000	1.8
+++ common_tools.h	9 Mar 2004 09:25:08 -0000	1.9
@@ -85,4 +85,20 @@
 	return (const char *)NULL + offset;
 }
 
+typedef void *(* ExtGetProcAddressPROC) (const char *func_name);
+typedef struct {
+	char *method_name;
+	char *signature;
+	void *method_pointer;
+
+	char *ext_function_name;
+	void **ext_function_pointer;
+} JavaMethodAndExtFunction;
+
+#define NUMFUNCTIONS(x) (sizeof(x)/sizeof(JavaMethodAndExtFunction));
+
+extern void doExtension(JNIEnv *env, jobject ext_set, const char *method_name, const char *ext);
+extern jclass ext_ResetClass(JNIEnv *env, const char *class_name);
+extern void ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions);
+
 #endif

Index: extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- extgl.cpp	7 Mar 2004 15:49:00 -0000	1.27
+++ extgl.cpp	9 Mar 2004 09:25:08 -0000	1.28
@@ -34,7 +34,6 @@
 */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include "extgl.h"
 #include "common_tools.h"
@@ -595,58 +594,58 @@
 CFBundleRef agl_bundle_ref = NULL;
 #endif
 
-jclass extgl_ResetClass(JNIEnv *env, const char *class_name) {
-	jclass clazz = env->FindClass(class_name);
-	jint result = env->UnregisterNatives(clazz);
-	if (result != 0)
-		printfDebug("Could not unregister natives for class %s\n", class_name);
-	return clazz;
-}
+/* getProcAddress */
 
-void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndGLFunction *functions) {
-	JNINativeMethod *methods = (JNINativeMethod *)malloc(num_functions*sizeof(JNINativeMethod));
-	for (int i = 0; i < num_functions; i++) {
-		JavaMethodAndGLFunction *function = functions + i;
-		if (function->gl_function_name != NULL) {
-			void *gl_func_pointer = extgl_GetProcAddress(function->gl_function_name);
-			if (gl_func_pointer == NULL) {
-				printf("NOTICE: %s disabled because of missing driver symbols\n", ext_name);
-				if (ext_set != NULL)
-					extgl_removeExtension(env, ext_set, ext_name);
-				free(methods);
-				return;
-			}
-			void **gl_function_pointer_pointer = function->gl_function_pointer;
-			*gl_function_pointer_pointer = gl_func_pointer;
+static void *extgl_GetProcAddress(const char *name)
+{
+#ifdef _WIN32
+	void *t = wglGetProcAddress(name);
+	if (t == NULL)
+	{
+		t = GetProcAddress(lib_gl_handle, name);
+		if (t == NULL)
+		{
+			printfDebug("Could not locate symbol %s\n", name);
+			extgl_error = true;
 		}
-		JNINativeMethod *method = methods + i;
-		method->name = function->method_name;
-		method->signature = function->signature;
-		method->fnPtr = function->method_pointer;
 	}
-	jint result = env->RegisterNatives(clazz, methods, num_functions);
-	free(methods);
-	if (result != 0)
-		printfDebug("Could not register natives for extension %s\n", ext_name);
-}
+	return t;
+#endif
 
-static void doExtension(JNIEnv *env, jobject ext_set, const char *method_name, const char *ext) {
-	jclass clazz = env->GetObjectClass(ext_set);
-	jmethodID id = env->GetMethodID(clazz, method_name, "(Ljava/lang/Object;)Z");
-	if (id == NULL)
-		return;
-	jstring ext_string = env->NewStringUTF(ext);
-	if (ext_string == NULL) {
-		printf("Could not allocate java string from %s\n", ext);
-		return;
+#ifdef _X11
+	void *t = (void*)glXGetProcAddressARB((const GLubyte*)name);
+	if (t == NULL)
+	{
+		t = dlsym(lib_gl_handle, name);
+		if (t == NULL)
+		{
+			printfDebug("Could not locate symbol %s\n", name);
+			extgl_error = true;
+		}
 	}
-	env->CallBooleanMethod(ext_set, id, ext_string);
+	return t;
+#endif
+
+#ifdef _AGL
+	CFStringRef str = CFStringCreateWithCStringNoCopy(NULL, name, kCFStringEncodingUTF8, kCFAllocatorNull);
+	void *func_pointer = CFBundleGetFunctionPointerForName(opengl_bundle_ref, str);
+	if (func_pointer == NULL) {
+		func_pointer = CFBundleGetFunctionPointerForName(agl_bundle_ref, str);
+		if (func_pointer == NULL) {
+			printfDebug("Could not locate symbol %s\n", name);
+			extgl_error = true;
+		}
+	}
+	CFRelease(str);
+	return func_pointer;
+#endif
 }
 
-void extgl_removeExtension(JNIEnv *env, jobject ext_set, const char *ext) {
-	doExtension(env, ext_set, "remove", ext);
+void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions) {
+	ext_InitializeClass(env, clazz, ext_set, ext_name, &extgl_GetProcAddress, num_functions, functions);
 }
 
+
 static void insertExtension(JNIEnv *env, jobject ext_set, const char *ext) {
 	doExtension(env, ext_set, "add", ext);
 }
@@ -722,53 +721,6 @@
 
 #endif
 
-/* getProcAddress */
-
-void *extgl_GetProcAddress(const char *name)
-{
-#ifdef _WIN32
-	void *t = wglGetProcAddress(name);
-	if (t == NULL)
-	{
-		t = GetProcAddress(lib_gl_handle, name);
-		if (t == NULL)
-		{
-			printfDebug("Could not locate symbol %s\n", name);
-			extgl_error = true;
-		}
-	}
-	return t;
-#endif
-
-#ifdef _X11
-	void *t = (void*)glXGetProcAddressARB((const GLubyte*)name);
-	if (t == NULL)
-	{
-		t = dlsym(lib_gl_handle, name);
-		if (t == NULL)
-		{
-			printfDebug("Could not locate symbol %s\n", name);
-			extgl_error = true;
-		}
-	}
-	return t;
-#endif
-
-#ifdef _AGL
-	CFStringRef str = CFStringCreateWithCStringNoCopy(NULL, name, kCFStringEncodingUTF8, kCFAllocatorNull);
-	void *func_pointer = CFBundleGetFunctionPointerForName(opengl_bundle_ref, str);
-	if (func_pointer == NULL) {
-		func_pointer = CFBundleGetFunctionPointerForName(agl_bundle_ref, str);
-		if (func_pointer == NULL) {
-			printfDebug("Could not locate symbol %s\n", name);
-			extgl_error = true;
-		}
-	}
-	CFRelease(str);
-	return func_pointer;
-#endif
-}
-
 static bool QueryExtension(JNIEnv *env, jobject ext_set, const GLubyte*extensions, const char *name)
 {
 	const GLubyte *start;

Index: extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- extgl.h	7 Mar 2004 15:18:45 -0000	1.29
+++ extgl.h	9 Mar 2004 09:25:08 -0000	1.30
@@ -194,6 +194,8 @@
 #define GLAPI extern
 #define GLAPIENTRY
 
+#include "common_tools.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3286,23 +3288,9 @@
 #ifdef _AGL
 bool extgl_InitAGL(JNIEnv *env);
 #endif
-void *extgl_GetProcAddress(const char *name);
 void extgl_Close(void);
-void extgl_removeExtension(JNIEnv *env, jobject ext_set, const char *ext);
-
-typedef struct {
-	char *method_name;
-	char *signature;
-	void *method_pointer;
-
-	char *gl_function_name;
-	void **gl_function_pointer;
-} JavaMethodAndGLFunction;
-
-#define NUMFUNCTIONS(x) (sizeof(x)/sizeof(JavaMethodAndGLFunction));
+void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions);
 
-jclass extgl_ResetClass(JNIEnv *env, const char *class_name);
-void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndGLFunction *functions);
 #define EXTGL_SANITY_CHECK(e,x)		if (extgl_error) { \
 						extgl_Extensions.x = false; \
 						printf("NOTICE: %s disabled because of missing driver symbols\n", #x); \

Index: org_lwjgl_opengl_GL11.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL11.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_GL11.cpp	7 Mar 2004 16:01:44 -0000	1.6
+++ org_lwjgl_opengl_GL11.cpp	9 Mar 2004 09:25:08 -0000	1.7
@@ -2574,7 +2574,7 @@
 
 void extgl_InitOpenGL1_1(JNIEnv *env)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glAccum", "(IF)V", (void*)&Java_org_lwjgl_opengl_GL11_glAccum, "glAccum", (void**)&glAccum},
 		{"glAlphaFunc", "(IF)V", (void*)&Java_org_lwjgl_opengl_GL11_glAlphaFunc, "glAlphaFunc", (void**)&glAlphaFunc},
 		{"glClearColor", "(FFFF)V", (void*)&Java_org_lwjgl_opengl_GL11_glClearColor, "glClearColor", (void**)&glClearColor},
@@ -2783,7 +2783,7 @@
 		{"glViewport", "(IIII)V", (void*)&Java_org_lwjgl_opengl_GL11_glViewport, "glViewport", (void**)&glViewport}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/GL11");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/GL11");
 	if (true)
 		extgl_InitializeClass(env, clazz, NULL, "GL11", num_functions, functions);
 }

Index: org_lwjgl_opengl_GL12.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL12.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_GL12.cpp	7 Mar 2004 16:01:44 -0000	1.6
+++ org_lwjgl_opengl_GL12.cpp	9 Mar 2004 09:25:08 -0000	1.7
@@ -117,7 +117,7 @@
 
 void extgl_InitOpenGL1_2(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglDrawRangeElements", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL12_nglDrawRangeElements, "glDrawRangeElements", (void**)&glDrawRangeElements},
 		{"nglDrawRangeElementsVBO", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsVBO, NULL, NULL},
 		{"nglTexImage3D", "(IIIIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL12_nglTexImage3D, "glTexImage3D", (void**)&glTexImage3D},
@@ -125,7 +125,7 @@
 		{"glCopyTexSubImage3D", "(IIIIIIIII)V", (void*)&Java_org_lwjgl_opengl_GL12_glCopyTexSubImage3D, "glCopyTexSubImage3D", (void**)&glCopyTexSubImage3D}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/GL12");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/GL12");
 	if (extgl_Extensions.OpenGL12)
 		extgl_InitializeClass(env, clazz, ext_set, "OpenGL12", num_functions, functions);
 }

Index: org_lwjgl_opengl_GL13.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL13.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_GL13.cpp	7 Mar 2004 16:01:44 -0000	1.5
+++ org_lwjgl_opengl_GL13.cpp	9 Mar 2004 09:25:08 -0000	1.6
@@ -287,7 +287,7 @@
 
 void extgl_InitOpenGL1_3(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glActiveTexture", "(I)V", (void*)&Java_org_lwjgl_opengl_GL13_glActiveTexture, "glActiveTexture", (void**)&glActiveTexture},
 		{"glClientActiveTexture", "(I)V", (void*)&Java_org_lwjgl_opengl_GL13_glClientActiveTexture, "glClientActiveTexture", (void**)&glClientActiveTexture},
 		{"nglCompressedTexImage1D", "(IIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1D, "glCompressedTexImage1D", (void**)&glCompressedTexImage1D},
@@ -306,7 +306,7 @@
 		{"glSampleCoverage", "(FZ)V", (void*)&Java_org_lwjgl_opengl_GL13_glSampleCoverage, "glSampleCoverage", (void**)&glSampleCoverage}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/GL13");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/GL13");
 	if (extgl_Extensions.OpenGL13)
 		extgl_InitializeClass(env, clazz, ext_set, "OpenGL13", num_functions, functions);
 }

Index: org_lwjgl_opengl_GL14.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL14.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_GL14.cpp	7 Mar 2004 16:01:44 -0000	1.6
+++ org_lwjgl_opengl_GL14.cpp	9 Mar 2004 09:25:08 -0000	1.7
@@ -271,7 +271,7 @@
 
 void extgl_InitOpenGL1_4(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"glBlendEquation", "(I)V", (void*)&Java_org_lwjgl_opengl_GL14_glBlendEquation, "glBlendEquation", (void**)&glBlendEquation},
 		{"glBlendColor", "(FFFF)V", (void*)&Java_org_lwjgl_opengl_GL14_glBlendColor, "glBlendColor", (void**)&glBlendColor},
 		{"glFogCoordf", "(F)V", (void*)&Java_org_lwjgl_opengl_GL14_glFogCoordf, "glFogCoordf", (void**)&glFogCoordf},
@@ -292,7 +292,7 @@
 		{"glWindowPos3i", "(III)V", (void*)&Java_org_lwjgl_opengl_GL14_glWindowPos3i, "glWindowPos3i", (void**)&glWindowPos3i}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/GL14");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/GL14");
 	if (extgl_Extensions.OpenGL14)
 		extgl_InitializeClass(env, clazz, ext_set, "OpenGL14", num_functions, functions);
 }

Index: org_lwjgl_opengl_GL15.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL15.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_GL15.cpp	7 Mar 2004 16:01:44 -0000	1.5
+++ org_lwjgl_opengl_GL15.cpp	9 Mar 2004 09:25:08 -0000	1.6
@@ -315,7 +315,7 @@
 
 void extgl_InitOpenGL1_5(JNIEnv *env, jobject ext_set)
 {
-	JavaMethodAndGLFunction functions[] = {
+	JavaMethodAndExtFunction functions[] = {
 		{"nglBindBuffer", "(II)V", (void*)&Java_org_lwjgl_opengl_GL15_nglBindBuffer, "glBindBuffer", (void**)&glBindBuffer},
 		{"nglDeleteBuffers", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_GL15_nglDeleteBuffers, "glDeleteBuffers", (void**)&glDeleteBuffers},
 		{"nglGenBuffers", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_GL15_nglGenBuffers, "glGenBuffers", (void**)&glGenBuffers},
@@ -337,7 +337,7 @@
 		{"nglGetQueryObjectuiv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_GL15_nglGetQueryObjectuiv, "glGetQueryObjectuiv", (void**)&glGetQueryObjectuiv}
 	};
 	int num_functions = NUMFUNCTIONS(functions);
-	jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/GL15");
+	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/GL15");
 	if (extgl_Extensions.OpenGL15)
 		extgl_InitializeClass(env, clazz, ext_set, "OpenGL15", num_functions, functions);
 }