From 269b5b0046785981b457dba7fe2fbe0905e8d583 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 2 Aug 2003 16:18:04 +0000 Subject: [PATCH] glTexGeni* fix --- src/java/org/lwjgl/opengl/CoreGL11.java | 4 ++-- src/native/common/org_lwjgl_opengl_CoreGL11.cpp | 6 +++--- src/native/common/org_lwjgl_opengl_CoreGL11.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/java/org/lwjgl/opengl/CoreGL11.java b/src/java/org/lwjgl/opengl/CoreGL11.java index b8b95ca7..10adb786 100644 --- a/src/java/org/lwjgl/opengl/CoreGL11.java +++ b/src/java/org/lwjgl/opengl/CoreGL11.java @@ -495,9 +495,9 @@ public class CoreGL11 implements CoreGL11Constants { private static native void nglTexGenfv(int coord, int pname, FloatBuffer params, int params_offset); public static native void glTexGeni(int coord, int pname, int param); public static void glTexGen(int coord, int pname, IntBuffer params) { - nglTexGenfi(coord, pname, params, params.position()); + nglTexGeniv(coord, pname, params, params.position()); } - private static native void nglTexGenfi(int coord, int pname, IntBuffer params, int params_offset); + private static native void nglTexGeniv(int coord, int pname, IntBuffer params, int params_offset); public static native void glTexEnvf(int target, int pname, float param); public static native void glTexEnvi(int target, int pname, int param); public static void glTexEnv(int target, int pname, FloatBuffer params) { diff --git a/src/native/common/org_lwjgl_opengl_CoreGL11.cpp b/src/native/common/org_lwjgl_opengl_CoreGL11.cpp index bd062a27..ed04824f 100644 --- a/src/native/common/org_lwjgl_opengl_CoreGL11.cpp +++ b/src/native/common/org_lwjgl_opengl_CoreGL11.cpp @@ -1953,7 +1953,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGenfv(JNIEnv * env, * Class: org_lwjgl_opengl_CoreGL11 * Method: glTexGeni */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGenf(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGeni(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glTexGeni((GLint) p0, (GLint) p1, (GLint) p2); CHECK_GL_ERROR @@ -1962,9 +1962,9 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGenf(JNIEnv * env, jc /* * Class: org_lwjgl_opengl_CoreGL11 - * Method: glTexGeniv + * Method: nglTexGeniv */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGeniv(JNIEnv * env, jclass clazz, jint p0, jint p1, jobject buffer, jint offset) +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGeniv(JNIEnv * env, jclass clazz, jint p0, jint p1, jobject buffer, jint offset) { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glTexGeniv((GLint) p0, (GLint) p1, address); diff --git a/src/native/common/org_lwjgl_opengl_CoreGL11.h b/src/native/common/org_lwjgl_opengl_CoreGL11.h index 245998e9..64f05b71 100644 --- a/src/native/common/org_lwjgl_opengl_CoreGL11.h +++ b/src/native/common/org_lwjgl_opengl_CoreGL11.h @@ -1473,10 +1473,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_glTexGeni /* * Class: org_lwjgl_opengl_CoreGL11 - * Method: nglTexGenfi + * Method: nglTexGeniv * Signature: (IILjava/nio/IntBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGenfi +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL11_nglTexGeniv (JNIEnv *, jclass, jint, jint, jobject, jint); /*