Menu
▾
▴
[Java-game-lib-cvs] LWJGL/src/native/common/nv org_lwjgl_opengl_NVEvaluators.cpp,1.4,1.5 org_lwjgl_opengl_NVFence.cpp,1.4,1.5 org_lwjgl_opengl_NVFragmentProgram.cpp,1.4,1.5 org_lwjgl_opengl_NVHalfFloat.cpp,1.5,1.6 org_lwjgl_opengl_NVOcclusionQuery.cpp,1.4,1.5 org_lwjgl_opengl_NVPixelDataRange.cpp,1.4,1.5 org_lwjgl_opengl_NVPointSprite.cpp,1.4,1.5 org_lwjgl_opengl_NVPrimitiveRestart.cpp,1.4,1.5 org_lwjgl_opengl_NVProgram.cpp,1.4,1.5 org_lwjgl_opengl_NVRegisterCombiners.cpp,1.4,1.5 org_lwjgl_opengl_NVRegisterCombiners2.cpp,1.4,1.5 org_lwjgl_opengl_NVVertexArrayRange.cpp,1.4,1.5 org_lwjgl_opengl_NVVertexProgram.cpp,1.4,1.5
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); } |
