Menu
▾
▴
[Java-game-lib-cvs] LWJGL/src/native/common/ati org_lwjgl_opengl_ATIDrawBuffers.cpp,1.4,1.5 org_lwjgl_opengl_ATIElementArray.cpp,1.4,1.5 org_lwjgl_opengl_ATIEnvmapBumpmap.cpp,1.4,1.5 org_lwjgl_opengl_ATIFragmentShader.cpp,1.4,1.5 org_lwjgl_opengl_ATIMapObjectBuffer.cpp,1.4,1.5 org_lwjgl_opengl_ATIPnTriangles.cpp,1.4,1.5 org_lwjgl_opengl_ATISeparateStencil.cpp,1.4,1.5 org_lwjgl_opengl_ATIVertexArrayObject.cpp,1.4,1.5 org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp,1.4,1.5 org_lwjgl_opengl_ATIVertexStreams.cpp,1.4,1.5
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); } |
