java-game-lib-cvs Mailing List for Lightweight Java Game Library

Brought to you by: kappa1, matzon, spasi

java-game-lib-cvs — Commits to the repository will be send to this list.

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (134)	Sep (52)	Oct (13)	Nov (342)	Dec (163)
2003	Jan (44)	Feb (62)	Mar (158)	Apr (38)	May (70)	Jun (58)	Jul (104)	Aug (207)	Sep (83)	Oct (122)	Nov (23)	Dec (49)
2004	Jan (119)	Feb (132)	Mar (192)	Apr (140)	May (77)	Jun (74)	Jul (201)	Aug (63)	Sep (102)	Oct (70)	Nov (173)	Dec (78)
2005	Jan (174)	Feb (197)	Mar (105)	Apr (59)	May (77)	Jun (43)	Jul (21)	Aug (18)	Sep (47)	Oct (37)	Nov (74)	Dec (50)
2006	Jan (44)	Feb (19)	Mar (32)	Apr (24)	May (31)	Jun (55)	Jul (138)	Aug (28)	Sep (12)	Oct (41)	Nov (58)	Dec (24)
2007	Jan (28)	Feb (14)	Mar (10)	Apr (68)	May (30)	Jun (26)	Jul (18)	Aug (63)	Sep (19)	Oct (29)	Nov (20)	Dec (10)
2008	Jan (38)	Feb (7)	Mar (37)	Apr (120)	May (41)	Jun (36)	Jul (39)	Aug (24)	Sep (28)	Oct (30)	Nov (36)	Dec (75)
2009	Jan (46)	Feb (22)	Mar (50)	Apr (70)	May (134)	Jun (105)	Jul (75)	Aug (34)	Sep (38)	Oct (34)	Nov (19)	Dec (20)
2010	Jan (11)	Feb (20)	Mar (65)	Apr (83)	May (104)	Jun (73)	Jul (78)	Aug (57)	Sep (43)	Oct (35)	Nov (9)	Dec (4)
2011	Jan (21)	Feb (11)	Mar (18)	Apr (10)	May (18)	Jun (15)	Jul (48)	Aug (25)	Sep (17)	Oct (45)	Nov (15)	Dec (12)
2012	Jan (21)	Feb (9)	Mar (12)	Apr (9)	May (9)	Jun (5)	Jul (1)	Aug (10)	Sep (12)	Oct (1)	Nov (28)	Dec (5)
2013	Jan (4)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb (1)	Mar (1)	Apr	May (2)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2016	Jan (2)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
1	2	3	4 (21)	5 (8)	6	7 (1)
8 (24)	9	10 (2)	11 (1)	12 (2)	13	14
15 (25)	16 (1)	17 (8)	18 (7)	19 (2)	20	21
22	23 (7)	24 (6)	25 (3)	26 (8)	27 (2)	28 (1)
29 (3)

Flat | Threaded

[Java-game-lib-cvs] LWJGL/src/java/org/lwjgl/opengl GLCaps.java,1.23,1.24

From: <eli...@us...> - 2004-02-17 22:14:42

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv870/src/java/org/lwjgl/opengl

Modified Files:
	GLCaps.java 
Log Message:
Split ARB_imaging into separate extension

Index: GLCaps.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLCaps.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- GLCaps.java	17 Feb 2004 22:03:18 -0000	1.23
+++ GLCaps.java	17 Feb 2004 22:05:36 -0000	1.24
@@ -57,7 +57,6 @@
 	public static boolean GL_ARB_depth_texture;
 	public static boolean GL_ARB_fragment_program;
 	public static boolean GL_ARB_fragment_shader;
-	public static boolean GL_ARB_imaging;
 	public static boolean GL_ARB_matrix_palette;
 	public static boolean GL_ARB_multisample;
 	public static boolean GL_ARB_multitexture;

[Java-game-lib-cvs] LWJGL/src/java/org/lwjgl/opengl GLCaps.java,1.22,1.23

From: <eli...@us...> - 2004-02-17 22:12:38

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv302/src/java/org/lwjgl/opengl

Modified Files:
	GLCaps.java 
Log Message:
Split ARB_imaging into separate extension

Index: GLCaps.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLCaps.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- GLCaps.java	15 Feb 2004 21:45:35 -0000	1.22
+++ GLCaps.java	17 Feb 2004 22:03:18 -0000	1.23
@@ -57,6 +57,7 @@
 	public static boolean GL_ARB_depth_texture;
 	public static boolean GL_ARB_fragment_program;
 	public static boolean GL_ARB_fragment_shader;
+	public static boolean GL_ARB_imaging;
 	public static boolean GL_ARB_matrix_palette;
 	public static boolean GL_ARB_multisample;
 	public static boolean GL_ARB_multitexture;

[Java-game-lib-cvs] LWJGL/src/native/common org_lwjgl_opengl_GL12.cpp,1.2,1.3

From: <eli...@us...> - 2004-02-17 22:08:44

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31575/src/native/common

Modified Files:
	org_lwjgl_opengl_GL12.cpp 
Log Message:
Split ARB_imaging into separate extension

Index: org_lwjgl_opengl_GL12.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL12.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_GL12.cpp	29 Jan 2004 22:07:03 -0000	1.2
+++ org_lwjgl_opengl_GL12.cpp	17 Feb 2004 21:59:08 -0000	1.3
@@ -43,40 +43,6 @@
 #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 * glColorTablePROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table );
