diff --git a/src/java/org/lwjgl/opengl/GL14.java b/src/java/org/lwjgl/opengl/GL14.java index 2e46d3b9..5626a1cb 100644 --- a/src/java/org/lwjgl/opengl/GL14.java +++ b/src/java/org/lwjgl/opengl/GL14.java @@ -86,6 +86,8 @@ public abstract class GL14 extends GL13 { public static final int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD; public static final int GL_GL_MIRRORED_REPEAT = 0x8370; + public static native void glBlendEquation(int mode); + public static native void glBlendColor(float red, float green, float blue, float alpha); public static native void glFogCoordf(float coord); public static void glFogCoordPointer(int stride, FloatBuffer data) { BufferChecks.ensureArrayVBOdisabled(); diff --git a/src/native/common/org_lwjgl_opengl_GL14.cpp b/src/native/common/org_lwjgl_opengl_GL14.cpp index d2ec58f5..a06803d6 100644 --- a/src/native/common/org_lwjgl_opengl_GL14.cpp +++ b/src/native/common/org_lwjgl_opengl_GL14.cpp @@ -43,8 +43,8 @@ #include "checkGLerror.h" #include "extgl.h" -typedef void (APIENTRY * glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ); -typedef void (APIENTRY * glBlendEquationPROC) (GLenum mode ); +typedef void (APIENTRY * glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +typedef void (APIENTRY * glBlendEquationPROC) (GLenum mode); typedef void (APIENTRY * glFogCoordfPROC) (GLfloat coord); typedef void (APIENTRY * glFogCoordfvPROC) (const GLfloat *coord); typedef void (APIENTRY * glFogCoorddPROC) (GLdouble coord); @@ -187,6 +187,22 @@ void extgl_InitOpenGL1_4(JNIEnv *env, jobject ext_set) EXTGL_SANITY_CHECK(env, ext_set, OpenGL14) } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendEquation + (JNIEnv *env, jclass clazz, jint mode) +{ + CHECK_EXISTS(glBlendEquation) + glBlendEquation(mode); + CHECK_GL_ERROR +} + + +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_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 +} + /* * Class: org_lwjgl_opengl_GL14 * Method: glFogCoordf diff --git a/src/native/common/org_lwjgl_opengl_GL14.h b/src/native/common/org_lwjgl_opengl_GL14.h index b787fc2a..31b268f2 100644 --- a/src/native/common/org_lwjgl_opengl_GL14.h +++ b/src/native/common/org_lwjgl_opengl_GL14.h @@ -7,7 +7,6 @@ #ifdef __cplusplus extern "C" { #endif -/* Inaccessible static: _00024assertionsDisabled */ #undef org_lwjgl_opengl_GL14_GL_ACCUM #define org_lwjgl_opengl_GL14_GL_ACCUM 256L #undef org_lwjgl_opengl_GL14_GL_LOAD @@ -1072,8 +1071,6 @@ extern "C" { #define org_lwjgl_opengl_GL14_GL_LOGIC_OP 3057L #undef org_lwjgl_opengl_GL14_GL_TEXTURE_COMPONENTS #define org_lwjgl_opengl_GL14_GL_TEXTURE_COMPONENTS 4099L -/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL11 */ -/* Inaccessible static: _00024assertionsDisabled */ #undef org_lwjgl_opengl_GL14_GL_RESCALE_NORMAL #define org_lwjgl_opengl_GL14_GL_RESCALE_NORMAL 32826L #undef org_lwjgl_opengl_GL14_GL_CLAMP_TO_EDGE @@ -1298,7 +1295,6 @@ extern "C" { #define org_lwjgl_opengl_GL14_GL_FUNC_REVERSE_SUBTRACT 32779L #undef org_lwjgl_opengl_GL14_GL_BLEND_COLOR #define org_lwjgl_opengl_GL14_GL_BLEND_COLOR 32773L -/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL12 */ #undef org_lwjgl_opengl_GL14_GL_TEXTURE0 #define org_lwjgl_opengl_GL14_GL_TEXTURE0 33984L #undef org_lwjgl_opengl_GL14_GL_TEXTURE1 @@ -1491,7 +1487,6 @@ extern "C" { #define org_lwjgl_opengl_GL14_GL_DOT3_RGBA 34479L #undef org_lwjgl_opengl_GL14_GL_CLAMP_TO_BORDER #define org_lwjgl_opengl_GL14_GL_CLAMP_TO_BORDER 33069L -/* Inaccessible static: _00024assertionsDisabled */ #undef org_lwjgl_opengl_GL14_GL_GENERATE_MIPMAP #define org_lwjgl_opengl_GL14_GL_GENERATE_MIPMAP 33169L #undef org_lwjgl_opengl_GL14_GL_GENERATE_MIPMAP_HINT @@ -1570,7 +1565,22 @@ extern "C" { #define org_lwjgl_opengl_GL14_GL_MAX_TEXTURE_LOD_BIAS 34045L #undef org_lwjgl_opengl_GL14_GL_GL_MIRRORED_REPEAT #define org_lwjgl_opengl_GL14_GL_GL_MIRRORED_REPEAT 33648L -/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL14 */ +/* + * Class: org_lwjgl_opengl_GL14 + * Method: glBlendEquation + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendEquation + (JNIEnv *, jclass, jint); + +/* + * Class: org_lwjgl_opengl_GL14 + * Method: glBlendColor + * Signature: (FFFF)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendColor + (JNIEnv *, jclass, jfloat, jfloat, jfloat, jfloat); + /* * Class: org_lwjgl_opengl_GL14 * Method: glFogCoordf