Menu
▾
▴
[Java-game-lib-cvs] LWJGL/src/native/common/arb org_lwjgl_opengl_ARBImaging.cpp,1.1,1.2 org_lwjgl_opengl_ARBMatrixPalette.cpp,1.1,1.2 org_lwjgl_opengl_ARBMultisample.cpp,1.1,1.2 org_lwjgl_opengl_ARBMultitexture.cpp,1.1,1.2 org_lwjgl_opengl_ARBOcclusionQuery.cpp,1.1,1.2 org_lwjgl_opengl_ARBPointParameters.cpp,1.1,1.2 org_lwjgl_opengl_ARBProgram.cpp,1.1,1.2 org_lwjgl_opengl_ARBShaderObjects.cpp,1.2,1.3 org_lwjgl_opengl_ARBTextureCompression.cpp,1.1,1.2 org_lwjgl_opengl_ARBTransposeMatrix.cpp,1.1,1.2 org_lwjgl_opengl_ARBVertexBlend.cpp,1.1,1.2 org_lwjgl_opengl_ARBVertexBufferObject.cpp,1.2,1.3 org_lwjgl_opengl_ARBVertexProgram.cpp,1.1,1.2 org_lwjgl_opengl_ARBVertexShader.cpp,1.1,1.2 org_lwjgl_opengl_ARBWindowPos.cpp,1.1,1.2 org_lwjgl_opengl_ARBImaging.h,1.1,NONE org_lwjgl_opengl_ARBMatrixPalette.h,1.1,NONE org_lwjgl_opengl_ARBMultisample.h,1.1,NONE org_lwjgl_opengl_ARBMultitexture.h,1.1,NONE org_lwjgl_opengl_ARBOcclusionQuery.h,1.1,NONE org_lwjgl_opengl_ARBPointParameters.h,1.1,NONE org_lwjgl_opengl_ARBProgram.h,1.1,NONE org_lwjgl_opengl_ARBShaderObjects.h,1.1,NONE org_lwjgl_opengl_ARBTextureCompression.h,1.1,NONE org_lwjgl_opengl_ARBTransposeMatrix.h,1.1,NONE org_lwjgl_opengl_ARBVertexBlend.h,1.1,NONE org_lwjgl_opengl_ARBVertexBufferObject.h,1.1,NONE org_lwjgl_opengl_ARBVertexProgram.h,1.1,NONE org_lwjgl_opengl_ARBVertexShader.h,1.1,NONE org_lwjgl_opengl_ARBWindowPos.h,1.1,NONE
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/arb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31365/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 Removed Files: org_lwjgl_opengl_ARBImaging.h org_lwjgl_opengl_ARBMatrixPalette.h org_lwjgl_opengl_ARBMultisample.h org_lwjgl_opengl_ARBMultitexture.h org_lwjgl_opengl_ARBOcclusionQuery.h org_lwjgl_opengl_ARBPointParameters.h org_lwjgl_opengl_ARBProgram.h org_lwjgl_opengl_ARBShaderObjects.h org_lwjgl_opengl_ARBTextureCompression.h org_lwjgl_opengl_ARBTransposeMatrix.h org_lwjgl_opengl_ARBVertexBlend.h org_lwjgl_opengl_ARBVertexBufferObject.h org_lwjgl_opengl_ARBVertexProgram.h org_lwjgl_opengl_ARBVertexShader.h org_lwjgl_opengl_ARBWindowPos.h Log Message: Replaced CHECK_EXISTS with one time check at symbol load time 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.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBImaging.cpp 17 Feb 2004 21:59:17 -0000 1.1 +++ org_lwjgl_opengl_ARBImaging.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -39,7 +39,6 @@ * @version $Revision$ */ -#include "org_lwjgl_opengl_ARBImaging.h" #include "checkGLerror.h" #include "extgl.h" @@ -113,56 +112,14 @@ static glResetHistogramPROC glResetHistogram; static glResetMinmaxPROC glResetMinmax; -void extgl_InitARBImaging(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_imaging) - return; - glBlendColor = (glBlendColorPROC) extgl_GetProcAddress("glBlendColor"); - glBlendEquation = (glBlendEquationPROC) extgl_GetProcAddress("glBlendEquation"); - glColorTable = (glColorTablePROC) extgl_GetProcAddress("glColorTable"); - glColorTableParameterfv = (glColorTableParameterfvPROC) extgl_GetProcAddress("glColorTableParameterfv"); - glColorTableParameteriv = (glColorTableParameterivPROC) extgl_GetProcAddress("glColorTableParameteriv"); - glCopyColorTable = (glCopyColorTablePROC) extgl_GetProcAddress("glCopyColorTable"); - glGetColorTable = (glGetColorTablePROC) extgl_GetProcAddress("glGetColorTable"); - glGetColorTableParameterfv = (glGetColorTableParameterfvPROC) extgl_GetProcAddress("glGetColorTableParameterfv"); - glGetColorTableParameteriv = (glGetColorTableParameterivPROC) extgl_GetProcAddress("glGetColorTableParameteriv"); - glColorSubTable = (glColorSubTablePROC) extgl_GetProcAddress("glColorSubTable"); - glCopyColorSubTable = (glCopyColorSubTablePROC) extgl_GetProcAddress("glCopyColorSubTable"); - glConvolutionFilter1D = (glConvolutionFilter1DPROC) extgl_GetProcAddress("glConvolutionFilter1D"); - glConvolutionFilter2D = (glConvolutionFilter2DPROC) extgl_GetProcAddress("glConvolutionFilter2D"); - glConvolutionParameterf = (glConvolutionParameterfPROC) extgl_GetProcAddress("glConvolutionParameterf"); - glConvolutionParameterfv = (glConvolutionParameterfvPROC) extgl_GetProcAddress("glConvolutionParameterfv"); - glConvolutionParameteri = (glConvolutionParameteriPROC) extgl_GetProcAddress("glConvolutionParameteri"); - glConvolutionParameteriv = (glConvolutionParameterivPROC) extgl_GetProcAddress("glConvolutionParameteriv"); - glCopyConvolutionFilter1D = (glCopyConvolutionFilter1DPROC) extgl_GetProcAddress("glCopyConvolutionFilter1D"); - glCopyConvolutionFilter2D = (glCopyConvolutionFilter2DPROC) extgl_GetProcAddress("glCopyConvolutionFilter2D"); - glGetConvolutionFilter = (glGetConvolutionFilterPROC) extgl_GetProcAddress("glGetConvolutionFilter"); - glGetConvolutionParameterfv = (glGetConvolutionParameterfvPROC) extgl_GetProcAddress("glGetConvolutionParameterfv"); - glGetConvolutionParameteriv = (glGetConvolutionParameterivPROC) extgl_GetProcAddress("glGetConvolutionParameteriv"); - glGetSeparableFilter = (glGetSeparableFilterPROC) extgl_GetProcAddress("glGetSeparableFilter"); - glSeparableFilter2D = (glSeparableFilter2DPROC) extgl_GetProcAddress("glSeparableFilter2D"); - glGetHistogram = (glGetHistogramPROC) extgl_GetProcAddress("glGetHistogram"); - glGetHistogramParameterfv = (glGetHistogramParameterfvPROC) extgl_GetProcAddress("glGetHistogramParameterfv"); - glGetHistogramParameteriv = (glGetHistogramParameterivPROC) extgl_GetProcAddress("glGetHistogramParameteriv"); - glGetMinmax = (glGetMinmaxPROC) extgl_GetProcAddress("glGetMinmax"); - glGetMinmaxParameterfv = (glGetMinmaxParameterfvPROC) extgl_GetProcAddress("glGetMinmaxParameterfv"); - glGetMinmaxParameteriv = (glGetMinmaxParameterivPROC) extgl_GetProcAddress("glGetMinmaxParameteriv"); - glHistogram = (glHistogramPROC) extgl_GetProcAddress("glHistogram"); - glMinmax = (glMinmaxPROC) extgl_GetProcAddress("glMinmax"); - glResetHistogram = (glResetHistogramPROC) extgl_GetProcAddress("glResetHistogram"); - glResetMinmax = (glResetMinmaxPROC) extgl_GetProcAddress("glResetMinmax"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_imaging) -} - /* * Class: org_lwjgl_opengl_ARBImaging * Method: glColorTable * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTable +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTable (JNIEnv * env, jclass clazz, jint target, jint internalFormat, jint width, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glColorTable) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glColorTable(target, internalFormat, width, format, type, address); CHECK_GL_ERROR @@ -173,10 +130,9 @@ * Method: glColorSubTable * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable (JNIEnv * env, jclass clazz, jint target, jint start, jint count, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glColorSubTable) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glColorSubTable(target, start, count, format, type, address); CHECK_GL_ERROR @@ -187,10 +143,9 @@ * Method: glGetColorTable * Signature: (IIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable (JNIEnv * env, jclass clazz, jint target, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glGetColorTable) void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetColorTable(target, format, type, address); CHECK_GL_ERROR @@ -201,10 +156,9 @@ * Method: glGetColorTableParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv (JNIEnv * env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glGetColorTableParameteriv) GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetColorTableParameteriv(target, pname, address); CHECK_GL_ERROR @@ -215,10 +169,9 @@ * Method: glGetColorTableParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv (JNIEnv * env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glGetColorTableParameterfv) GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetColorTableParameterfv(target, pname, address); CHECK_GL_ERROR @@ -229,10 +182,9 @@ * Method: glColorTableParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glColorTableParameteriv) const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glColorTableParameteriv(target, pname, address); CHECK_GL_ERROR @@ -243,10 +195,9 @@ * Method: glColorTableParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glColorTableParameterfv) const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glColorTableParameterfv(target, pname, address); CHECK_GL_ERROR @@ -258,10 +209,9 @@ * Method: glCopyColorSubTable * Signature: (IIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable (JNIEnv *env, jclass clazz, jint target, jint start, jint x, jint y, jint width) { - CHECK_EXISTS(glCopyColorSubTable) glCopyColorSubTable(target, start, x, y, width); CHECK_GL_ERROR } @@ -272,10 +222,9 @@ * Method: glCopyColorTable * Signature: (IIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width) { - CHECK_EXISTS(glCopyColorTable) glCopyColorTable(target, internalformat, x, y, width); CHECK_GL_ERROR } @@ -286,10 +235,9 @@ * Method: glBlendEquation * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation (JNIEnv *env, jclass clazz, jint mode) { - CHECK_EXISTS(glBlendEquation) glBlendEquation(mode); CHECK_GL_ERROR } @@ -298,9 +246,8 @@ * Class: org_lwjgl_opengl_ARBImaging * Method: glBlendColor */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { - CHECK_EXISTS(glBlendColor) glBlendColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); CHECK_GL_ERROR } @@ -310,10 +257,9 @@ * Method: glHistogram * Signature: (IIIZ)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glHistogram +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glHistogram (JNIEnv *env, jclass clazz, jint target, jint width, jint internalformat, jboolean sink) { - CHECK_EXISTS(glHistogram) glHistogram(target, width, internalformat, sink); CHECK_GL_ERROR } @@ -323,10 +269,9 @@ * Method: glResetHistogram * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram (JNIEnv *env, jclass clazz, jint target) { - CHECK_EXISTS(glResetHistogram) glResetHistogram(target); CHECK_GL_ERROR } @@ -336,10 +281,9 @@ * Method: glGetHistogram * Signature: (IZIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram (JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glGetHistogram) void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetHistogram(target, reset, format, type, address); CHECK_GL_ERROR @@ -350,10 +294,9 @@ * Method: glGetHistogramParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glGetHistogramParameterfv) GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetHistogramParameterfv(target, pname, address); CHECK_GL_ERROR @@ -364,10 +307,9 @@ * Method: glGetHistogramParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glGetHistogramParameteriv) GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetHistogramParameteriv(target, pname, address); CHECK_GL_ERROR @@ -378,10 +320,9 @@ * Method: glMinmax * Signature: (IIZ)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glMinmax +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glMinmax (JNIEnv *env, jclass clazz, jint target, jint internalformat, jboolean sink) { - CHECK_EXISTS(glMinmax) glMinmax(target, internalformat, sink); CHECK_GL_ERROR } @@ -391,10 +332,9 @@ * Method: glResetMinmax * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax (JNIEnv *env, jclass clazz, jint target) { - CHECK_EXISTS(glResetMinmax) glResetMinmax(target); CHECK_GL_ERROR } @@ -404,10 +344,9 @@ * Method: glGetMinmax * Signature: (IZIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax (JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glGetMinmax) void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetMinmax(target, reset, format, type, address); CHECK_GL_ERROR @@ -418,10 +357,9 @@ * Method: glGetMinmaxParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glGetMinmaxParameterfv) GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetMinmaxParameterfv(target, pname, address); CHECK_GL_ERROR @@ -432,10 +370,9 @@ * Method: glGetMinmaxParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glGetMinmaxParameteriv) GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetMinmaxParameteriv(target, pname, address); CHECK_GL_ERROR @@ -446,10 +383,9 @@ * Method: glConvolutionFilter1D * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glConvolutionFilter1D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glConvolutionFilter1D(target, internalformat, width, format, type, address); CHECK_GL_ERROR @@ -460,10 +396,9 @@ * Method: glConvolutionFilter2D * Signature: (IIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glConvolutionFilter2D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glConvolutionFilter2D(target, internalformat, width, height, format, type, address); CHECK_GL_ERROR @@ -474,10 +409,9 @@ * Method: glConvolutionParameterf * Signature: (IIF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf (JNIEnv *env, jclass clazz, jint target, jint pname, jfloat params) { - CHECK_EXISTS(glConvolutionParameterf) glConvolutionParameterf(target, pname, params); CHECK_GL_ERROR } @@ -487,10 +421,9 @@ * Method: glConvolutionParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glConvolutionParameterfv) const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glConvolutionParameterfv(target, pname, address); CHECK_GL_ERROR @@ -501,10 +434,9 @@ * Method: glConvolutionParameteri * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri (JNIEnv *env, jclass clazz, jint target, jint pname, jint params) { - CHECK_EXISTS(glConvolutionParameteri) glConvolutionParameteri(target, pname, params); CHECK_GL_ERROR } @@ -514,10 +446,9 @@ * Method: glConvolutionParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glConvolutionParameteriv) const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glConvolutionParameteriv(target, pname, address); CHECK_GL_ERROR @@ -528,10 +459,9 @@ * Method: glCopyConvolutionFilter1D * Signature: (IIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width) { - CHECK_EXISTS(glCopyConvolutionFilter1D) glCopyConvolutionFilter1D(target, internalformat, x, y, width); CHECK_GL_ERROR } @@ -541,10 +471,9 @@ * Method: glCopyConvolutionFilter2D * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width, jint height) { - CHECK_EXISTS(glCopyConvolutionFilter2D) glCopyConvolutionFilter2D(target, internalformat, x, y, width, height); CHECK_GL_ERROR } @@ -554,10 +483,9 @@ * Method: glGetConvolutionFilter * Signature: (IIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter (JNIEnv *env, jclass clazz, jint target, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glGetConvolutionFilter) void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetConvolutionFilter(target, format, type, address); CHECK_GL_ERROR @@ -568,10 +496,9 @@ * Method: glGetConvolutionParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterfv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glGetConvolutionParameterfv) GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetConvolutionParameterfv(target, pname, address); CHECK_GL_ERROR @@ -582,10 +509,9 @@ * Method: glGetConvolutionParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteriv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { - CHECK_EXISTS(glGetConvolutionParameteriv) GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetConvolutionParameteriv(target, pname, address); CHECK_GL_ERROR @@ -596,10 +522,9 @@ * Method: glSeparableFilter2D * Signature: (IIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jobject row, jint row_offset, jobject column, jint column_offset) { - CHECK_EXISTS(glSeparableFilter2D) const void *address = (const void *)(row_offset + (const GLbyte *)env->GetDirectBufferAddress(row)); const void *address2 = (const void *)(column_offset + (const GLbyte *)env->GetDirectBufferAddress(column)); glSeparableFilter2D(target, internalformat, width, height, format, type, address, address2); @@ -611,13 +536,57 @@ * Method: glGetSeparableFilter * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter (JNIEnv *env, jclass clazz, jint target, jint format, jint type, jobject row, jint row_offset, jobject column, jint column_offset, jobject span, jint span_offset) { - CHECK_EXISTS(glGetSeparableFilter) void *address = (void *)(row_offset + (GLbyte *)env->GetDirectBufferAddress(row)); void *address2 = (void *)(column_offset + (GLbyte *)env->GetDirectBufferAddress(column)); void *address3 = (void *)(span_offset + (GLbyte *)env->GetDirectBufferAddress(span)); glGetSeparableFilter(target, format, type, address, address2, address3); CHECK_GL_ERROR } + +void extgl_InitARBImaging(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction 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}, + {"nglColorTableParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv, "glColorTableParameterfv", (void**)&glColorTableParameterfv}, + {"glCopyColorSubTable", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable, "glCopyColorSubTable", (void**)&glCopyColorSubTable}, + {"glCopyColorTable", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable, "glCopyColorTable", (void**)&glCopyColorTable}, + {"nglGetColorTable", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable, "glGetColorTable", (void**)&glGetColorTable}, + {"nglGetColorTableParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv, "glGetColorTableParameteriv", (void**)&glGetColorTableParameteriv}, + {"nglGetColorTableParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv, "glGetColorTableParameterfv", (void**)&glGetColorTableParameterfv}, + {"glBlendEquation", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glBlendEquation, "glBlendEquation", (void**)&glBlendEquation}, + {"glBlendColor", "(FFFF)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glBlendColor, "glBlendColor", (void**)&glBlendColor}, + {"glHistogram", "(IIIZ)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glHistogram, "glHistogram", (void**)&glHistogram}, + {"glResetHistogram", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glResetHistogram, "glResetHistogram", (void**)&glResetHistogram}, + {"nglGetHistogram", "(IZIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram, "glGetHistogram", (void**)&glGetHistogram}, + {"nglGetHistogramParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv, "glGetHistogramParameterfv", (void**)&glGetHistogramParameterfv}, + {"nglGetHistogramParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv, "glGetHistogramParameteriv", (void**)&glGetHistogramParameteriv}, + {"glMinmax", "(IIZ)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glMinmax, "glMinmax", (void**)&glMinmax}, + {"glResetMinmax", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glResetMinmax, "glResetMinmax", (void**)&glResetMinmax}, + {"nglGetMinmax", "(IZIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax, "glGetMinmax", (void**)&glGetMinmax}, + {"nglGetMinmaxParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv, "glGetMinmaxParameterfv", (void**)&glGetMinmaxParameterfv}, + {"nglGetMinmaxParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv, "glGetMinmaxParameteriv", (void**)&glGetMinmaxParameteriv}, + {"nglConvolutionFilter1D", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D, "glConvolutionFilter1D", (void**)&glConvolutionFilter1D}, + {"nglConvolutionFilter2D", "(IIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D, "glConvolutionFilter2D", (void**)&glConvolutionFilter2D}, + {"glConvolutionParameterf", "(IIF)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf, "glConvolutionParameterf", (void**)&glConvolutionParameterf}, + {"nglConvolutionParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv, "glConvolutionParameterfv", (void**)&glConvolutionParameterfv}, + {"glConvolutionParameteri", "(III)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri, "glConvolutionParameteri", (void**)&glConvolutionParameteri}, + {"nglConvolutionParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv, "glConvolutionParameteriv", (void**)&glConvolutionParameteriv}, + {"glCopyConvolutionFilter1D", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D, "glCopyConvolutionFilter1D", (void**)&glCopyConvolutionFilter1D}, + {"glCopyConvolutionFilter2D", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D, "glCopyConvolutionFilter2D", (void**)&glCopyConvolutionFilter2D}, + {"nglGetConvolutionFilter", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter, "glGetConvolutionFilter", (void**)&glGetConvolutionFilter}, + {"nglGetConvolutionParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterfv, "glGetConvolutionParameterfv", (void**)&glGetConvolutionParameterfv}, + {"nglGetConvolutionParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteriv, "glGetConvolutionParameteriv", (void**)&glGetConvolutionParameteriv}, + {"nglSeparableFilter2D", "(IIIIIILjava/nio/Buffer;ILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D, "glSeparableFilter2D", (void**)&glSeparableFilter2D}, + {"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"); + 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.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBMatrixPalette.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBMatrixPalette.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBMatrixPalette // ---------------------------------- -#include "org_lwjgl_opengl_ARBMatrixPalette.h" #include "extgl.h" #include "checkGLerror.h" @@ -50,26 +49,13 @@ static glMatrixIndexuivARBPROC glMatrixIndexuivARB; static glMatrixIndexPointerARBPROC glMatrixIndexPointerARB; -void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_matrix_palette) - return; - glCurrentPaletteMatrixARB = (glCurrentPaletteMatrixARBPROC) extgl_GetProcAddress("glCurrentPaletteMatrixARB"); - glMatrixIndexubvARB = (glMatrixIndexubvARBPROC) extgl_GetProcAddress("glMatrixIndexubvARB"); - glMatrixIndexusvARB = (glMatrixIndexusvARBPROC) extgl_GetProcAddress("glMatrixIndexusvARB"); - glMatrixIndexuivARB = (glMatrixIndexuivARBPROC) extgl_GetProcAddress("glMatrixIndexuivARB"); - glMatrixIndexPointerARB = (glMatrixIndexPointerARBPROC) extgl_GetProcAddress("glMatrixIndexPointerARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_matrix_palette) -} - /* * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: glCurrentPaletteMatrixARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatrixARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatrixARB (JNIEnv * env, jclass clazz, jint index) { - CHECK_EXISTS(glCurrentPaletteMatrixARB) glCurrentPaletteMatrixARB(index); CHECK_GL_ERROR } @@ -78,10 +64,9 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexPointerARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARB (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jobject pPointer, jint pPointer_offset) { - CHECK_EXISTS(glMatrixIndexPointerARB) GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glMatrixIndexPointerARB(size, type, stride, pPointer_ptr); CHECK_GL_ERROR @@ -91,10 +76,9 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexPointerARBVBO */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBVBO (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { - CHECK_EXISTS(glMatrixIndexPointerARB) glMatrixIndexPointerARB(size, type, stride, (GLvoid *)buffer_offset); CHECK_GL_ERROR } @@ -103,10 +87,9 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexubvARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB (JNIEnv * env, jclass clazz, jint size, jobject pIndices, jint pIndices_offset) { - CHECK_EXISTS(glMatrixIndexubvARB) GLubyte *pIndices_ptr = (GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset; glMatrixIndexubvARB(size, pIndices_ptr); CHECK_GL_ERROR @@ -116,10 +99,9 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexuivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB (JNIEnv * env, jclass clazz, jint size, jobject piIndices, jint piIndices_offset) { - CHECK_EXISTS(glMatrixIndexuivARB) GLuint *piIndices_ptr = (GLuint *)env->GetDirectBufferAddress(piIndices) + piIndices_offset; glMatrixIndexuivARB(size, piIndices_ptr); CHECK_GL_ERROR @@ -129,11 +111,27 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexusvARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB (JNIEnv * env, jclass clazz, jint size, jobject psIndices, jint psIndices_offset) { - CHECK_EXISTS(glMatrixIndexusvARB) GLushort *psIndices_ptr = (GLushort *)env->GetDirectBufferAddress(psIndices) + psIndices_offset; glMatrixIndexusvARB(size, psIndices_ptr); CHECK_GL_ERROR } + +void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction 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}, + {"nglMatrixIndexubvARB", "(ILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB, "glMatrixIndexubvARB", (void**)&glMatrixIndexubvARB}, + {"nglMatrixIndexuivARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB, "glMatrixIndexuivARB", (void**)&glMatrixIndexuivARB}, + {"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"); + 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.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBMultisample.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBMultisample.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,30 +34,32 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBMultisample // ---------------------------------- -#include "org_lwjgl_opengl_ARBMultisample.h" #include "extgl.h" #include "checkGLerror.h" -typedef void (APIENTRY * glSampleCoverageARBPROC) (GLclampf value, GLboolean invert ); +typedef void (APIENTRY * glSampleCoverageARBPROC) (GLclampf value, GLboolean invert); static glSampleCoverageARBPROC glSampleCoverageARB; -void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_multisample) - return; - glSampleCoverageARB = (glSampleCoverageARBPROC) extgl_GetProcAddress("glSampleCoverageARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_multisample) -} - /* * Class: org.lwjgl.opengl.ARBMultisample * Method: glSampleCoverageARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB (JNIEnv * env, jclass clazz, jfloat value, jboolean invert) { - CHECK_EXISTS(glSampleCoverageARB) glSampleCoverageARB(value, invert); CHECK_GL_ERROR } + +void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction 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"); + 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.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBMultitexture.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBMultitexture.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBMultitexture // ---------------------------------- -#include "org_lwjgl_opengl_ARBMultitexture.h" #include "extgl.h" #include "checkGLerror.h" @@ -68,39 +67,13 @@ static glMultiTexCoord4iARBPROC glMultiTexCoord4iARB; static glMultiTexCoord4sARBPROC glMultiTexCoord4sARB; -void extgl_InitARBMultitexture(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_multitexture) - return; - glActiveTextureARB = (glActiveTextureARBPROC) extgl_GetProcAddress("glActiveTextureARB"); - glClientActiveTextureARB = (glClientActiveTextureARBPROC) extgl_GetProcAddress("glClientActiveTextureARB"); - - glMultiTexCoord1fARB = (glMultiTexCoord1fARBPROC) extgl_GetProcAddress("glMultiTexCoord1fARB"); - glMultiTexCoord1iARB = (glMultiTexCoord1iARBPROC) extgl_GetProcAddress("glMultiTexCoord1iARB"); - glMultiTexCoord1sARB = (glMultiTexCoord1sARBPROC) extgl_GetProcAddress("glMultiTexCoord1sARB"); - - glMultiTexCoord2fARB = (glMultiTexCoord2fARBPROC) extgl_GetProcAddress("glMultiTexCoord2fARB"); - glMultiTexCoord2iARB = (glMultiTexCoord2iARBPROC) extgl_GetProcAddress("glMultiTexCoord2iARB"); - glMultiTexCoord2sARB = (glMultiTexCoord2sARBPROC) extgl_GetProcAddress("glMultiTexCoord2sARB"); - - glMultiTexCoord3fARB = (glMultiTexCoord3fARBPROC) extgl_GetProcAddress("glMultiTexCoord3fARB"); - glMultiTexCoord3iARB = (glMultiTexCoord3iARBPROC) extgl_GetProcAddress("glMultiTexCoord3iARB"); - glMultiTexCoord3sARB = (glMultiTexCoord3sARBPROC) extgl_GetProcAddress("glMultiTexCoord3sARB"); - - glMultiTexCoord4fARB = (glMultiTexCoord4fARBPROC) extgl_GetProcAddress("glMultiTexCoord4fARB"); - glMultiTexCoord4iARB = (glMultiTexCoord4iARBPROC) extgl_GetProcAddress("glMultiTexCoord4iARB"); - glMultiTexCoord4sARB = (glMultiTexCoord4sARBPROC) extgl_GetProcAddress("glMultiTexCoord4sARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_multitexture) -} - /* * Class: org.lwjgl.opengl.ARBMultitexture * Method: glClientActiveTextureARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureARB (JNIEnv * env, jclass clazz, jint texture) { - CHECK_EXISTS(glClientActiveTextureARB) glClientActiveTextureARB(texture); CHECK_GL_ERROR } @@ -109,10 +82,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glActiveTextureARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB (JNIEnv * env, jclass clazz, jint texture) { - CHECK_EXISTS(glActiveTextureARB) glActiveTextureARB(texture); CHECK_GL_ERROR } @@ -121,10 +93,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1fARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB (JNIEnv * env, jclass clazz, jint target, jfloat s) { - CHECK_EXISTS(glMultiTexCoord1fARB) glMultiTexCoord1fARB(target, s); CHECK_GL_ERROR } @@ -133,10 +104,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1iARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB (JNIEnv * env, jclass clazz, jint target, jint s) { - CHECK_EXISTS(glMultiTexCoord1iARB) glMultiTexCoord1iARB(target, s); CHECK_GL_ERROR } @@ -145,10 +115,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1sARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB (JNIEnv * env, jclass clazz, jint target, jshort s) { - CHECK_EXISTS(glMultiTexCoord1sARB) glMultiTexCoord1sARB(target, s); CHECK_GL_ERROR } @@ -157,10 +126,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2fARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t) { - CHECK_EXISTS(glMultiTexCoord2fARB) glMultiTexCoord2fARB(target, s, t); CHECK_GL_ERROR } @@ -169,10 +137,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2iARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t) { - CHECK_EXISTS(glMultiTexCoord2iARB) glMultiTexCoord2iARB(target, s, t); CHECK_GL_ERROR } @@ -181,10 +148,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2sARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { - CHECK_EXISTS(glMultiTexCoord2sARB) glMultiTexCoord2sARB(target, s, t); CHECK_GL_ERROR } @@ -193,10 +159,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3fARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r) { - CHECK_EXISTS(glMultiTexCoord3fARB) glMultiTexCoord3fARB(target, s, t, r); CHECK_GL_ERROR } @@ -205,10 +170,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3iARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r) { - CHECK_EXISTS(glMultiTexCoord3iARB) glMultiTexCoord3iARB(target, s, t, r); CHECK_GL_ERROR } @@ -217,10 +181,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3sARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { - CHECK_EXISTS(glMultiTexCoord3sARB) glMultiTexCoord3sARB(target, s, t, r); CHECK_GL_ERROR } @@ -229,10 +192,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4fARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jfloat q) { - CHECK_EXISTS(glMultiTexCoord4fARB) glMultiTexCoord4fARB(target, s, t, r, q); CHECK_GL_ERROR } @@ -241,10 +203,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4iARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r, jint q) { - CHECK_EXISTS(glMultiTexCoord4iARB) glMultiTexCoord4iARB(target, s, t, r, q); CHECK_GL_ERROR } @@ -253,10 +214,34 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4sARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { - CHECK_EXISTS(glMultiTexCoord4sARB) glMultiTexCoord4sARB(target, s, t, r, q); CHECK_GL_ERROR } + +void extgl_InitARBMultitexture(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction 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}, + {"glMultiTexCoord1iARB", "(II)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB, "glMultiTexCoord1iARB", (void**)&glMultiTexCoord1iARB}, + {"glMultiTexCoord1sARB", "(IS)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB, "glMultiTexCoord1sARB", (void**)&glMultiTexCoord1sARB}, + {"glMultiTexCoord2fARB", "(IFF)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB, "glMultiTexCoord2fARB", (void**)&glMultiTexCoord2fARB}, + {"glMultiTexCoord2iARB", "(III)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB, "glMultiTexCoord2iARB", (void**)&glMultiTexCoord2iARB}, + {"glMultiTexCoord2sARB", "(ISS)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB, "glMultiTexCoord2sARB", (void**)&glMultiTexCoord2sARB}, + {"glMultiTexCoord3fARB", "(IFFF)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB, "glMultiTexCoord3fARB", (void**)&glMultiTexCoord3fARB}, + {"glMultiTexCoord3iARB", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB, "glMultiTexCoord3iARB", (void**)&glMultiTexCoord3iARB}, + {"glMultiTexCoord3sARB", "(ISSS)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB, "glMultiTexCoord3sARB", (void**)&glMultiTexCoord3sARB}, + {"glMultiTexCoord4fARB", "(IFFFF)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB, "glMultiTexCoord4fARB", (void**)&glMultiTexCoord4fARB}, + {"glMultiTexCoord4iARB", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB, "glMultiTexCoord4iARB", (void**)&glMultiTexCoord4iARB}, + {"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"); + 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.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBOcclusionQuery.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBOcclusionQuery.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBOcclusionQuery // ---------------------------------- -#include "org_lwjgl_opengl_ARBOcclusionQuery.h" #include "extgl.h" #include "checkGLerror.h" @@ -56,31 +55,13 @@ static glGetQueryObjectivARBPROC glGetQueryObjectivARB; static glGetQueryObjectuivARBPROC glGetQueryObjectuivARB; -void extgl_InitARBOcclusionQuery(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_occlusion_query) - return; - - glGenQueriesARB = (glGenQueriesARBPROC) extgl_GetProcAddress("glGenQueriesARB"); - glDeleteQueriesARB = (glDeleteQueriesARBPROC) extgl_GetProcAddress("glDeleteQueriesARB"); - glIsQueryARB = (glIsQueryARBPROC) extgl_GetProcAddress("glIsQueryARB"); - glBeginQueryARB = (glBeginQueryARBPROC) extgl_GetProcAddress("glBeginQueryARB"); - glEndQueryARB = (glEndQueryARBPROC) extgl_GetProcAddress("glEndQueryARB"); - glGetQueryivARB = (glGetQueryivARBPROC) extgl_GetProcAddress("glGetQueryivARB"); - glGetQueryObjectivARB = (glGetQueryObjectivARBPROC) extgl_GetProcAddress("glGetQueryObjectivARB"); - glGetQueryObjectuivARB = (glGetQueryObjectuivARBPROC) extgl_GetProcAddress("glGetQueryObjectuivARB"); - - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_occlusion_query) -} - /* * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGenQueriesARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB (JNIEnv * env, jclass clazz, jint n, jobject ids, jint idsOffset) { - CHECK_EXISTS(glGenQueriesARB) GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glGenQueriesARB(n, ids_ptr); CHECK_GL_ERROR @@ -90,10 +71,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglDeleteQueriesARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB (JNIEnv * env, jclass clazz, jint n, jobject ids, jint idsOffset) { - CHECK_EXISTS(glDeleteQueriesARB) GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glDeleteQueriesARB(n, ids_ptr); CHECK_GL_ERROR @@ -103,10 +83,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glIsQueryARB */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB +static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glIsQueryARB) GLboolean result = glIsQueryARB(id); CHECK_GL_ERROR return result; @@ -116,10 +95,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glBeginQueryARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB (JNIEnv * env, jclass clazz, jint target, jint id) { - CHECK_EXISTS(glBeginQueryARB) glBeginQueryARB(target, id); CHECK_GL_ERROR } @@ -128,10 +106,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glEndQueryARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB (JNIEnv * env, jclass clazz, jint target) { - CHECK_EXISTS(glEndQueryARB) glEndQueryARB(target); CHECK_GL_ERROR } @@ -140,10 +117,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB (JNIEnv * env, jclass clazz, jint target, jint pname, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetQueryivARB) GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryivARB(target, pname, params_ptr); CHECK_GL_ERROR @@ -153,10 +129,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryObjectivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivARB (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetQueryObjectivARB) GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectivARB(id, pname, params_ptr); CHECK_GL_ERROR @@ -166,11 +141,29 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryObjectuivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuivARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuivARB (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetQueryObjectuivARB) GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectuivARB(id, pname, params_ptr); CHECK_GL_ERROR } + +void extgl_InitARBOcclusionQuery(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction 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}, + {"glBeginQueryARB", "(II)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB, "glBeginQueryARB", (void**)&glBeginQueryARB}, + {"glEndQueryARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB, "glEndQueryARB", (void**)&glEndQueryARB}, + {"nglGetQueryivARB", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB, "glGetQueryivARB", (void**)&glGetQueryivARB}, + {"nglGetQueryObjectivARB", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivARB, "glGetQueryObjectivARB", (void**)&glGetQueryObjectivARB}, + {"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"); + 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.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBPointParameters.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBPointParameters.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBPointParameters // ---------------------------------- -#include "org_lwjgl_opengl_ARBPointParameters.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,23 +43,13 @@ static glPointParameterfARBPROC glPointParameterfARB; static glPointParameterfvARBPROC glPointParameterfvARB; -void extgl_InitARBPointParameters(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_point_parameters) - return; - glPointParameterfARB = (glPointParameterfARBPROC) extgl_GetProcAddress("glPointParameterfARB"); - glPointParameterfvARB = (glPointParameterfvARBPROC) extgl_GetProcAddress("glPointParameterfvARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_point_parameters) -} - /* * Class: org.lwjgl.opengl.ARBPointParameters * Method: glPointParameterfARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfARB (JNIEnv * env, jclass clazz, jint pname, jfloat param) { - CHECK_EXISTS(glPointParameterfARB) glPointParameterfARB(pname, param); CHECK_GL_ERROR } @@ -69,11 +58,23 @@ * Class: org.lwjgl.opengl.ARBPointParameters * Method: nglPointParameterfvARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfvARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfvARB (JNIEnv * env, jclass clazz, jint pname, jobject pfParams, jint pfParams_offset) { - CHECK_EXISTS(glPointParameterfvARB) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glPointParameterfvARB(pname, pfParams_ptr); CHECK_GL_ERROR } + +void extgl_InitARBPointParameters(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction 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"); + 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.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBProgram.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBProgram.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBProgram // ---------------------------------- -#include "org_lwjgl_opengl_ARBProgram.h" #include "extgl.h" #include "checkGLerror.h" @@ -67,34 +66,13 @@ static glGetProgramStringARBPROC glGetProgramStringARB; static glIsProgramARBPROC glIsProgramARB; -void extgl_InitARBProgram(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_fragment_program) - return; - glProgramStringARB = (glProgramStringARBPROC) extgl_GetProcAddress("glProgramStringARB"); - glBindProgramARB = (glBindProgramARBPROC) extgl_GetProcAddress("glBindProgramARB"); - glDeleteProgramsARB = (glDeleteProgramsARBPROC) extgl_GetProcAddress("glDeleteProgramsARB"); - glGenProgramsARB = (glGenProgramsARBPROC) extgl_GetProcAddress("glGenProgramsARB"); - glProgramEnvParameter4fARB = (glProgramEnvParameter4fARBPROC) extgl_GetProcAddress("glProgramEnvParameter4fARB"); - glProgramEnvParameter4fvARB = (glProgramEnvParameter4fvARBPROC) extgl_GetProcAddress("glProgramEnvParameter4fvARB"); - glProgramLocalParameter4fARB = (glProgramLocalP... [truncated message content] |