-typedef void (APIENTRY * glColorTableParameterfvPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * glColorTableParameterivPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * glCopyColorTablePROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
-typedef void (APIENTRY * glGetColorTablePROC) (GLenum target, GLenum format, GLenum type, GLvoid *table );
-typedef void (APIENTRY * glGetColorTableParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
-typedef void (APIENTRY * glGetColorTableParameterivPROC) (GLenum target, GLenum pname, GLint *params );
-typedef void (APIENTRY * glColorSubTablePROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data );
-typedef void (APIENTRY * glCopyColorSubTablePROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width );
-typedef void (APIENTRY * glConvolutionFilter1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image );
-typedef void (APIENTRY * glConvolutionFilter2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image );
-typedef void (APIENTRY * glConvolutionParameterfPROC) (GLenum target, GLenum pname, GLfloat params );
-typedef void (APIENTRY * glConvolutionParameterfvPROC) (GLenum target, GLenum pname, const GLfloat *params );
-typedef void (APIENTRY * glConvolutionParameteriPROC) (GLenum target, GLenum pname, GLint params );
-typedef void (APIENTRY * glConvolutionParameterivPROC) (GLenum target, GLenum pname, const GLint *params );
-typedef void (APIENTRY * glCopyConvolutionFilter1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
-typedef void (APIENTRY * glCopyConvolutionFilter2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRY * glGetConvolutionFilterPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image );
-typedef void (APIENTRY * glGetConvolutionParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
-typedef void (APIENTRY * glGetConvolutionParameterivPROC) (GLenum target, GLenum pname, GLint *params );
-typedef void (APIENTRY * glSeparableFilter2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column );
-typedef void (APIENTRY * glGetHistogramPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values );
-typedef void (APIENTRY * glGetHistogramParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
-typedef void (APIENTRY * glGetHistogramParameterivPROC) (GLenum target, GLenum pname, GLint *params );
-typedef void (APIENTRY * glGetMinmaxPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values );
-typedef void (APIENTRY * glGetMinmaxParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
-typedef void (APIENTRY * glGetMinmaxParameterivPROC) (GLenum target, GLenum pname, GLint *params );
-typedef void (APIENTRY * glHistogramPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink );
-typedef void (APIENTRY * glResetHistogramPROC) (GLenum target );
-typedef void (APIENTRY * glMinmaxPROC) (GLenum target, GLenum internalformat, GLboolean sink );
-typedef void (APIENTRY * glResetMinmaxPROC) (GLenum target );
-typedef void (APIENTRY * glGetSeparableFilterPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
 typedef void (APIENTRY * glDrawRangeElementsPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
 typedef void (APIENTRY * glTexImage3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
 typedef void (APIENTRY * glTexSubImage3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
@@ -87,41 +53,6 @@
 static glTexSubImage3DPROC glTexSubImage3D;
 static glCopyTexSubImage3DPROC glCopyTexSubImage3D;
 
-static glBlendColorPROC glBlendColor;
-static glBlendEquationPROC glBlendEquation;
-static glColorTablePROC glColorTable;
-static glColorTableParameterfvPROC glColorTableParameterfv;
-static glColorTableParameterivPROC glColorTableParameteriv;
-static glCopyColorTablePROC glCopyColorTable;
-static glGetColorTablePROC glGetColorTable;
-static glGetColorTableParameterfvPROC glGetColorTableParameterfv;
-static glGetColorTableParameterivPROC glGetColorTableParameteriv;
-static glColorSubTablePROC glColorSubTable;
-static glCopyColorSubTablePROC glCopyColorSubTable;
-static glConvolutionFilter1DPROC glConvolutionFilter1D;
-static glConvolutionFilter2DPROC glConvolutionFilter2D;
-static glConvolutionParameterfPROC glConvolutionParameterf;
-static glConvolutionParameterfvPROC glConvolutionParameterfv;
-static glConvolutionParameteriPROC glConvolutionParameteri;
-static glConvolutionParameterivPROC glConvolutionParameteriv;
-static glCopyConvolutionFilter1DPROC glCopyConvolutionFilter1D;
-static glCopyConvolutionFilter2DPROC glCopyConvolutionFilter2D;
-static glGetConvolutionFilterPROC glGetConvolutionFilter;
-static glGetConvolutionParameterfvPROC glGetConvolutionParameterfv;
-static glGetConvolutionParameterivPROC glGetConvolutionParameteriv;
-static glGetSeparableFilterPROC glGetSeparableFilter;
-static glSeparableFilter2DPROC glSeparableFilter2D;
-static glGetHistogramPROC glGetHistogram;
-static glGetHistogramParameterfvPROC glGetHistogramParameterfv;
-static glGetHistogramParameterivPROC glGetHistogramParameteriv;
-static glGetMinmaxPROC glGetMinmax;
-static glGetMinmaxParameterfvPROC glGetMinmaxParameterfv;
-static glGetMinmaxParameterivPROC glGetMinmaxParameteriv;
-static glHistogramPROC glHistogram;
-static glMinmaxPROC glMinmax;
-static glResetHistogramPROC glResetHistogram;
-static glResetMinmaxPROC glResetMinmax;
-
 void extgl_InitOpenGL1_2(JNIEnv *env, jobject ext_set)
 {
 	if (!extgl_Extensions.OpenGL12)
@@ -133,516 +64,6 @@
 	EXTGL_SANITY_CHECK(env, ext_set, OpenGL12)
 }
 
-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_GL12
- * Method:    glColorTable
- * Signature: (IIIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glColorSubTable
- * Signature: (IIIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetColorTable
- * Signature: (IIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetColorTableParameteriv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetColorTableParameterfv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glColorTableParameteriv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glColorTableParameterfv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glCopyColorSubTable
- * Signature: (IIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glCopyColorTable
- * Signature: (IIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glBlendEquation
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glBlendEquation
-  (JNIEnv *env, jclass clazz, jint mode)
-{
-	CHECK_EXISTS(glBlendEquation)
-	glBlendEquation(mode);
-	CHECK_GL_ERROR
-}
-
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glBlendColor
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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_GL12
- * Method:    glHistogram
- * Signature: (IIIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glHistogram
-  (JNIEnv *env, jclass clazz, jint target, jint width, jint internalformat, jboolean sink)
-{
-	CHECK_EXISTS(glHistogram)
-	glHistogram(target, width, internalformat, sink);
-	CHECK_GL_ERROR
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glResetHistogram
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glResetHistogram
-  (JNIEnv *env, jclass clazz, jint target)
-{
-	CHECK_EXISTS(glResetHistogram)
-	glResetHistogram(target);
-	CHECK_GL_ERROR
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetHistogram
- * Signature: (IZIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetHistogramParameterfv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetHistogramParameteriv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glMinmax
- * Signature: (IIZ)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glMinmax
-  (JNIEnv *env, jclass clazz, jint target, jint internalformat, jboolean sink)
-{
-	CHECK_EXISTS(glMinmax)
-	glMinmax(target, internalformat, sink);
-	CHECK_GL_ERROR
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glResetMinmax
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glResetMinmax
-  (JNIEnv *env, jclass clazz, jint target)
-{
-	CHECK_EXISTS(glResetMinmax)
-	glResetMinmax(target);
-	CHECK_GL_ERROR
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetMinmax
- * Signature: (IZIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetMinmaxParameterfv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetMinmaxParameteriv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glConvolutionFilter1D
- * Signature: (IIIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glConvolutionFilter2D
- * Signature: (IIIIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glConvolutionParameterf
- * Signature: (IIF)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glConvolutionParameterf
-  (JNIEnv *env, jclass clazz, jint target, jint pname, jfloat params)
-{
-	CHECK_EXISTS(glConvolutionParameterf)
-	glConvolutionParameterf(target, pname, params);
-	CHECK_GL_ERROR
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glConvolutionParameterfv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glConvolutionParameteri
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glConvolutionParameteri
-  (JNIEnv *env, jclass clazz, jint target, jint pname, jint params)
-{
-	CHECK_EXISTS(glConvolutionParameteri)
-	glConvolutionParameteri(target, pname, params);
-	CHECK_GL_ERROR
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glConvolutionParameteriv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glCopyConvolutionFilter1D
- * Signature: (IIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glCopyConvolutionFilter2D
- * Signature: (IIIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetConvolutionFilter
- * Signature: (IIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetConvolutionParameterfv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetConvolutionParameteriv
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glSeparableFilter2D
- * Signature: (IIIIIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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);
-	CHECK_GL_ERROR
-}
-
-/*
- * Class:     org_lwjgl_opengl_GL12
- * Method:    glGetSeparableFilter
- * Signature: (IIIIII)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_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
-}
-
 /*
  * Class:     org_lwjgl_opengl_GL12
  * Method:    nglDrawRangeElements

[Java-game-lib-cvs] LWJGL/src/java/org/lwjgl/opengl ARBImaging.java,NONE,1.1 GL12.java,1.5,1.6

From: <eli...@us...> - 2004-02-17 22:08:44

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31575/src/java/org/lwjgl/opengl

Modified Files:
	GL12.java 
Added Files:
	ARBImaging.java 
Log Message:
Split ARB_imaging into separate extension

--- NEW FILE: ARBImaging.java ---
/* 
 * 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.
 */

package org.lwjgl.opengl;

import java.nio.Buffer;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.nio.ShortBuffer;

/**
 * $Id: ARBImaging.java,v 1.1 2004/02/17 21:59:07 elias_naur Exp $
 *
 * The GL12 imaging subset extension.
 * 
 * @author cix_foo <ci...@us...>
 * @version $Revision: 1.1 $
 */

public abstract class ARBImaging {
	public static final int GL_CONSTANT_COLOR                 = 0x8001;
	public static final int GL_ONE_MINUS_CONSTANT_COLOR       = 0x8002;
	public static final int GL_CONSTANT_ALPHA                 = 0x8003;
	public static final int GL_ONE_MINUS_CONSTANT_ALPHA       = 0x8004;
	public static final int GL_BLEND_COLOR                    = 0x8005;
	public static final int GL_FUNC_ADD                       = 0x8006;
	public static final int GL_MIN                            = 0x8007;
	public static final int GL_MAX                            = 0x8008;
	public static final int GL_BLEND_EQUATION                 = 0x8009;
	public static final int GL_FUNC_SUBTRACT                  = 0x800A;
	public static final int GL_FUNC_REVERSE_SUBTRACT          = 0x800B;
	public static final int GL_COLOR_MATRIX                   = 0x80B1;
	public static final int GL_COLOR_MATRIX_STACK_DEPTH       = 0x80B2;
	public static final int GL_MAX_COLOR_MATRIX_STACK_DEPTH   = 0x80B3;
	public static final int GL_POST_COLOR_MATRIX_RED_SCALE    = 0x80B4;
	public static final int GL_POST_COLOR_MATRIX_GREEN_SCALE  = 0x80B5;
	public static final int GL_POST_COLOR_MATRIX_BLUE_SCALE   = 0x80B6;
	public static final int GL_POST_COLOR_MATRIX_ALPHA_SCALE  = 0x80B7;
	public static final int GL_POST_COLOR_MATRIX_RED_BIAS     = 0x80B8;
	public static final int GL_POST_COLOR_MATRIX_GREEN_BIAS   = 0x80B9;
	public static final int GL_POST_COLOR_MATRIX_BLUE_BIAS    = 0x80BA;
	public static final int GL_POST_COLOR_MATRIX_ALPHA_BIAS   = 0x80BB;
	public static final int GL_COLOR_TABLE                    = 0x80D0;
	public static final int GL_POST_CONVOLUTION_COLOR_TABLE   = 0x80D1;
	public static final int GL_POST_COLOR_MATRIX_COLOR_TABLE  = 0x80D2;
	public static final int GL_PROXY_COLOR_TABLE              = 0x80D3;
	public static final int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4;
	public static final int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5;
	public static final int GL_COLOR_TABLE_SCALE              = 0x80D6;
	public static final int GL_COLOR_TABLE_BIAS               = 0x80D7;
	public static final int GL_COLOR_TABLE_FORMAT             = 0x80D8;
	public static final int GL_COLOR_TABLE_WIDTH              = 0x80D9;
	public static final int GL_COLOR_TABLE_RED_SIZE           = 0x80DA;
	public static final int GL_COLOR_TABLE_GREEN_SIZE         = 0x80DB;
	public static final int GL_COLOR_TABLE_BLUE_SIZE          = 0x80DC;
	public static final int GL_COLOR_TABLE_ALPHA_SIZE         = 0x80DD;
	public static final int GL_COLOR_TABLE_LUMINANCE_SIZE     = 0x80DE;
	public static final int GL_COLOR_TABLE_INTENSITY_SIZE     = 0x80DF;
	public static final int GL_CONVOLUTION_1D                 = 0x8010;
	public static final int GL_CONVOLUTION_2D                 = 0x8011;
	public static final int GL_SEPARABLE_2D                   = 0x8012;
	public static final int GL_CONVOLUTION_BORDER_MODE        = 0x8013;
	public static final int GL_CONVOLUTION_FILTER_SCALE       = 0x8014;
	public static final int GL_CONVOLUTION_FILTER_BIAS        = 0x8015;
	public static final int GL_REDUCE                         = 0x8016;
	public static final int GL_CONVOLUTION_FORMAT             = 0x8017;
	public static final int GL_CONVOLUTION_WIDTH              = 0x8018;
	public static final int GL_CONVOLUTION_HEIGHT             = 0x8019;
	public static final int GL_MAX_CONVOLUTION_WIDTH          = 0x801A;
	public static final int GL_MAX_CONVOLUTION_HEIGHT         = 0x801B;
	public static final int GL_POST_CONVOLUTION_RED_SCALE     = 0x801C;
	public static final int GL_POST_CONVOLUTION_GREEN_SCALE   = 0x801D;
	public static final int GL_POST_CONVOLUTION_BLUE_SCALE    = 0x801E;
	public static final int GL_POST_CONVOLUTION_ALPHA_SCALE   = 0x801F;
	public static final int GL_POST_CONVOLUTION_RED_BIAS      = 0x8020;
	public static final int GL_POST_CONVOLUTION_GREEN_BIAS    = 0x8021;
	public static final int GL_POST_CONVOLUTION_BLUE_BIAS     = 0x8022;
	public static final int GL_POST_CONVOLUTION_ALPHA_BIAS    = 0x8023;
	public static final int GL_IGNORE_BORDER                  = 0x8150;
	public static final int GL_CONSTANT_BORDER                = 0x8151;
	public static final int GL_REPLICATE_BORDER               = 0x8153;
	public static final int GL_CONVOLUTION_BORDER_COLOR       = 0x8154;
	public static final int GL_HISTOGRAM                      = 0x8024;
	public static final int GL_PROXY_HISTOGRAM                = 0x8025;
	public static final int GL_HISTOGRAM_WIDTH                = 0x8026;
	public static final int GL_HISTOGRAM_FORMAT               = 0x8027;
	public static final int GL_HISTOGRAM_RED_SIZE             = 0x8028;
	public static final int GL_HISTOGRAM_GREEN_SIZE           = 0x8029;
	public static final int GL_HISTOGRAM_BLUE_SIZE            = 0x802A;
	public static final int GL_HISTOGRAM_ALPHA_SIZE           = 0x802B;
	public static final int GL_HISTOGRAM_LUMINANCE_SIZE       = 0x802C;
	public static final int GL_HISTOGRAM_SINK                 = 0x802D;
	public static final int GL_MINMAX                         = 0x802E;
	public static final int GL_MINMAX_FORMAT                  = 0x802F;
	public static final int GL_MINMAX_SINK                    = 0x8030;

	public static void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) {
		// TODO: check buffer size valid
		nglColorTable(target, internalFormat, width, format, type, data, data.position());
	}
	public static void glColorTable(int target, int internalFormat, int width, int format, int type, FloatBuffer data) {
		// TODO: check buffer size valid
		nglColorTable(target, internalFormat, width, format, type, data, data.position() << 2);
	}
	private static native void nglColorTable(int target, int internalFormat, int width, int format, int type, Buffer data, int data_offset);
	public static void glColorSubTable(int target, int start, int count, int format, int type, ByteBuffer data) {
		// TODO: check buffer size valid
		nglColorSubTable(target, start, count, format, type, data, data.position());
	}
	public static void glColorSubTable(int target, int start, int count, int format, int type, FloatBuffer data) {
		// TODO: check buffer size valid
		nglColorSubTable(target, start, count, format, type, data, data.position() << 2);
	}
	private static native void nglColorSubTable(int target, int start, int count, int format, int type, Buffer data, int data_offset);
	public static void glColorTableParameter(int target, int pname, IntBuffer params) {
		// TODO: check buffer size valid
		nglColorTableParameteriv(target, pname, params, params.position());
	}
	private static native void nglColorTableParameteriv(int target, int pname, IntBuffer params, int data_offset);
	public static void glColorTableParameter(int target, int pname, FloatBuffer params) {
		// TODO: check buffer size valid
		nglColorTableParameterfv(target, pname, params, params.position());		
	}
	private static native void nglColorTableParameterfv(int target, int pname, FloatBuffer params, int data_offset);
	public static native void glCopyColorSubTable(int target, int start, int x, int y, int width);
	public static native void glCopyColorTable(int target, int internalformat, int x, int y, int width);
	public static void glGetColorTable(int target, int format, int type, ByteBuffer data) {
		// TODO: check buffer size valid
		nglGetColorTable(target, format, type, data, data.position());
	}
	public static void glGetColorTable(int target, int format, int type, FloatBuffer data) {
		// TODO: check buffer size valid
		nglGetColorTable(target, format, type, data, data.position());
	}
	private static native void nglGetColorTable(int target, int format, int type, Buffer data, int data_offset);
	public static void glGetColorTableParameter(int target, int pname, IntBuffer params) {
		// TODO: check buffer size valid
		nglGetColorTableParameteriv(target, pname, params, params.position());
	}
	private static native void nglGetColorTableParameteriv(int target, int pname, IntBuffer params, int params_offset);
	public static void glGetColorTableParameter(int target, int pname, FloatBuffer params) {
		// TODO: check buffer size valid
		nglGetColorTableParameterfv(target, pname, params, params.position());
	}
	private static native void nglGetColorTableParameterfv(int target, int pname, FloatBuffer params, int params_offset);
	public static native void glBlendEquation(int mode);
	public static native void glBlendColor(float red, float green, float blue, float alpha);
	public static native void glHistogram(int target, int width, int internalformat, boolean sink);
	public static native void glResetHistogram(int target);
	public static void glGetHistogram(int target, boolean reset, int format, int type, ByteBuffer values) {
		// TODO: check buffer size valid
		nglGetHistogram(target, reset, format, type, values, values.position());
	}
	public static void glGetHistogram(int target, boolean reset, int format, int type, ShortBuffer values) {
		// TODO: check buffer size valid
		nglGetHistogram(target, reset, format, type, values, values.position() << 1);
	}
	public static void glGetHistogram(int target, boolean reset, int format, int type, IntBuffer values) {
		// TODO: check buffer size valid
		nglGetHistogram(target, reset, format, type, values, values.position() << 2);
	}
	public static void glGetHistogram(int target, boolean reset, int format, int type, FloatBuffer values) {
		// TODO: check buffer size valid
		nglGetHistogram(target, reset, format, type, values, values.position() << 2);
	}
	private static native void nglGetHistogram(int target, boolean reset, int format, int type, Buffer values, int values_offset);
	public static void glGetHistogramParameter(int target, int pname, FloatBuffer params) {
		BufferChecks.checkBuffer(params);
		nglGetHistogramParameterfv(target, pname, params, params.position());
	}
	private static native void nglGetHistogramParameterfv(int target, int pname, FloatBuffer params, int params_offset);
	public static void glGetHistogramParameter(int target, int pname, IntBuffer params) {
		BufferChecks.checkBuffer(params);
		nglGetHistogramParameteriv(target, pname, params, params.position());
	}
	private static native void nglGetHistogramParameteriv(int target, int pname, IntBuffer params, int params_offset);
	public static native void glMinmax(int target, int internalformat, boolean sink);
	public static native void glResetMinmax(int target);
	public static void glGetMinmax(int target, boolean reset, int format, int types, ByteBuffer values) {
		BufferChecks.checkBuffer(values);
		nglGetMinmax(target, reset, format, types, values, values.position());
	}
	public static void glGetMinmax(int target, boolean reset, int format, int types, ShortBuffer values) {
		BufferChecks.checkBuffer(values);
		nglGetMinmax(target, reset, format, types, values, values.position() << 1);
	}
	public static void glGetMinmax(int target, boolean reset, int format, int types, IntBuffer values) {
		BufferChecks.checkBuffer(values);
		nglGetMinmax(target, reset, format, types, values, values.position() << 2);
	}
	public static void glGetMinmax(int target, boolean reset, int format, int types, FloatBuffer values) {
		BufferChecks.checkBuffer(values);
		nglGetMinmax(target, reset, format, types, values, values.position() << 2);
	}
	private static native void nglGetMinmax(int target, boolean reset, int format, int types, Buffer values, int values_offset);
	public static void glGetMinmaxParameter(int target, int pname, FloatBuffer params) {
		BufferChecks.checkBuffer(params);
		nglGetMinmaxParameterfv(target, pname, params, params.position());
	}
	private static native void nglGetMinmaxParameterfv(int target, int pname, FloatBuffer params, int params_offset);
	public static void glGetMinmaxParameter(int target, int pname, IntBuffer params) {
		BufferChecks.checkBuffer(params);
		nglGetMinmaxParameteriv(target, pname, params, params.position());
	}
	private static native void nglGetMinmaxParameteriv(int target, int pname, IntBuffer params, int params_offset);
	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image) {
		// TODO: check buffer size valid
		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position());
	}
	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image) {
		// TODO: check buffer size valid
		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position());
	}
	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, IntBuffer image) {
		// TODO: check buffer size valid
		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position());
	}
	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, FloatBuffer image) {
		// TODO: check buffer size valid
		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position());
	}
	private static native void nglConvolutionFilter1D(int target, int internalformat, int width, int format, int type, Buffer image, int image_offset);
	public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image) {
	}
	private static native void nglConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image, int image_offset);
	public static native void glConvolutionParameterf(int target, int pname, float params);
	public static void glConvolutionParameter(int target, int pname, FloatBuffer params) {
		BufferChecks.checkBuffer(params);
		nglConvolutionParameterfv(target, pname, params, params.position());
	}
	private static native void nglConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_offset);
	public static native void glConvolutionParameteri(int target, int pname, int params);
	public static void glConvolutionParameteriv(int target, int pname, IntBuffer params) {
		BufferChecks.checkBuffer(params);
		nglConvolutionParameteriv(target, pname, params, params.position());
	}
	private static native void nglConvolutionParameteriv(int target, int pname, IntBuffer params, int params_offset);
	public static native void glCopyConvolutionFilter1D(int target, int internalformat, int x, int y, int width);
	public static native void glCopyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height);
	public static void glGetConvolutionFilter(int target, int format, int type, ByteBuffer image) {
		// TODO: check buffer size valid
		nglGetConvolutionFilter(target, format, type, image, image.position());
	}
	public static void glGetConvolutionFilter(int target, int format, int type, ShortBuffer image) {
		// TODO: check buffer size valid
		nglGetConvolutionFilter(target, format, type, image, image.position() << 1);
	}
	public static void glGetConvolutionFilter(int target, int format, int type, IntBuffer image) {
		// TODO: check buffer size valid
		nglGetConvolutionFilter(target, format, type, image, image.position() << 2);
	}
	public static void glGetConvolutionFilter(int target, int format, int type, FloatBuffer image) {
		// TODO: check buffer size valid
		nglGetConvolutionFilter(target, format, type, image, image.position() << 2);
	}
	private static native void nglGetConvolutionFilter(int target, int format, int type, Buffer image, int image_offset);
	public static void glGetConvolutionParameter(int target, int pname, FloatBuffer params) {
		// TODO: check buffer size valid
		nglGetConvolutionParameterfv(target, pname, params, params.position());
	}
	private static native void nglGetConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_offset);
	public static void glGetConvolutionParameter(int target, int pname, IntBuffer params) {
		// TODO: check buffer size valid
		nglGetConvolutionParameteriv(target, pname, params, params.position());
	}
	private static native void nglGetConvolutionParameteriv(int target, int pname, IntBuffer params, int params_offset);
	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, Buffer column) {
		// TODO: check buffer size valid
		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, Util.getOffset(row), column, Util.getOffset(column));
	}
	private static native void nglSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, int row_offset, Buffer column, int column_offset);
	public static void glGetSeparableFilter(int target, int format, int type, Buffer row, Buffer column, Buffer span) {
		// TODO: check buffer size valid
		nglGetSeparableFilter(target, format, type, row, Util.getOffset(row), column, Util.getOffset(column), span, Util.getOffset(span));
	}
	private static native void nglGetSeparableFilter(int target, int format, int type, Buffer row, int row_offset, Buffer column, int column_offset, Buffer span, int span_offset);
}


Index: GL12.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL12.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GL12.java	16 Feb 2004 03:35:45 -0000	1.5
+++ GL12.java	17 Feb 2004 21:59:08 -0000	1.6
@@ -49,10 +49,15 @@
  */
 
 public abstract class GL12 extends GL11 {
-	public static final int GL_RESCALE_NORMAL                 = 0x803A;
-	public static final int GL_CLAMP_TO_EDGE                  = 0x812F;
-	public static final int GL_MAX_ELEMENTS_VERTICES          = 0x80E8;
-	public static final int GL_MAX_ELEMENTS_INDICES           = 0x80E9;
+	public static final int GL_PACK_SKIP_IMAGES               = 0x806B;
+	public static final int GL_PACK_IMAGE_HEIGHT              = 0x806C;
+	public static final int GL_UNPACK_SKIP_IMAGES             = 0x806D;
+	public static final int GL_UNPACK_IMAGE_HEIGHT            = 0x806E;
+	public static final int GL_TEXTURE_3D                     = 0x806F;
+	public static final int GL_PROXY_TEXTURE_3D               = 0x8070;
+	public static final int GL_TEXTURE_DEPTH                  = 0x8071;
+	public static final int GL_TEXTURE_WRAP_R                 = 0x8072;
+	public static final int GL_MAX_3D_TEXTURE_SIZE            = 0x8073;
 	public static final int GL_BGR                            = 0x80E0;
 	public static final int GL_BGRA                           = 0x80E1;
 	public static final int GL_UNSIGNED_BYTE_3_3_2            = 0x8032;
@@ -67,281 +72,20 @@
 	public static final int GL_UNSIGNED_INT_8_8_8_8_REV       = 0x8367;
 	public static final int GL_UNSIGNED_INT_10_10_10_2        = 0x8036;
 	public static final int GL_UNSIGNED_INT_2_10_10_10_REV    = 0x8368;
+	public static final int GL_RESCALE_NORMAL                 = 0x803A;
 	public static final int GL_LIGHT_MODEL_COLOR_CONTROL      = 0x81F8;
 	public static final int GL_SINGLE_COLOR                   = 0x81F9;
 	public static final int GL_SEPARATE_SPECULAR_COLOR        = 0x81FA;
+	public static final int GL_CLAMP_TO_EDGE                  = 0x812F;
 	public static final int GL_TEXTURE_MIN_LOD                = 0x813A;
 	public static final int GL_TEXTURE_MAX_LOD                = 0x813B;
 	public static final int GL_TEXTURE_BASE_LEVEL             = 0x813C;
 	public static final int GL_TEXTURE_MAX_LEVEL              = 0x813D;
-	public static final int GL_SMOOTH_POINT_SIZE_RANGE        = 0x0B12;
-	public static final int GL_SMOOTH_POINT_SIZE_GRANULARITY  = 0x0B13;
-	public static final int GL_SMOOTH_LINE_WIDTH_RANGE        = 0x0B22;
-	public static final int GL_SMOOTH_LINE_WIDTH_GRANULARITY  = 0x0B23;
+	public static final int GL_MAX_ELEMENTS_VERTICES          = 0x80E8;
+	public static final int GL_MAX_ELEMENTS_INDICES           = 0x80E9;
 	public static final int GL_ALIASED_POINT_SIZE_RANGE       = 0x846D;
 	public static final int GL_ALIASED_LINE_WIDTH_RANGE       = 0x846E;
-	public static final int GL_PACK_SKIP_IMAGES               = 0x806B;
-	public static final int GL_PACK_IMAGE_HEIGHT              = 0x806C;
-	public static final int GL_UNPACK_SKIP_IMAGES             = 0x806D;
-	public static final int GL_UNPACK_IMAGE_HEIGHT            = 0x806E;
-	public static final int GL_TEXTURE_3D                     = 0x806F;
-	public static final int GL_PROXY_TEXTURE_3D               = 0x8070;
-	public static final int GL_TEXTURE_DEPTH                  = 0x8071;
-	public static final int GL_TEXTURE_WRAP_R                 = 0x8072;
-	public static final int GL_MAX_3D_TEXTURE_SIZE            = 0x8073;
-	public static final int GL_TEXTURE_BINDING_3D             = 0x806A;
-	public static final int GL_COLOR_TABLE                    = 0x80D0;
-	public static final int GL_POST_CONVOLUTION_COLOR_TABLE   = 0x80D1;
-	public static final int GL_POST_COLOR_MATRIX_COLOR_TABLE  = 0x80D2;
-	public static final int GL_PROXY_COLOR_TABLE              = 0x80D3;
-	public static final int GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4;
-	public static final int GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5;
-	public static final int GL_COLOR_TABLE_SCALE              = 0x80D6;
-	public static final int GL_COLOR_TABLE_BIAS               = 0x80D7;
-	public static final int GL_COLOR_TABLE_FORMAT             = 0x80D8;
-	public static final int GL_COLOR_TABLE_WIDTH              = 0x80D9;
-	public static final int GL_COLOR_TABLE_RED_SIZE           = 0x80DA;
-	public static final int GL_COLOR_TABLE_GREEN_SIZE         = 0x80DB;
-	public static final int GL_COLOR_TABLE_BLUE_SIZE          = 0x80DC;
-	public static final int GL_COLOR_TABLE_ALPHA_SIZE         = 0x80DD;
-	public static final int GL_COLOR_TABLE_LUMINANCE_SIZE     = 0x80DE;
-	public static final int GL_COLOR_TABLE_INTENSITY_SIZE     = 0x80DF;
-	public static final int GL_CONVOLUTION_1D                 = 0x8010;
-	public static final int GL_CONVOLUTION_2D                 = 0x8011;
-	public static final int GL_SEPARABLE_2D                   = 0x8012;
-	public static final int GL_CONVOLUTION_BORDER_MODE        = 0x8013;
-	public static final int GL_CONVOLUTION_FILTER_SCALE       = 0x8014;
-	public static final int GL_CONVOLUTION_FILTER_BIAS        = 0x8015;
-	public static final int GL_REDUCE                         = 0x8016;
-	public static final int GL_CONVOLUTION_FORMAT             = 0x8017;
-	public static final int GL_CONVOLUTION_WIDTH              = 0x8018;
-	public static final int GL_CONVOLUTION_HEIGHT             = 0x8019;
-	public static final int GL_MAX_CONVOLUTION_WIDTH          = 0x801A;
-	public static final int GL_MAX_CONVOLUTION_HEIGHT         = 0x801B;
-	public static final int GL_POST_CONVOLUTION_RED_SCALE     = 0x801C;
-	public static final int GL_POST_CONVOLUTION_GREEN_SCALE   = 0x801D;
-	public static final int GL_POST_CONVOLUTION_BLUE_SCALE    = 0x801E;
-	public static final int GL_POST_CONVOLUTION_ALPHA_SCALE   = 0x801F;
-	public static final int GL_POST_CONVOLUTION_RED_BIAS      = 0x8020;
-	public static final int GL_POST_CONVOLUTION_GREEN_BIAS    = 0x8021;
-	public static final int GL_POST_CONVOLUTION_BLUE_BIAS     = 0x8022;
-	public static final int GL_POST_CONVOLUTION_ALPHA_BIAS    = 0x8023;
-	public static final int GL_CONSTANT_BORDER                = 0x8151;
-	public static final int GL_REPLICATE_BORDER               = 0x8153;
-	public static final int GL_CONVOLUTION_BORDER_COLOR       = 0x8154;
-	public static final int GL_COLOR_MATRIX                   = 0x80B1;
-	public static final int GL_COLOR_MATRIX_STACK_DEPTH       = 0x80B2;
-	public static final int GL_MAX_COLOR_MATRIX_STACK_DEPTH   = 0x80B3;
-	public static final int GL_POST_COLOR_MATRIX_RED_SCALE    = 0x80B4;
-	public static final int GL_POST_COLOR_MATRIX_GREEN_SCALE  = 0x80B5;
-	public static final int GL_POST_COLOR_MATRIX_BLUE_SCALE   = 0x80B6;
-	public static final int GL_POST_COLOR_MATRIX_ALPHA_SCALE  = 0x80B7;
-	public static final int GL_POST_COLOR_MATRIX_RED_BIAS     = 0x80B8;
-	public static final int GL_POST_COLOR_MATRIX_GREEN_BIAS   = 0x80B9;
-	public static final int GL_POST_COLOR_MATRIX_BLUE_BIAS    = 0x80BA;
-	public static final int GL_POST_COLOR_MATRIX_ALPHA_BIAS   = 0x80BB;
-	public static final int GL_HISTOGRAM                      = 0x8024;
-	public static final int GL_PROXY_HISTOGRAM                = 0x8025;
-	public static final int GL_HISTOGRAM_WIDTH                = 0x8026;
-	public static final int GL_HISTOGRAM_FORMAT               = 0x8027;
-	public static final int GL_HISTOGRAM_RED_SIZE             = 0x8028;
-	public static final int GL_HISTOGRAM_GREEN_SIZE           = 0x8029;
-	public static final int GL_HISTOGRAM_BLUE_SIZE            = 0x802A;
-	public static final int GL_HISTOGRAM_ALPHA_SIZE           = 0x802B;
-	public static final int GL_HISTOGRAM_LUMINANCE_SIZE       = 0x802C;
-	public static final int GL_HISTOGRAM_SINK                 = 0x802D;
-	public static final int GL_MINMAX                         = 0x802E;
-	public static final int GL_MINMAX_FORMAT                  = 0x802F;
-	public static final int GL_MINMAX_SINK                    = 0x8030;
-	public static final int GL_TABLE_TOO_LARGE                = 0x8031;
-	public static final int GL_BLEND_EQUATION                 = 0x8009;
-	public static final int GL_MIN                            = 0x8007;
-	public static final int GL_MAX                            = 0x8008;
-	public static final int GL_FUNC_ADD                       = 0x8006;
-	public static final int GL_FUNC_SUBTRACT                  = 0x800A;
-	public static final int GL_FUNC_REVERSE_SUBTRACT          = 0x800B;
-	public static final int GL_BLEND_COLOR                    = 0x8005;
-	
-	public static void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) {
-		// TODO: check buffer size valid
-		nglColorTable(target, internalFormat, width, format, type, data, data.position());
-	}
-	public static void glColorTable(int target, int internalFormat, int width, int format, int type, FloatBuffer data) {
-		// TODO: check buffer size valid
-		nglColorTable(target, internalFormat, width, format, type, data, data.position() << 2);
-	}
-	private static native void nglColorTable(int target, int internalFormat, int width, int format, int type, Buffer data, int data_offset);
-	public static void glColorSubTable(int target, int start, int count, int format, int type, ByteBuffer data) {
-		// TODO: check buffer size valid
-		nglColorSubTable(target, start, count, format, type, data, data.position());
-	}
-	public static void glColorSubTable(int target, int start, int count, int format, int type, FloatBuffer data) {
-		// TODO: check buffer size valid
-		nglColorSubTable(target, start, count, format, type, data, data.position() << 2);
-	}
-	private static native void nglColorSubTable(int target, int start, int count, int format, int type, Buffer data, int data_offset);
-	public static void glColorTableParameter(int target, int pname, IntBuffer params) {
-		// TODO: check buffer size valid
-		nglColorTableParameteriv(target, pname, params, params.position());
-	}
-	private static native void nglColorTableParameteriv(int target, int pname, IntBuffer params, int data_offset);
-	public static void glColorTableParameter(int target, int pname, FloatBuffer params) {
-		// TODO: check buffer size valid
-		nglColorTableParameterfv(target, pname, params, params.position());		
-	}
-	private static native void nglColorTableParameterfv(int target, int pname, FloatBuffer params, int data_offset);
-	public static native void glCopyColorSubTable(int target, int start, int x, int y, int width);
-	public static native void glCopyColorTable(int target, int internalformat, int x, int y, int width);
-	public static void glGetColorTable(int target, int format, int type, ByteBuffer data) {
-		// TODO: check buffer size valid
-		nglGetColorTable(target, format, type, data, data.position());
-	}
-	public static void glGetColorTable(int target, int format, int type, FloatBuffer data) {
-		// TODO: check buffer size valid
-		nglGetColorTable(target, format, type, data, data.position());
-	}
-	private static native void nglGetColorTable(int target, int format, int type, Buffer data, int data_offset);
-	public static void glGetColorTableParameter(int target, int pname, IntBuffer params) {
-		// TODO: check buffer size valid
-		nglGetColorTableParameteriv(target, pname, params, params.position());
-	}
-	private static native void nglGetColorTableParameteriv(int target, int pname, IntBuffer params, int params_offset);
-	public static void glGetColorTableParameter(int target, int pname, FloatBuffer params) {
-		// TODO: check buffer size valid
-		nglGetColorTableParameterfv(target, pname, params, params.position());
-	}
-	private static native void nglGetColorTableParameterfv(int target, int pname, FloatBuffer params, int params_offset);
-	public static native void glBlendEquation(int mode);
-	public static native void glBlendColor(float red, float green, float blue, float alpha);
-	public static native void glHistogram(int target, int width, int internalformat, boolean sink);
-	public static native void glResetHistogram(int target);
-	public static void glGetHistogram(int target, boolean reset, int format, int type, ByteBuffer values) {
-		// TODO: check buffer size valid
-		nglGetHistogram(target, reset, format, type, values, values.position());
-	}
-	public static void glGetHistogram(int target, boolean reset, int format, int type, ShortBuffer values) {
-		// TODO: check buffer size valid
-		nglGetHistogram(target, reset, format, type, values, values.position() << 1);
-	}
-	public static void glGetHistogram(int target, boolean reset, int format, int type, IntBuffer values) {
-		// TODO: check buffer size valid
-		nglGetHistogram(target, reset, format, type, values, values.position() << 2);
-	}
-	public static void glGetHistogram(int target, boolean reset, int format, int type, FloatBuffer values) {
-		// TODO: check buffer size valid
-		nglGetHistogram(target, reset, format, type, values, values.position() << 2);
-	}
-	private static native void nglGetHistogram(int target, boolean reset, int format, int type, Buffer values, int values_offset);
-	public static void glGetHistogramParameter(int target, int pname, FloatBuffer params) {
-		BufferChecks.checkBuffer(params);
-		nglGetHistogramParameterfv(target, pname, params, params.position());
-	}
-	private static native void nglGetHistogramParameterfv(int target, int pname, FloatBuffer params, int params_offset);
-	public static void glGetHistogramParameter(int target, int pname, IntBuffer params) {
-		BufferChecks.checkBuffer(params);
-		nglGetHistogramParameteriv(target, pname, params, params.position());
-	}
-	private static native void nglGetHistogramParameteriv(int target, int pname, IntBuffer params, int params_offset);
-	public static native void glMinmax(int target, int internalformat, boolean sink);
-	public static native void glResetMinmax(int target);
-	public static void glGetMinmax(int target, boolean reset, int format, int types, ByteBuffer values) {
-		BufferChecks.checkBuffer(values);
-		nglGetMinmax(target, reset, format, types, values, values.position());
-	}
-	public static void glGetMinmax(int target, boolean reset, int format, int types, ShortBuffer values) {
-		BufferChecks.checkBuffer(values);
-		nglGetMinmax(target, reset, format, types, values, values.position() << 1);
-	}
-	public static void glGetMinmax(int target, boolean reset, int format, int types, IntBuffer values) {
-		BufferChecks.checkBuffer(values);
-		nglGetMinmax(target, reset, format, types, values, values.position() << 2);
-	}
-	public static void glGetMinmax(int target, boolean reset, int format, int types, FloatBuffer values) {
-		BufferChecks.checkBuffer(values);
-		nglGetMinmax(target, reset, format, types, values, values.position() << 2);
-	}
-	private static native void nglGetMinmax(int target, boolean reset, int format, int types, Buffer values, int values_offset);
-	public static void glGetMinmaxParameter(int target, int pname, FloatBuffer params) {
-		BufferChecks.checkBuffer(params);
-		nglGetMinmaxParameterfv(target, pname, params, params.position());
-	}
-	private static native void nglGetMinmaxParameterfv(int target, int pname, FloatBuffer params, int params_offset);
-	public static void glGetMinmaxParameter(int target, int pname, IntBuffer params) {
-		BufferChecks.checkBuffer(params);
-		nglGetMinmaxParameteriv(target, pname, params, params.position());
-	}
-	private static native void nglGetMinmaxParameteriv(int target, int pname, IntBuffer params, int params_offset);
-	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image) {
-		// TODO: check buffer size valid
-		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position());
-	}
-	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image) {
-		// TODO: check buffer size valid
-		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position());
-	}
-	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, IntBuffer image) {
-		// TODO: check buffer size valid
-		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position());
-	}
-	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, FloatBuffer image) {
-		// TODO: check buffer size valid
-		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position());
-	}
-	private static native void nglConvolutionFilter1D(int target, int internalformat, int width, int format, int type, Buffer image, int image_offset);
-	public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image) {
-	}
-	private static native void nglConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image, int image_offset);
-	public static native void glConvolutionParameterf(int target, int pname, float params);
-	public static void glConvolutionParameter(int target, int pname, FloatBuffer params) {
-		BufferChecks.checkBuffer(params);
-		nglConvolutionParameterfv(target, pname, params, params.position());
-	}
-	private static native void nglConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_offset);
-	public static native void glConvolutionParameteri(int target, int pname, int params);
-	public static void glConvolutionParameteriv(int target, int pname, IntBuffer params) {
-		BufferChecks.checkBuffer(params);
-		nglConvolutionParameteriv(target, pname, params, params.position());
-	}
-	private static native void nglConvolutionParameteriv(int target, int pname, IntBuffer params, int params_offset);
-	public static native void glCopyConvolutionFilter1D(int target, int internalformat, int x, int y, int width);
-	public static native void glCopyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height);
-	public static void glGetConvolutionFilter(int target, int format, int type, ByteBuffer image) {
-		// TODO: check buffer size valid
-		nglGetConvolutionFilter(target, format, type, image, image.position());
-	}
-	public static void glGetConvolutionFilter(int target, int format, int type, ShortBuffer image) {
-		// TODO: check buffer size valid
-		nglGetConvolutionFilter(target, format, type, image, image.position() << 1);
-	}
-	public static void glGetConvolutionFilter(int target, int format, int type, IntBuffer image) {
-		// TODO: check buffer size valid
-		nglGetConvolutionFilter(target, format, type, image, image.position() << 2);
-	}
-	public static void glGetConvolutionFilter(int target, int format, int type, FloatBuffer image) {
-		// TODO: check buffer size valid
-		nglGetConvolutionFilter(target, format, type, image, image.position() << 2);
-	}
-	private static native void nglGetConvolutionFilter(int target, int format, int type, Buffer image, int image_offset);
-	public static void glGetConvolutionParameter(int target, int pname, FloatBuffer params) {
-		// TODO: check buffer size valid
-		nglGetConvolutionParameterfv(target, pname, params, params.position());
-	}
-	private static native void nglGetConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_offset);
-	public static void glGetConvolutionParameter(int target, int pname, IntBuffer params) {
-		// TODO: check buffer size valid
-		nglGetConvolutionParameteriv(target, pname, params, params.position());
-	}
-	private static native void nglGetConvolutionParameteriv(int target, int pname, IntBuffer params, int params_offset);
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, Buffer column) {
-		// TODO: check buffer size valid
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, Util.getOffset(row), column, Util.getOffset(column));
-	}
-	private static native void nglSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, int row_offset, Buffer column, int column_offset);
-	public static void glGetSeparableFilter(int target, int format, int type, Buffer row, Buffer column, Buffer span) {
-		// TODO: check buffer size valid
-		nglGetSeparableFilter(target, format, type, row, Util.getOffset(row), column, Util.getOffset(column), span, Util.getOffset(span));
-	}
-	private static native void nglGetSeparableFilter(int target, int format, int type, Buffer row, int row_offset, Buffer column, int column_offset, Buffer span, int span_offset);
+
 	public static void glDrawRangeElements(int mode, int start, int end, ByteBuffer indices) {
 		BufferChecks.ensureElementVBOdisabled();
 		nglDrawRangeElements(mode, start, end, indices.remaining(), GL_UNSIGNED_BYTE, indices, indices.position());

[Java-game-lib-cvs] LWJGL/src/native/common/arb org_lwjgl_opengl_ARBImaging.cpp,NONE,1.1 org_lwjgl_opengl_ARBImaging.h,NONE,1.1 Makefile.am,1.4,1.5

From: <eli...@us...> - 2004-02-17 22:08:23

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/arb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31575/src/native/common/arb

Modified Files:
	Makefile.am 
Added Files:
	org_lwjgl_opengl_ARBImaging.cpp org_lwjgl_opengl_ARBImaging.h 
Log Message:
Split ARB_imaging into separate extension

--- NEW FILE: org_lwjgl_opengl_ARBImaging.cpp ---
/*
 * Copyright (c) 2002 Light Weight 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.
 */
 
/**
 * $Id: org_lwjgl_opengl_ARBImaging.cpp,v 1.1 2004/02/17 21:59:17 elias_naur Exp $
 *
 * Core OpenGL functions.
 *
 * @author cix_foo <ci...@us...>
 * @version $Revision: 1.1 $
 */

#include "org_lwjgl_opengl_ARBImaging.h"
#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 * glColorTablePROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table );
typedef void (APIENTRY * glColorTableParameterfvPROC) (GLenum target, GLenum pname, const GLfloat *params);
typedef void (APIENTRY * glColorTableParameterivPROC) (GLenum target, GLenum pname, const GLint *params);
typedef void (APIENTRY * glCopyColorTablePROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
typedef void (APIENTRY * glGetColorTablePROC) (GLenum target, GLenum format, GLenum type, GLvoid *table );
typedef void (APIENTRY * glGetColorTableParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
typedef void (APIENTRY * glGetColorTableParameterivPROC) (GLenum target, GLenum pname, GLint *params );
typedef void (APIENTRY * glColorSubTablePROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data );
typedef void (APIENTRY * glCopyColorSubTablePROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width );
typedef void (APIENTRY * glConvolutionFilter1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image );
typedef void (APIENTRY * glConvolutionFilter2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image );
typedef void (APIENTRY * glConvolutionParameterfPROC) (GLenum target, GLenum pname, GLfloat params );
typedef void (APIENTRY * glConvolutionParameterfvPROC) (GLenum target, GLenum pname, const GLfloat *params );
typedef void (APIENTRY * glConvolutionParameteriPROC) (GLenum target, GLenum pname, GLint params );
typedef void (APIENTRY * glConvolutionParameterivPROC) (GLenum target, GLenum pname, const GLint *params );
typedef void (APIENTRY * glCopyConvolutionFilter1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
typedef void (APIENTRY * glCopyConvolutionFilter2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
typedef void (APIENTRY * glGetConvolutionFilterPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image );
typedef void (APIENTRY * glGetConvolutionParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
typedef void (APIENTRY * glGetConvolutionParameterivPROC) (GLenum target, GLenum pname, GLint *params );
typedef void (APIENTRY * glSeparableFilter2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column );
typedef void (APIENTRY * glGetHistogramPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values );
typedef void (APIENTRY * glGetHistogramParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
typedef void (APIENTRY * glGetHistogramParameterivPROC) (GLenum target, GLenum pname, GLint *params );
typedef void (APIENTRY * glGetMinmaxPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values );
typedef void (APIENTRY * glGetMinmaxParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
typedef void (APIENTRY * glGetMinmaxParameterivPROC) (GLenum target, GLenum pname, GLint *params );
typedef void (APIENTRY * glHistogramPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink );
typedef void (APIENTRY * glResetHistogramPROC) (GLenum target );
typedef void (APIENTRY * glMinmaxPROC) (GLenum target, GLenum internalformat, GLboolean sink );
typedef void (APIENTRY * glResetMinmaxPROC) (GLenum target );
typedef void (APIENTRY * glGetSeparableFilterPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );

static glBlendColorPROC glBlendColor;
static glBlendEquationPROC glBlendEquation;
static glColorTablePROC glColorTable;
static glColorTableParameterfvPROC glColorTableParameterfv;
static glColorTableParameterivPROC glColorTableParameteriv;
static glCopyColorTablePROC glCopyColorTable;
static glGetColorTablePROC glGetColorTable;
static glGetColorTableParameterfvPROC glGetColorTableParameterfv;
static glGetColorTableParameterivPROC glGetColorTableParameteriv;
static glColorSubTablePROC glColorSubTable;
static glCopyColorSubTablePROC glCopyColorSubTable;
static glConvolutionFilter1DPROC glConvolutionFilter1D;
static glConvolutionFilter2DPROC glConvolutionFilter2D;
static glConvolutionParameterfPROC glConvolutionParameterf;
static glConvolutionParameterfvPROC glConvolutionParameterfv;
static glConvolutionParameteriPROC glConvolutionParameteri;
static glConvolutionParameterivPROC glConvolutionParameteriv;
static glCopyConvolutionFilter1DPROC glCopyConvolutionFilter1D;
static glCopyConvolutionFilter2DPROC glCopyConvolutionFilter2D;
static glGetConvolutionFilterPROC glGetConvolutionFilter;
static glGetConvolutionParameterfvPROC glGetConvolutionParameterfv;
static glGetConvolutionParameterivPROC glGetConvolutionParameteriv;
static glGetSeparableFilterPROC glGetSeparableFilter;
static glSeparableFilter2DPROC glSeparableFilter2D;
static glGetHistogramPROC glGetHistogram;
static glGetHistogramParameterfvPROC glGetHistogramParameterfv;
static glGetHistogramParameterivPROC glGetHistogramParameteriv;
static glGetMinmaxPROC glGetMinmax;
static glGetMinmaxParameterfvPROC glGetMinmaxParameterfv;
static glGetMinmaxParameterivPROC glGetMinmaxParameteriv;
static glHistogramPROC glHistogram;
static glMinmaxPROC glMinmax;
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
  (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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glColorSubTable
 * Signature: (IIIIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetColorTable
 * Signature: (IIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetColorTableParameteriv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetColorTableParameterfv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glColorTableParameteriv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glColorTableParameterfv
 * Signature: (III)V
 */
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
}


/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glCopyColorSubTable
 * Signature: (IIIII)V
 */
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
}


/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glCopyColorTable
 * Signature: (IIIII)V
 */
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
}


/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glBlendEquation
 * Signature: (I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation
  (JNIEnv *env, jclass clazz, jint mode)
{
	CHECK_EXISTS(glBlendEquation)
	glBlendEquation(mode);
	CHECK_GL_ERROR
}

/*
 * 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)
{
	CHECK_EXISTS(glBlendColor)
	glBlendColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3);
	CHECK_GL_ERROR
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glHistogram
 * Signature: (IIIZ)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glResetHistogram
 * Signature: (I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram
  (JNIEnv *env, jclass clazz, jint target)
{
	CHECK_EXISTS(glResetHistogram)
	glResetHistogram(target);
	CHECK_GL_ERROR
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetHistogram
 * Signature: (IZIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetHistogramParameterfv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetHistogramParameteriv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glMinmax
 * Signature: (IIZ)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glResetMinmax
 * Signature: (I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax
  (JNIEnv *env, jclass clazz, jint target)
{
	CHECK_EXISTS(glResetMinmax)
	glResetMinmax(target);
	CHECK_GL_ERROR
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetMinmax
 * Signature: (IZIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetMinmaxParameterfv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetMinmaxParameteriv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glConvolutionFilter1D
 * Signature: (IIIIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glConvolutionFilter2D
 * Signature: (IIIIIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glConvolutionParameterf
 * Signature: (IIF)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glConvolutionParameterfv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glConvolutionParameteri
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glConvolutionParameteriv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glCopyConvolutionFilter1D
 * Signature: (IIIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glCopyConvolutionFilter2D
 * Signature: (IIIIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetConvolutionFilter
 * Signature: (IIII)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetConvolutionParameterfv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetConvolutionParameteriv
 * Signature: (III)V
 */
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
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glSeparableFilter2D
 * Signature: (IIIIIIII)V
 */
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);
	CHECK_GL_ERROR
}

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glGetSeparableFilter
 * Signature: (IIIIII)V
 */
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
}

--- NEW FILE: org_lwjgl_opengl_ARBImaging.h ---
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
/* Header for class org_lwjgl_opengl_ARBImaging */

#ifndef _Included_org_lwjgl_opengl_ARBImaging
#define _Included_org_lwjgl_opengl_ARBImaging
#ifdef __cplusplus
extern "C" {
#endif
#undef org_lwjgl_opengl_ARBImaging_GL_CONSTANT_COLOR
#define org_lwjgl_opengl_ARBImaging_GL_CONSTANT_COLOR 32769L
#undef org_lwjgl_opengl_ARBImaging_GL_ONE_MINUS_CONSTANT_COLOR
#define org_lwjgl_opengl_ARBImaging_GL_ONE_MINUS_CONSTANT_COLOR 32770L
#undef org_lwjgl_opengl_ARBImaging_GL_CONSTANT_ALPHA
#define org_lwjgl_opengl_ARBImaging_GL_CONSTANT_ALPHA 32771L
#undef org_lwjgl_opengl_ARBImaging_GL_ONE_MINUS_CONSTANT_ALPHA
#define org_lwjgl_opengl_ARBImaging_GL_ONE_MINUS_CONSTANT_ALPHA 32772L
#undef org_lwjgl_opengl_ARBImaging_GL_BLEND_COLOR
#define org_lwjgl_opengl_ARBImaging_GL_BLEND_COLOR 32773L
#undef org_lwjgl_opengl_ARBImaging_GL_FUNC_ADD
#define org_lwjgl_opengl_ARBImaging_GL_FUNC_ADD 32774L
#undef org_lwjgl_opengl_ARBImaging_GL_MIN
#define org_lwjgl_opengl_ARBImaging_GL_MIN 32775L
#undef org_lwjgl_opengl_ARBImaging_GL_MAX
#define org_lwjgl_opengl_ARBImaging_GL_MAX 32776L
#undef org_lwjgl_opengl_ARBImaging_GL_BLEND_EQUATION
#define org_lwjgl_opengl_ARBImaging_GL_BLEND_EQUATION 32777L
#undef org_lwjgl_opengl_ARBImaging_GL_FUNC_SUBTRACT
#define org_lwjgl_opengl_ARBImaging_GL_FUNC_SUBTRACT 32778L
#undef org_lwjgl_opengl_ARBImaging_GL_FUNC_REVERSE_SUBTRACT
#define org_lwjgl_opengl_ARBImaging_GL_FUNC_REVERSE_SUBTRACT 32779L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_MATRIX
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_MATRIX 32945L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_MATRIX_STACK_DEPTH
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_MATRIX_STACK_DEPTH 32946L
#undef org_lwjgl_opengl_ARBImaging_GL_MAX_COLOR_MATRIX_STACK_DEPTH
#define org_lwjgl_opengl_ARBImaging_GL_MAX_COLOR_MATRIX_STACK_DEPTH 32947L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_RED_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_RED_SCALE 32948L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_GREEN_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_GREEN_SCALE 32949L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_BLUE_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_BLUE_SCALE 32950L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_ALPHA_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_ALPHA_SCALE 32951L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_RED_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_RED_BIAS 32952L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_GREEN_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_GREEN_BIAS 32953L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_BLUE_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_BLUE_BIAS 32954L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_ALPHA_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_ALPHA_BIAS 32955L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE 32976L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_COLOR_TABLE
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_COLOR_TABLE 32977L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_COLOR_TABLE
#define org_lwjgl_opengl_ARBImaging_GL_POST_COLOR_MATRIX_COLOR_TABLE 32978L
#undef org_lwjgl_opengl_ARBImaging_GL_PROXY_COLOR_TABLE
#define org_lwjgl_opengl_ARBImaging_GL_PROXY_COLOR_TABLE 32979L
#undef org_lwjgl_opengl_ARBImaging_GL_PROXY_POST_CONVOLUTION_COLOR_TABLE
#define org_lwjgl_opengl_ARBImaging_GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 32980L
#undef org_lwjgl_opengl_ARBImaging_GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE
#define org_lwjgl_opengl_ARBImaging_GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 32981L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_SCALE 32982L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_BIAS 32983L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_FORMAT
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_FORMAT 32984L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_WIDTH
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_WIDTH 32985L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_RED_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_RED_SIZE 32986L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_GREEN_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_GREEN_SIZE 32987L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_BLUE_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_BLUE_SIZE 32988L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_ALPHA_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_ALPHA_SIZE 32989L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_LUMINANCE_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_LUMINANCE_SIZE 32990L
#undef org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_INTENSITY_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_COLOR_TABLE_INTENSITY_SIZE 32991L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_1D
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_1D 32784L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_2D
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_2D 32785L
#undef org_lwjgl_opengl_ARBImaging_GL_SEPARABLE_2D
#define org_lwjgl_opengl_ARBImaging_GL_SEPARABLE_2D 32786L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_BORDER_MODE
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_BORDER_MODE 32787L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_FILTER_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_FILTER_SCALE 32788L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_FILTER_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_FILTER_BIAS 32789L
#undef org_lwjgl_opengl_ARBImaging_GL_REDUCE
#define org_lwjgl_opengl_ARBImaging_GL_REDUCE 32790L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_FORMAT
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_FORMAT 32791L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_WIDTH
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_WIDTH 32792L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_HEIGHT
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_HEIGHT 32793L
#undef org_lwjgl_opengl_ARBImaging_GL_MAX_CONVOLUTION_WIDTH
#define org_lwjgl_opengl_ARBImaging_GL_MAX_CONVOLUTION_WIDTH 32794L
#undef org_lwjgl_opengl_ARBImaging_GL_MAX_CONVOLUTION_HEIGHT
#define org_lwjgl_opengl_ARBImaging_GL_MAX_CONVOLUTION_HEIGHT 32795L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_RED_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_RED_SCALE 32796L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_GREEN_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_GREEN_SCALE 32797L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_BLUE_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_BLUE_SCALE 32798L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_ALPHA_SCALE
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_ALPHA_SCALE 32799L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_RED_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_RED_BIAS 32800L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_GREEN_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_GREEN_BIAS 32801L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_BLUE_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_BLUE_BIAS 32802L
#undef org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_ALPHA_BIAS
#define org_lwjgl_opengl_ARBImaging_GL_POST_CONVOLUTION_ALPHA_BIAS 32803L
#undef org_lwjgl_opengl_ARBImaging_GL_IGNORE_BORDER
#define org_lwjgl_opengl_ARBImaging_GL_IGNORE_BORDER 33104L
#undef org_lwjgl_opengl_ARBImaging_GL_CONSTANT_BORDER
#define org_lwjgl_opengl_ARBImaging_GL_CONSTANT_BORDER 33105L
#undef org_lwjgl_opengl_ARBImaging_GL_REPLICATE_BORDER
#define org_lwjgl_opengl_ARBImaging_GL_REPLICATE_BORDER 33107L
#undef org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_BORDER_COLOR
#define org_lwjgl_opengl_ARBImaging_GL_CONVOLUTION_BORDER_COLOR 33108L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM 32804L
#undef org_lwjgl_opengl_ARBImaging_GL_PROXY_HISTOGRAM
#define org_lwjgl_opengl_ARBImaging_GL_PROXY_HISTOGRAM 32805L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_WIDTH
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_WIDTH 32806L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_FORMAT
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_FORMAT 32807L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_RED_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_RED_SIZE 32808L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_GREEN_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_GREEN_SIZE 32809L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_BLUE_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_BLUE_SIZE 32810L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_ALPHA_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_ALPHA_SIZE 32811L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_LUMINANCE_SIZE
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_LUMINANCE_SIZE 32812L
#undef org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_SINK
#define org_lwjgl_opengl_ARBImaging_GL_HISTOGRAM_SINK 32813L
#undef org_lwjgl_opengl_ARBImaging_GL_MINMAX
#define org_lwjgl_opengl_ARBImaging_GL_MINMAX 32814L
#undef org_lwjgl_opengl_ARBImaging_GL_MINMAX_FORMAT
#define org_lwjgl_opengl_ARBImaging_GL_MINMAX_FORMAT 32815L
#undef org_lwjgl_opengl_ARBImaging_GL_MINMAX_SINK
#define org_lwjgl_opengl_ARBImaging_GL_MINMAX_SINK 32816L
/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglColorTable
 * Signature: (IIIIILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTable
  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglColorSubTable
 * Signature: (IIIIILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable
  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglColorTableParameteriv
 * Signature: (IILjava/nio/IntBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglColorTableParameterfv
 * Signature: (IILjava/nio/FloatBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glCopyColorSubTable
 * Signature: (IIIII)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable
  (JNIEnv *, jclass, jint, jint, jint, jint, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glCopyColorTable
 * Signature: (IIIII)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable
  (JNIEnv *, jclass, jint, jint, jint, jint, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetColorTable
 * Signature: (IIILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable
  (JNIEnv *, jclass, jint, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetColorTableParameteriv
 * Signature: (IILjava/nio/IntBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetColorTableParameterfv
 * Signature: (IILjava/nio/FloatBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glBlendEquation
 * Signature: (I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation
  (JNIEnv *, jclass, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glBlendColor
 * Signature: (FFFF)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendColor
  (JNIEnv *, jclass, jfloat, jfloat, jfloat, jfloat);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glHistogram
 * Signature: (IIIZ)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glHistogram
  (JNIEnv *, jclass, jint, jint, jint, jboolean);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glResetHistogram
 * Signature: (I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram
  (JNIEnv *, jclass, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetHistogram
 * Signature: (IZIILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram
  (JNIEnv *, jclass, jint, jboolean, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetHistogramParameterfv
 * Signature: (IILjava/nio/FloatBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetHistogramParameteriv
 * Signature: (IILjava/nio/IntBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glMinmax
 * Signature: (IIZ)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glMinmax
  (JNIEnv *, jclass, jint, jint, jboolean);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glResetMinmax
 * Signature: (I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax
  (JNIEnv *, jclass, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetMinmax
 * Signature: (IZIILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax
  (JNIEnv *, jclass, jint, jboolean, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetMinmaxParameterfv
 * Signature: (IILjava/nio/FloatBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetMinmaxParameteriv
 * Signature: (IILjava/nio/IntBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglConvolutionFilter1D
 * Signature: (IIIIILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D
  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglConvolutionFilter2D
 * Signature: (IIIIIILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D
  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glConvolutionParameterf
 * Signature: (IIF)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf
  (JNIEnv *, jclass, jint, jint, jfloat);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglConvolutionParameterfv
 * Signature: (IILjava/nio/FloatBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glConvolutionParameteri
 * Signature: (III)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri
  (JNIEnv *, jclass, jint, jint, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglConvolutionParameteriv
 * Signature: (IILjava/nio/IntBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glCopyConvolutionFilter1D
 * Signature: (IIIII)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D
  (JNIEnv *, jclass, jint, jint, jint, jint, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    glCopyConvolutionFilter2D
 * Signature: (IIIIII)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D
  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetConvolutionFilter
 * Signature: (IIILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter
  (JNIEnv *, jclass, jint, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetConvolutionParameterfv
 * Signature: (IILjava/nio/FloatBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterfv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetConvolutionParameteriv
 * Signature: (IILjava/nio/IntBuffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteriv
  (JNIEnv *, jclass, jint, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglSeparableFilter2D
 * Signature: (IIIIIILjava/nio/Buffer;ILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D
  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jobject, jint, jobject, jint);

/*
 * Class:     org_lwjgl_opengl_ARBImaging
 * Method:    nglGetSeparableFilter
 * Signature: (IIILjava/nio/Buffer;ILjava/nio/Buffer;ILjava/nio/Buffer;I)V
 */
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter
  (JNIEnv *, jclass, jint, jint, jint, jobject, jint, jobject, jint, jobject, jint);

#ifdef __cplusplus
}
#endif
#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	8 Feb 2004 22:21:51 -0000	1.4
+++ Makefile.am	17 Feb 2004 21:59:09 -0000	1.5
@@ -17,4 +17,5 @@
       org_lwjgl_opengl_ARBWindowPos.cpp \
       org_lwjgl_opengl_ARBOcclusionQuery.cpp \
       org_lwjgl_opengl_ARBShaderObjects.cpp \
-      org_lwjgl_opengl_ARBVertexShader.cpp
+      org_lwjgl_opengl_ARBVertexShader.cpp \
+      org_lwjgl_opengl_ARBImaging.cpp

[Java-game-lib-cvs] LWJGL/src/native/common org_lwjgl_opengl_GL14.cpp,1.2,1.3 org_lwjgl_opengl_GL14.h,1.1,1.2

From: <eli...@us...> - 2004-02-17 21:45:21

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26086/src/native/common

Modified Files:
	org_lwjgl_opengl_GL14.cpp org_lwjgl_opengl_GL14.h 
Log Message:
Added missing GL14 functions

Index: org_lwjgl_opengl_GL14.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL14.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_GL14.cpp	29 Jan 2004 22:07:03 -0000	1.2
+++ org_lwjgl_opengl_GL14.cpp	17 Feb 2004 21:36:17 -0000	1.3
@@ -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 @@
 	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

Index: org_lwjgl_opengl_GL14.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL14.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_GL14.h	20 Jan 2004 11:19:13 -0000	1.1
+++ org_lwjgl_opengl_GL14.h	17 Feb 2004 21:36:17 -0000	1.2
@@ -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 @@
 #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 @@
 #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 @@
 #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 @@
 #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

[Java-game-lib-cvs] LWJGL/src/java/org/lwjgl/opengl GL14.java,1.5,1.6

From: <eli...@us...> - 2004-02-17 21:45:20

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26086/src/java/org/lwjgl/opengl

Modified Files:
	GL14.java 
Log Message:
Added missing GL14 functions

Index: GL14.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL14.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GL14.java	16 Feb 2004 03:35:45 -0000	1.5
+++ GL14.java	17 Feb 2004 21:36:17 -0000	1.6
@@ -86,6 +86,8 @@
 	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();

[Java-game-lib-cvs] LWJGL/src/native/win32 Window.h,1.7,1.8 org_lwjgl_opengl_Window.cpp,1.18,1.19

From: <ma...@us...> - 2004-02-17 17:06:18

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31356

Modified Files:
	Window.h org_lwjgl_opengl_Window.cpp 
Log Message:
make isFocused & isMinimized work as expected
cleaned up field usage

Index: Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/Window.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Window.h	12 Jan 2004 17:21:56 -0000	1.7
+++ Window.h	17 Feb 2004 16:57:23 -0000	1.8
@@ -57,9 +57,11 @@
 
 		extern HWND		hwnd;								// Handle to the window
 		extern HDC		hdc;								// Device context
-		extern LPDIRECTINPUT	lpdi;						// DirectInput
-		extern bool		isFullScreen;						// Whether we're fullscreen or not
-		extern bool		isMinimized;						// Whether we're minimized or not
+		extern LPDIRECTINPUT	lpdi;				// DirectInput
+		extern bool		isFullScreen;				// Whether we're fullscreen or not
+		extern bool		isMinimized;				// Whether we're minimized or not
+		extern bool		isFocused;					// Whether we're focused or not
+		extern bool		isDirty;					  // Whether we're dirty or not
 		extern RECT		clientSize;
 		extern HGLRC	hglrc;
 	#endif /* _PRIVATE_WINDOW_H_ */

Index: org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- org_lwjgl_opengl_Window.cpp	15 Feb 2004 19:24:03 -0000	1.18
+++ org_lwjgl_opengl_Window.cpp	17 Feb 2004 16:57:23 -0000	1.19
@@ -45,19 +45,19 @@
 #include "org_lwjgl_opengl_Window.h"
 
 static bool				oneShotInitialised = false;			// Registers the LWJGL window class
-HWND				hwnd = NULL;						// Handle to the window
-HDC					hdc = NULL;							// Device context
-HGLRC				hglrc = NULL;						// OpenGL context
-LPDIRECTINPUT		lpdi = NULL;						// DirectInput
-static bool				isFullScreen = false;				// Whether we're fullscreen or not
-static bool				isMinimized = false;				// Whether we're minimized or not
-extern HINSTANCE	dll_handle;							// Handle to the LWJGL dll
+
+HWND				hwnd = NULL;						              // Handle to the window
+HDC					hdc = NULL;							              // Device context
+HGLRC				hglrc = NULL;						              // OpenGL context
+LPDIRECTINPUT		lpdi = NULL;						          // DirectInput
+static bool				isFullScreen = false;		        // Whether we're fullscreen or not
+static bool				isMinimized = false;		        // Whether we're minimized or not
+static bool       isFocused = false;              // whether we're focused or not
+static bool       isDirty = false;                // Whether we're dirty or not
+extern HINSTANCE	dll_handle;							        // Handle to the LWJGL dll
 RECT clientSize;
 
 static bool closerequested;
-static bool minimized;
-static bool focused;
-static bool dirty;
 static jboolean vsync;
 
 //CAS: commented these out as no longer used
@@ -271,11 +271,11 @@
 			case SC_MONITORPOWER:
 				return 0L;
 			case SC_MINIMIZE:
-				minimized = true;
+				isMinimized = true;
 				appActivate(false);
 				break;
 			case SC_RESTORE:
-				minimized = false;
+				isMinimized = false;
 				appActivate(true);
 				break;
 			case SC_CLOSE:
@@ -291,14 +291,11 @@
 			switch(LOWORD(wParam)) {
 			case WA_ACTIVE:
 			case WA_CLICKACTIVE:
-				minimized = false;
 				isMinimized = false;
-
+				isFocused = true;
 				break;
 			case WA_INACTIVE:
-				minimized = true;
-				isMinimized = true;
-
+				isFocused = false;
 				break;
 			}
 			appActivate(!isMinimized);
@@ -311,7 +308,7 @@
 		}
 		case WM_PAINT:
 		{
-			dirty = true;
+			isDirty = true;
 		}
 	}
 
@@ -511,7 +508,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_swapBuffers
   (JNIEnv * env, jclass clazz)
 {
-	dirty = false;
+	isDirty = false;
 	SwapBuffers(hdc);
 //	wglSwapLayerBuffers(hdc, WGL_SWAP_MAIN_PLANE);
 }
@@ -525,9 +522,9 @@
   (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jint samples, jobject ext_set)
 {
 	closerequested = false;
-	minimized = false;
-	focused = true;
-	dirty = true;
+	isMinimized = false;
+	isFocused = true;
+	isDirty = true;
 	isFullScreen = fullscreen == JNI_TRUE;
 	vsync = JNI_FALSE;
 
@@ -613,8 +610,8 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsDirty
   (JNIEnv *env, jclass clazz) {
-	bool result = dirty;
-	dirty = false;
+	bool result = isDirty;
+	isDirty = false;
 	return result;
 }
 
@@ -625,7 +622,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsMinimized
   (JNIEnv *env, jclass clazz) {
-	return minimized;
+	return isMinimized;
 }
 
 /*
@@ -647,7 +644,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsFocused
   (JNIEnv *env, jclass clazz) {
-	return focused;
+	return isFocused;
 }
 
 /*

Flat | Threaded

S	M	T	W	T	F	S
1	2	3	4 (21)	5 (8)	6	7 (1)
8 (24)	9	10 (2)	11 (1)	12 (2)	13	14
15 (25)	16 (1)	17 (8)	18 (7)	19 (2)	20	21
22	23 (7)	24 (6)	25 (3)	26 (8)	27 (2)	28 (1)
29 (3)