Menu
▾
▴
[Java-game-lib-cvs] LWJGL/src/native/common/arb org_lwjgl_opengl_ARBImaging.cpp,1.4,1.5 org_lwjgl_opengl_ARBMatrixPalette.cpp,1.4,1.5 org_lwjgl_opengl_ARBMultisample.cpp,1.4,1.5 org_lwjgl_opengl_ARBMultitexture.cpp,1.4,1.5 org_lwjgl_opengl_ARBOcclusionQuery.cpp,1.4,1.5 org_lwjgl_opengl_ARBPointParameters.cpp,1.4,1.5 org_lwjgl_opengl_ARBProgram.cpp,1.4,1.5 org_lwjgl_opengl_ARBShaderObjects.cpp,1.5,1.6 org_lwjgl_opengl_ARBTextureCompression.cpp,1.4,1.5 org_lwjgl_opengl_ARBTransposeMatrix.cpp,1.4,1.5 org_lwjgl_opengl_ARBVertexBlend.cpp,1.4,1.5 org_lwjgl_opengl_ARBVertexBufferObject.cpp,1.5,1.6 org_lwjgl_opengl_ARBVertexProgram.cpp,1.4,1.5 org_lwjgl_opengl_ARBVertexShader.cpp,1.4,1.5 org_lwjgl_opengl_ARBWindowPos.cpp,1.4,1.5
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); } |
