From 9830d907d28f2dd548dda1452e3d7381c7aaee38 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 31 Jan 2004 15:29:57 +0000 Subject: [PATCH] Fixed compile errors in NVFragmentProgram --- .../lwjgl/opengl/nv/NVFragmentProgram.java | 2 +- .../org_lwjgl_opengl_nv_NVFragmentProgram.h | 99 +++++++++---------- 2 files changed, 47 insertions(+), 54 deletions(-) diff --git a/src/java/org/lwjgl/opengl/nv/NVFragmentProgram.java b/src/java/org/lwjgl/opengl/nv/NVFragmentProgram.java index a4ebd37e..3fb9f048 100644 --- a/src/java/org/lwjgl/opengl/nv/NVFragmentProgram.java +++ b/src/java/org/lwjgl/opengl/nv/NVFragmentProgram.java @@ -92,7 +92,7 @@ public class NVFragmentProgram extends NVProgram { // --------------------------- public static void glGetProgramLocalParameterARB(int target, int index, FloatBuffer params) { assert params.remaining() >= 4: " must have 4 floats available."; - nglGetProgramLocalParameterfvNV(target, index, params, params.position()); + nglGetProgramLocalParameterfvARB(target, index, params, params.position()); } private static native void nglGetProgramLocalParameterfvARB(int target, int index, FloatBuffer params, int params_offset); diff --git a/src/native/common/nv/org_lwjgl_opengl_nv_NVFragmentProgram.h b/src/native/common/nv/org_lwjgl_opengl_nv_NVFragmentProgram.h index fc517746..2281250c 100644 --- a/src/native/common/nv/org_lwjgl_opengl_nv_NVFragmentProgram.h +++ b/src/native/common/nv/org_lwjgl_opengl_nv_NVFragmentProgram.h @@ -1,78 +1,71 @@ -/* -* 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.nv.NVFragmentProgram -// ---------------------------------- - +/* DO NOT EDIT THIS FILE - it is machine generated */ #include +/* Header for class org_lwjgl_opengl_nv_NVFragmentProgram */ #ifndef _Included_org_lwjgl_opengl_nv_NVFragmentProgram #define _Included_org_lwjgl_opengl_nv_NVFragmentProgram - #ifdef __cplusplus extern "C" { #endif - +/* Inaccessible static: _00024assertionsDisabled */ +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_TARGET_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_TARGET_NV 34374L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_LENGTH_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_LENGTH_NV 34343L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_RESIDENT_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_RESIDENT_NV 34375L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_STRING_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_STRING_NV 34344L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_ERROR_POSITION_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_ERROR_POSITION_NV 34379L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_ERROR_STRING_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_PROGRAM_ERROR_STRING_NV 34932L +/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024nv_00024NVProgram */ +/* Inaccessible static: _00024assertionsDisabled */ +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_FRAGMENT_PROGRAM_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_FRAGMENT_PROGRAM_NV 34928L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_MAX_TEXTURE_COORDS_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_MAX_TEXTURE_COORDS_NV 34929L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_MAX_TEXTURE_IMAGE_UNITS_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_MAX_TEXTURE_IMAGE_UNITS_NV 34930L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_FRAGMENT_PROGRAM_BINDING_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_FRAGMENT_PROGRAM_BINDING_NV 34931L +#undef org_lwjgl_opengl_nv_NVFragmentProgram_GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV +#define org_lwjgl_opengl_nv_NVFragmentProgram_GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 34920L +/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024nv_00024NVFragmentProgram */ /* - * Class: org.lwjgl.opengl.nv.NVFragmentProgram - * Method: nglProgramNamedParameter4fNV + * Class: org_lwjgl_opengl_nv_NVFragmentProgram + * Method: nglProgramNamedParameter4fNV + * Signature: (IILjava/nio/ByteBuffer;IFFFF)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_nv_NVFragmentProgram_nglProgramNamedParameter4fNV - (JNIEnv *, jclass, jint, jint, jobject, jint, jfloat, jfloat, jfloat, jfloat); + (JNIEnv *, jclass, jint, jint, jobject, jint, jfloat, jfloat, jfloat, jfloat); /* - * Class: org.lwjgl.opengl.nv.NVFragmentProgram - * Method: nglGetProgramNamedParameterfvNV + * Class: org_lwjgl_opengl_nv_NVFragmentProgram + * Method: nglGetProgramNamedParameterfvNV + * Signature: (IILjava/nio/ByteBuffer;ILjava/nio/FloatBuffer;I)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_nv_NVFragmentProgram_nglGetProgramNamedParameterfvNV - (JNIEnv *, jclass, jint, jint, jobject, jint, jobject, jint); + (JNIEnv *, jclass, jint, jint, jobject, jint, jobject, jint); /* - * Class: org.lwjgl.opengl.nv.NVFragmentProgram - * Method: glProgramLocalParameter4fNV + * Class: org_lwjgl_opengl_nv_NVFragmentProgram + * Method: glProgramLocalParameter4fARB + * Signature: (IIFFFF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_nv_NVFragmentProgram_glProgramLocalParameter4fNV - (JNIEnv *, jclass, jint, jint, jfloat, jfloat, jfloat, jfloat); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_nv_NVFragmentProgram_glProgramLocalParameter4fARB + (JNIEnv *, jclass, jint, jint, jfloat, jfloat, jfloat, jfloat); /* - * Class: org.lwjgl.opengl.nv.NVFragmentProgram - * Method: nglGetProgramLocalParameterfvNV + * Class: org_lwjgl_opengl_nv_NVFragmentProgram + * Method: nglGetProgramLocalParameterfvARB + * Signature: (IILjava/nio/FloatBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_nv_NVFragmentProgram_nglGetProgramLocalParameterfvNV - (JNIEnv *, jclass, jint, jint, jobject, jint); +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_nv_NVFragmentProgram_nglGetProgramLocalParameterfvARB + (JNIEnv *, jclass, jint, jint, jobject, jint); #ifdef __cplusplus } #endif - #endif