From ea80c5b67d0eeab32a58e3f733070c310f70d3de Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 31 Jan 2004 15:48:58 +0000 Subject: [PATCH] Fixed ARBOcclusionQuery --- ...org_lwjgl_opengl_arb_ARBOcclusionQuery.cpp | 2 +- .../org_lwjgl_opengl_arb_ARBOcclusionQuery.h | 107 +++++++----------- 2 files changed, 45 insertions(+), 64 deletions(-) diff --git a/src/native/common/arb/org_lwjgl_opengl_arb_ARBOcclusionQuery.cpp b/src/native/common/arb/org_lwjgl_opengl_arb_ARBOcclusionQuery.cpp index 9bd6fee8..a01906de 100644 --- a/src/native/common/arb/org_lwjgl_opengl_arb_ARBOcclusionQuery.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_arb_ARBOcclusionQuery.cpp @@ -153,7 +153,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_nglGetQueryiv * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery * Method: nglGetQueryObjectivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_nglGetQueryObjectiv +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_nglGetQueryObjectivARB (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { CHECK_EXISTS(glGetQueryObjectivARB) diff --git a/src/native/common/arb/org_lwjgl_opengl_arb_ARBOcclusionQuery.h b/src/native/common/arb/org_lwjgl_opengl_arb_ARBOcclusionQuery.h index 9f299d24..e5673e16 100644 --- a/src/native/common/arb/org_lwjgl_opengl_arb_ARBOcclusionQuery.h +++ b/src/native/common/arb/org_lwjgl_opengl_arb_ARBOcclusionQuery.h @@ -1,106 +1,87 @@ -/* -* Copyright (c) 2002 Lightweight Java Game Library Project -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are -* met: -* -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* -* * Neither the name of 'Light Weight Java Game Library' nor the names of -* its contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -// ---------------------------------- -// MACHINE GENERATED HEADER OF CLASS: org.lwjgl.opengl.arb.ARBOcclusionQuery -// ---------------------------------- - +/* DO NOT EDIT THIS FILE - it is machine generated */ #include +/* Header for class org_lwjgl_opengl_arb_ARBOcclusionQuery */ #ifndef _Included_org_lwjgl_opengl_arb_ARBOcclusionQuery #define _Included_org_lwjgl_opengl_arb_ARBOcclusionQuery - #ifdef __cplusplus extern "C" { #endif - +#undef org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_SAMPLES_PASSED_ARB +#define org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_SAMPLES_PASSED_ARB 35092L +#undef org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_QUERY_COUNTER_BITS_ARB +#define org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_QUERY_COUNTER_BITS_ARB 34916L +#undef org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_CURRENT_QUERY_ARB +#define org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_CURRENT_QUERY_ARB 34917L +#undef org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_QUERY_RESULT_ARB +#define org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_QUERY_RESULT_ARB 34918L +#undef org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_QUERY_RESULT_AVAILABLE_ARB +#define org_lwjgl_opengl_arb_ARBOcclusionQuery_GL_QUERY_RESULT_AVAILABLE_ARB 34919L /* - * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery - * Method: nglGenQueriesARB + * Class: org_lwjgl_opengl_arb_ARBOcclusionQuery + * Method: nglGenQueriesARB + * Signature: (ILjava/nio/IntBuffer;I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_nglGenQueriesARB - (JNIEnv *, jclass, jint, jobject, jint); + (JNIEnv *, jclass, jint, jobject, jint); /* - * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery - * Method: nglDeleteQueriesARB + * Class: org_lwjgl_opengl_arb_ARBOcclusionQuery + * Method: nglDeleteQueriesARB + * Signature: (ILjava/nio/IntBuffer;I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_nglDeleteQueriesARB - (JNIEnv *, jclass, jint, jobject, jint); + (JNIEnv *, jclass, jint, jobject, jint); /* - * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery - * Method: glIsQueryARB + * Class: org_lwjgl_opengl_arb_ARBOcclusionQuery + * Method: glIsQueryARB + * Signature: (I)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_glIsQueryARB - (JNIEnv *, jclass, jint); + (JNIEnv *, jclass, jint); /* - * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery - * Method: glBeginQueryARB + * Class: org_lwjgl_opengl_arb_ARBOcclusionQuery + * Method: glBeginQueryARB + * Signature: (II)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_glBeginQueryARB - (JNIEnv *, jclass, jint, jint); + (JNIEnv *, jclass, jint, jint); /* - * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery - * Method: glEndQueryARB + * Class: org_lwjgl_opengl_arb_ARBOcclusionQuery + * Method: glEndQueryARB + * Signature: (I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_glEndQueryARB - (JNIEnv *, jclass, jint); + (JNIEnv *, jclass, jint); /* - * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery - * Method: nglGetQueryivARB + * Class: org_lwjgl_opengl_arb_ARBOcclusionQuery + * Method: nglGetQueryivARB + * Signature: (IILjava/nio/IntBuffer;I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_nglGetQueryivARB - (JNIEnv *, jclass, jint, jint, jobject, jint); + (JNIEnv *, jclass, jint, jint, jobject, jint); /* - * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery - * Method: nglGetQueryObjectivARB + * Class: org_lwjgl_opengl_arb_ARBOcclusionQuery + * Method: nglGetQueryObjectivARB + * Signature: (IILjava/nio/IntBuffer;I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_nglGetQueryObjectivARB - (JNIEnv *, jclass, jint, jint, jobject, jint); + (JNIEnv *, jclass, jint, jint, jobject, jint); /* - * Class: org.lwjgl.opengl.arb.ARBOcclusionQuery - * Method: nglGetQueryObjectuivARB + * Class: org_lwjgl_opengl_arb_ARBOcclusionQuery + * Method: nglGetQueryObjectuivARB + * Signature: (IILjava/nio/IntBuffer;I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBOcclusionQuery_nglGetQueryObjectuivARB - (JNIEnv *, jclass, jint, jint, jobject, jint); + (JNIEnv *, jclass, jint, jint, jobject, jint); #ifdef __cplusplus } #endif - #endif