Menu
▾
▴
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
(5) |
2
(5) |
3
(1) |
4
(1) |
5
(5) |
6
|
|
7
(22) |
8
(2) |
9
(10) |
10
(5) |
11
(5) |
12
(1) |
13
|
|
14
|
15
(2) |
16
|
17
|
18
(2) |
19
|
20
|
|
21
(13) |
22
(4) |
23
(3) |
24
(14) |
25
(6) |
26
(26) |
27
(26) |
|
28
(2) |
29
(13) |
30
(17) |
31
(2) |
|
|
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/nv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7407/src/native/common/nv Modified Files: org_lwjgl_opengl_NVEvaluators.cpp org_lwjgl_opengl_NVFence.cpp org_lwjgl_opengl_NVFragmentProgram.cpp org_lwjgl_opengl_NVHalfFloat.cpp org_lwjgl_opengl_NVOcclusionQuery.cpp org_lwjgl_opengl_NVPixelDataRange.cpp org_lwjgl_opengl_NVPointSprite.cpp org_lwjgl_opengl_NVPrimitiveRestart.cpp org_lwjgl_opengl_NVProgram.cpp org_lwjgl_opengl_NVRegisterCombiners.cpp org_lwjgl_opengl_NVRegisterCombiners2.cpp org_lwjgl_opengl_NVVertexArrayRange.cpp org_lwjgl_opengl_NVVertexProgram.cpp Log Message: Removed GL_CHECK_ERROR Index: org_lwjgl_opengl_NVEvaluators.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVEvaluators.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVEvaluators.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glMapControlPointsNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); typedef void (APIENTRY * glMapParameterivNVPROC) (GLenum target, GLenum pname, const GLint *params); @@ -66,7 +66,7 @@ { GLvoid *pPoints_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPoints) + pPoints_offset); glGetMapControlPointsNV(target, index, type, ustride, vstride, packed, pPoints_ptr); - CHECK_GL_ERROR + } /* @@ -78,7 +78,7 @@ { GLvoid *pPoints_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPoints) + pPoints_offset); glMapControlPointsNV(target, index, type, ustride, vstride, uorder, vorder, packed, pPoints_ptr); - CHECK_GL_ERROR + } /* @@ -90,7 +90,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glMapParameterfvNV(target, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -102,7 +102,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glMapParameterivNV(target, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetMapParameterfvNV(target, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -126,7 +126,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetMapParameterivNV(target, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -138,7 +138,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetMapAttribParameterfvNV(target, index, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -150,7 +150,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetMapAttribParameterivNV(target, index, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -161,7 +161,7 @@ (JNIEnv * env, jclass clazz, jint target, jint mode) { glEvalMapsNV(target, mode); - CHECK_GL_ERROR + } void extgl_InitNVEvaluators(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVFence.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVFence.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVFence.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVFence.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glGenFencesNVPROC) (GLsizei n, GLuint *fences); typedef void (APIENTRY * glDeleteFencesNVPROC) (GLsizei n, const GLuint *fences); @@ -62,7 +62,7 @@ { GLuint *piFences_ptr = (GLuint *)env->GetDirectBufferAddress(piFences) + piFences_offset; glGenFencesNV(n, piFences_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ { GLuint *piFences_ptr = (GLuint *)env->GetDirectBufferAddress(piFences) + piFences_offset; glDeleteFencesNV(n, piFences_ptr); - CHECK_GL_ERROR + } /* @@ -85,7 +85,7 @@ (JNIEnv * env, jclass clazz, jint fence, jint condition) { glSetFenceNV(fence, condition); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ (JNIEnv * env, jclass clazz, jint fence) { GLboolean result = glTestFenceNV(fence); - CHECK_GL_ERROR + return result; } @@ -108,7 +108,7 @@ (JNIEnv * env, jclass clazz, jint fence) { glFinishFenceNV(fence); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ (JNIEnv * env, jclass clazz, jint fence) { GLboolean result = glIsFenceNV(fence); - CHECK_GL_ERROR + return result; } @@ -132,7 +132,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetFenceivNV(fence, pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVFence(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVFragmentProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVFragmentProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVFragmentProgram.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glProgramNamedParameter4fNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); typedef void (APIENTRY * glProgramLocalParameter4fARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); @@ -56,7 +56,7 @@ { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; glProgramNamedParameter4fNV(id, length, name_ptr, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -69,7 +69,7 @@ GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramNamedParameterfvNV(id, length, name_ptr, params_ptr); - CHECK_GL_ERROR + } /* @@ -80,7 +80,7 @@ (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramLocalParameter4fARB(target, index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + params_offset; glGetProgramLocalParameterfvARB(target, index, params_ptr); - CHECK_GL_ERROR + } void extgl_InitNVFragmentProgram(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVHalfFloat.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_NVHalfFloat.cpp 7 Mar 2004 15:41:10 -0000 1.4 +++ org_lwjgl_opengl_NVHalfFloat.cpp 7 Mar 2004 16:01:45 -0000 1.5 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef unsigned short GLhalf; @@ -97,7 +97,7 @@ (JNIEnv * env, jclass clazz, jshort x, jshort y) { glVertex2hNV(x, y); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z) { glVertex3hNV(x, y, z); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z, jshort w) { glVertex4hNV(x, y, z, w); - CHECK_GL_ERROR + } /* @@ -130,7 +130,7 @@ (JNIEnv * env, jclass clazz, jshort nx, jshort ny, jshort nz) { glNormal3hNV(nx, ny, nz); - CHECK_GL_ERROR + } /* @@ -141,7 +141,7 @@ (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue) { glColor3hNV(red, green, blue); - CHECK_GL_ERROR + } /* @@ -152,7 +152,7 @@ (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue, jshort alpha) { glColor4hNV(red, green, blue, alpha); - CHECK_GL_ERROR + } /* @@ -163,7 +163,7 @@ (JNIEnv * env, jclass clazz, jshort s) { glTexCoord1hNV(s); - CHECK_GL_ERROR + } /* @@ -174,7 +174,7 @@ (JNIEnv * env, jclass clazz, jshort s, jshort t) { glTexCoord2hNV(s, t); - CHECK_GL_ERROR + } /* @@ -185,7 +185,7 @@ (JNIEnv * env, jclass clazz, jshort s, jshort t, jshort r) { glTexCoord3hNV(s, t, r); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ (JNIEnv * env, jclass clazz, jshort s, jshort t, jshort r, jshort q) { glTexCoord4hNV(s, t, r, q); - CHECK_GL_ERROR + } /* @@ -207,7 +207,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s) { glMultiTexCoord1hNV(target, s); - CHECK_GL_ERROR + } /* @@ -218,7 +218,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { glMultiTexCoord2hNV(target, s, t); - CHECK_GL_ERROR + } /* @@ -229,7 +229,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { glMultiTexCoord3hNV(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -240,7 +240,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { glMultiTexCoord4hNV(target, s, t, r, q); - CHECK_GL_ERROR + } /* @@ -251,7 +251,7 @@ (JNIEnv * env, jclass clazz, jshort fog) { glFogCoordhNV(fog); - CHECK_GL_ERROR + } /* @@ -262,7 +262,7 @@ (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue) { glSecondaryColor3hNV(red, green, blue); - CHECK_GL_ERROR + } /* @@ -273,7 +273,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1hNV(index, x); - CHECK_GL_ERROR + } /* @@ -284,7 +284,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2hNV(index, x, y); - CHECK_GL_ERROR + } /* @@ -295,7 +295,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3hNV(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -306,7 +306,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { glVertexAttrib4hNV(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -318,7 +318,7 @@ { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs1hvNV(index, n, attribs_ptr); - CHECK_GL_ERROR + } /* @@ -330,7 +330,7 @@ { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs2hvNV(index, n, attribs_ptr); - CHECK_GL_ERROR + } /* @@ -342,7 +342,7 @@ { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs3hvNV(index, n, attribs_ptr); - CHECK_GL_ERROR + } /* @@ -354,7 +354,7 @@ { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs4hvNV(index, n, attribs_ptr); - CHECK_GL_ERROR + } void extgl_InitNVHalfFloat(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVOcclusionQuery.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVOcclusionQuery.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVOcclusionQuery.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glGenOcclusionQueriesNVPROC) (GLsizei n, GLuint *ids); typedef void (APIENTRY * glDeleteOcclusionQueriesNVPROC) (GLsizei n, const GLuint *ids); @@ -62,7 +62,7 @@ { GLuint *piIDs_ptr = (GLuint *)env->GetDirectBufferAddress(piIDs) + piIDs_offset; glGenOcclusionQueriesNV(n, piIDs_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ { GLuint *piIDs_ptr = (GLuint *)env->GetDirectBufferAddress(piIDs) + piIDs_offset; glDeleteOcclusionQueriesNV(n, piIDs_ptr); - CHECK_GL_ERROR + } /* @@ -85,7 +85,7 @@ (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsOcclusionQueryNV(id); - CHECK_GL_ERROR + return result; } @@ -97,7 +97,7 @@ (JNIEnv * env, jclass clazz, jint id) { glBeginOcclusionQueryNV(id); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ (JNIEnv * env, jclass clazz) { glEndOcclusionQueryNV(); - CHECK_GL_ERROR + } /* @@ -120,7 +120,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetOcclusionQueryivNV(id, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -132,7 +132,7 @@ { GLuint *piParams_ptr = (GLuint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetOcclusionQueryuivNV(id, pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVOcclusionQuery(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVPixelDataRange.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVPixelDataRange.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVPixelDataRange.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPixelDataRangeNVPROC) (GLenum target, GLsizei length, GLvoid *pointer); typedef void (APIENTRY * glFlushPixelDataRangeNVPROC) (GLenum target); @@ -52,7 +52,7 @@ { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + dataOffset); glPixelDataRangeNV(target, length, data_ptr); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ (JNIEnv * env, jclass clazz, jint target) { glFlushPixelDataRangeNV(target); - CHECK_GL_ERROR + } void extgl_InitNVPixelDataRange(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVPointSprite.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVPointSprite.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVPointSprite.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPointParameteriNVPROC) (GLenum pname, GLint param); typedef void (APIENTRY * glPointParameterivNVPROC) (GLenum pname, const GLint *params); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jint pname, jint param) { glPointParameteriNV(pname, param); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glPointParameterivNV(pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVPointSprite(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVPrimitiveRestart.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVPrimitiveRestart.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVPrimitiveRestart.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPrimitiveRestartNVPROC) (GLvoid); typedef void (APIENTRY * glPrimitiveRestartIndexNVPROC) (GLuint index); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz) { glPrimitiveRestartNV(); - CHECK_GL_ERROR + } /* @@ -62,7 +62,7 @@ (JNIEnv * env, jclass clazz, jint index) { glPrimitiveRestartIndexNV(index); - CHECK_GL_ERROR + } void extgl_InitNVPrimitiveRestart(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVProgram.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVProgram.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glLoadProgramNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); typedef void (APIENTRY * glBindProgramNVPROC) (GLenum target, GLuint id); @@ -66,7 +66,7 @@ { const GLubyte *string_ptr = (const GLubyte *)env->GetDirectBufferAddress(string) + stringOffset; glLoadProgramNV(target, programID, length, string_ptr); - CHECK_GL_ERROR + } /* @@ -77,7 +77,7 @@ (JNIEnv * env, jclass clazz, jint target, jint programID) { glBindProgramNV(target, programID); - CHECK_GL_ERROR + } /* @@ -89,7 +89,7 @@ { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glDeleteProgramsNV(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -101,7 +101,7 @@ { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glGenProgramsNV(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -113,7 +113,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramivNV(programID, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -125,7 +125,7 @@ { GLubyte *paramString_ptr = (GLubyte *)env->GetDirectBufferAddress(paramString) + paramStringOffset; glGetProgramStringNV(programID, parameterName, paramString_ptr); - CHECK_GL_ERROR + } /* @@ -136,7 +136,7 @@ (JNIEnv * env, jclass clazz, jint programID) { GLboolean result = glIsProgramNV(programID); - CHECK_GL_ERROR + return result; } @@ -150,7 +150,7 @@ GLuint *programIDs_ptr = (GLuint *)env->GetDirectBufferAddress(programIDs) + programIDsOffset; GLubyte *programResidences_ptr = (GLubyte *)env->GetDirectBufferAddress(programResidences) + programResidencesOffset; GLboolean result = glAreProgramsResidentNV(n, programIDs_ptr, programResidences_ptr); - CHECK_GL_ERROR + return result; } @@ -163,7 +163,7 @@ { GLuint *programIDs_ptr = (GLuint *)env->GetDirectBufferAddress(programIDs) + programIDsOffset; glRequestResidentProgramsNV(n, programIDs_ptr); - CHECK_GL_ERROR + } void extgl_InitNVProgram(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVRegisterCombiners.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVRegisterCombiners.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVRegisterCombiners.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glCombinerParameterfvNVPROC) (GLenum pname, const GLfloat *params); typedef void (APIENTRY * glCombinerParameterfNVPROC) (GLenum pname, GLfloat param); @@ -73,7 +73,7 @@ (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glCombinerParameterfNV(pname, param); - CHECK_GL_ERROR + } /* @@ -85,7 +85,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glCombinerParameterfvNV(pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ (JNIEnv * env, jclass clazz, jint pname, jint param) { glCombinerParameteriNV(pname, param); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glCombinerParameterivNV(pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ (JNIEnv * env, jclass clazz, jint stage, jint portion, jint variable, jint input, jint mapping, jint componentUsage) { glCombinerInputNV(stage, portion, variable, input, mapping, componentUsage); - CHECK_GL_ERROR + } /* @@ -130,7 +130,7 @@ (JNIEnv * env, jclass clazz, jint stage, jint portion, jint abOutput, jint cdOutput, jint sumOutput, jint scale, jint bias, jboolean abDotProduct, jboolean cdDotProduct, jboolean muxSum) { glCombinerOutputNV(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum); - CHECK_GL_ERROR + } /* @@ -141,7 +141,7 @@ (JNIEnv * env, jclass clazz, jint variable, jint input, jint mapping, jint componentUsage) { glFinalCombinerInputNV(variable, input, mapping, componentUsage); - CHECK_GL_ERROR + } /* @@ -153,7 +153,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetCombinerInputParameterfvNV(stage, portion, variable, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -165,7 +165,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetCombinerInputParameterivNV(stage, portion, variable, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -177,7 +177,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetCombinerOutputParameterfvNV(stage, portion, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -189,7 +189,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + pfParams_offset; glGetCombinerOutputParameterivNV(stage, portion, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -201,7 +201,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetFinalCombinerInputParameterfvNV(variable, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -213,7 +213,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetFinalCombinerInputParameterivNV(variable, pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVRegisterCombiners(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVRegisterCombiners2.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVRegisterCombiners2.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVRegisterCombiners2.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glCombinerStageParameterfvNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); typedef void (APIENTRY * glGetCombinerStageParameterfvNVPROC) (GLenum stage, GLenum pname, GLfloat *params); @@ -52,7 +52,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glCombinerStageParameterfvNV(stage, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -64,7 +64,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetCombinerStageParameterfvNV(stage, pname, pfParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVRegisterCombiners2(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_NVVertexArrayRange.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVVertexArrayRange.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVVertexArrayRange.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void (APIENTRY * glFlushVertexArrayRangeNVPROC) (void); typedef void (APIENTRY * glVertexArrayRangeNVPROC) (GLsizei size, const GLvoid *pointer); @@ -72,7 +72,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glVertexArrayRangeNV(size, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -83,7 +83,7 @@ (JNIEnv * env, jclass clazz) { glFlushVertexArrayRangeNV(); - CHECK_GL_ERROR + } #ifdef _X11 Index: org_lwjgl_opengl_NVVertexProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVVertexProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_NVVertexProgram.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void (APIENTRY * glExecuteProgramNVPROC) (GLenum target, GLuint id, const GLfloat *params); typedef void (APIENTRY * glGetProgramParameterfvNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); @@ -104,7 +104,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glExecuteProgramNV(target, id, params_ptr); - CHECK_GL_ERROR + } /* @@ -116,7 +116,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramParameterfvNV(target, index, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -128,7 +128,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetTrackMatrixivNV(target, address, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -140,7 +140,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribfvNV(index, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -152,7 +152,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribivNV(index, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -164,7 +164,7 @@ { void *address; glGetVertexAttribPointervNV((GLuint)index, (GLuint)parameterName, &address); - CHECK_GL_ERROR + return safeNewBuffer(env, address, size); } @@ -176,7 +176,7 @@ (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramParameter4fNV(target, index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -188,7 +188,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glProgramParameters4fvNV(target, index, count, params_ptr); - CHECK_GL_ERROR + } /* @@ -199,7 +199,7 @@ (JNIEnv * env, jclass clazz, jint target, jint address, jint matrix, jint transform) { glTrackMatrixNV(target, address, matrix, transform); - CHECK_GL_ERROR + } /* @@ -211,7 +211,7 @@ { GLvoid *buffer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(buffer) + bufferOffset); glVertexAttribPointerNV(index, size, type, stride, buffer_ptr); - CHECK_GL_ERROR + } /* @@ -222,7 +222,7 @@ (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jint stride, jint bufferOffset) { glVertexAttribPointerNV(index, size, type, stride, (GLvoid *)bufferOffset); - CHECK_GL_ERROR + } /* @@ -233,7 +233,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1sNV(index, x); - CHECK_GL_ERROR + } /* @@ -244,7 +244,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x) { glVertexAttrib1fNV(index, x); - CHECK_GL_ERROR + } /* @@ -255,7 +255,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2sNV(index, x, y); - CHECK_GL_ERROR + } /* @@ -266,7 +266,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y) { glVertexAttrib2fNV(index, x, y); - CHECK_GL_ERROR + } /* @@ -277,7 +277,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3sNV(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -288,7 +288,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z) { glVertexAttrib3fNV(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -299,7 +299,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { glVertexAttrib4sNV(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -310,7 +310,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glVertexAttrib4fNV(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -321,7 +321,7 @@ (JNIEnv * env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w) { glVertexAttrib4ubNV(index, x, y, z, w); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1svNV @@ -329,7 +329,7 @@ { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs1svNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1fvNV @@ -337,7 +337,7 @@ { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs1fvNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2svNV @@ -345,7 +345,7 @@ { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs2svNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2fvNV @@ -353,7 +353,7 @@ { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs2fvNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3svNV @@ -361,7 +361,7 @@ { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs3svNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3fvNV @@ -369,7 +369,7 @@ { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs3fvNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4svNV @@ -377,7 +377,7 @@ { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs4svNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4fvNV @@ -385,7 +385,7 @@ { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs4fvNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4ubvNV @@ -393,7 +393,7 @@ { GLubyte *v_ptr = (GLubyte *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs4ubvNV(index, n, v_ptr); - CHECK_GL_ERROR + } void extgl_InitNVVertexProgram(JNIEnv *env, jobject ext_set) |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7407/src/native/common/ext Modified Files: org_lwjgl_opengl_EXTBlendFuncSeparate.cpp org_lwjgl_opengl_EXTCompiledVertexArray.cpp org_lwjgl_opengl_EXTDrawRangeElements.cpp org_lwjgl_opengl_EXTFogCoord.cpp org_lwjgl_opengl_EXTMultiDrawArrays.cpp org_lwjgl_opengl_EXTPointParameters.cpp org_lwjgl_opengl_EXTSecondaryColor.cpp org_lwjgl_opengl_EXTStencilTwoSide.cpp org_lwjgl_opengl_EXTVertexShader.cpp org_lwjgl_opengl_EXTVertexWeighting.cpp Log Message: Removed GL_CHECK_ERROR Index: org_lwjgl_opengl_EXTBlendFuncSeparate.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTBlendFuncSeparate.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTBlendFuncSeparate.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glBlendFuncSeparateEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); @@ -49,7 +49,7 @@ (JNIEnv * env, jclass clazz, jint sfactorRGB, jint dfactorRGB, jint sfactorAlpha, jint dfactorAlpha) { glBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); - CHECK_GL_ERROR + } void extgl_InitEXTBlendFuncSeparate(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTCompiledVertexArray.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTCompiledVertexArray.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTCompiledVertexArray.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glLockArraysEXTPROC) (GLint first, GLsizei count); typedef void (APIENTRY * glUnlockArraysEXTPROC) (); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jint first, jint count) { glLockArraysEXT(first, count); - CHECK_GL_ERROR + } /* @@ -62,7 +62,7 @@ (JNIEnv * env, jclass clazz) { glUnlockArraysEXT(); - CHECK_GL_ERROR + } void extgl_InitEXTCompiledVertexArray(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTDrawRangeElements.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTDrawRangeElements.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTDrawRangeElements.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glDrawRangeElementsEXTPROC) ( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); @@ -50,7 +50,7 @@ { GLvoid *pIndices_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset); glDrawRangeElementsEXT(mode, start, end, count, type, pIndices_ptr); - CHECK_GL_ERROR + } /* @@ -61,7 +61,7 @@ (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint buffer_offset) { glDrawRangeElementsEXT(mode, start, end, count, type, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } void extgl_InitEXTDrawRangeElements(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTFogCoord.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTFogCoord.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTFogCoord.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glFogCoordfEXTPROC) (GLfloat coord); typedef void (APIENTRY * glFogCoordPointerEXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jfloat coord) { glFogCoordfEXT(coord); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glFogCoordPointerEXT(type, stride, data_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ (JNIEnv * env, jclass clazz, jint type, jint stride, jint buffer_offset) { glFogCoordPointerEXT(type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } void extgl_InitEXTFogCoord(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTMultiDrawArrays.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTMultiDrawArrays.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTMultiDrawArrays.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glMultiDrawArraysEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); @@ -51,7 +51,7 @@ GLint *piFirst_ptr = (GLint *)env->GetDirectBufferAddress(piFirst) + piFirst_offset; GLint *piCount_ptr = (GLint *)env->GetDirectBufferAddress(piCount) + piCount_offset; glMultiDrawArraysEXT(mode, piFirst_ptr, piCount_ptr, primcount); - CHECK_GL_ERROR + } void extgl_InitEXTMultiDrawArrays(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTPointParameters.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTPointParameters.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTPointParameters.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPointParameterfEXTPROC) (GLenum pname, GLfloat param); typedef void (APIENTRY * glPointParameterfvEXTPROC) (GLenum pname, const GLfloat *params); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPointParameterfEXT(pname, param); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glPointParameterfvEXT(pname, pfParams_ptr); - CHECK_GL_ERROR + } void extgl_InitEXTPointParameters(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTSecondaryColor.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTSecondaryColor.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTSecondaryColor.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glSecondaryColor3bEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); typedef void (APIENTRY * glSecondaryColor3fEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); @@ -55,7 +55,7 @@ (JNIEnv * env, jclass clazz, jbyte red, jbyte green, jbyte blue) { glSecondaryColor3bEXT(red, green, blue); - CHECK_GL_ERROR + } /* @@ -66,7 +66,7 @@ (JNIEnv * env, jclass clazz, jfloat red, jfloat green, jfloat blue) { glSecondaryColor3fEXT(red, green, blue); - CHECK_GL_ERROR + } /* @@ -77,7 +77,7 @@ (JNIEnv * env, jclass clazz, jbyte red, jbyte green, jbyte blue) { glSecondaryColor3ubEXT(red, green, blue); - CHECK_GL_ERROR + } /* @@ -89,7 +89,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glSecondaryColorPointerEXT(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -100,7 +100,7 @@ (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glSecondaryColorPointerEXT(size, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } void extgl_InitEXTSecondaryColor(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTStencilTwoSide.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTStencilTwoSide.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTStencilTwoSide.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glActiveStencilFaceEXTPROC) (GLenum face); @@ -49,7 +49,7 @@ (JNIEnv * env, jclass clazz, jint face) { glActiveStencilFaceEXT(face); - CHECK_GL_ERROR + } void extgl_InitEXTStencilTwoSide(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTVertexShader.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTVertexShader.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTVertexShader.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void (APIENTRY * glBeginVertexShaderEXTPROC) (); typedef void (APIENTRY * glEndVertexShaderEXTPROC) (); @@ -129,7 +129,7 @@ (JNIEnv * env, jclass clazz) { glBeginVertexShaderEXT(); - CHECK_GL_ERROR + } /* @@ -140,7 +140,7 @@ (JNIEnv * env, jclass clazz) { glEndVertexShaderEXT(); - CHECK_GL_ERROR + } /* @@ -151,7 +151,7 @@ (JNIEnv * env, jclass clazz, jint id) { glBindVertexShaderEXT(id); - CHECK_GL_ERROR + } /* @@ -162,7 +162,7 @@ (JNIEnv * env, jclass clazz, jint range) { GLuint result = glGenVertexShadersEXT(range); - CHECK_GL_ERROR + return result; } @@ -174,7 +174,7 @@ (JNIEnv * env, jclass clazz, jint id) { glDeleteVertexShaderEXT(id); - CHECK_GL_ERROR + } /* @@ -185,7 +185,7 @@ (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1) { glShaderOp1EXT(op, res, arg1); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1, jint arg2) { glShaderOp2EXT(op, res, arg1, arg2); - CHECK_GL_ERROR + } /* @@ -207,7 +207,7 @@ (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1, jint arg2, jint arg3) { glShaderOp3EXT(op, res, arg1, arg2, arg3); - CHECK_GL_ERROR + } /* @@ -218,7 +218,7 @@ (JNIEnv * env, jclass clazz, jint res, jint in, jint outX, jint outY, jint outZ, jint outW) { glSwizzleEXT(res, in, outX, outY, outZ, outW); - CHECK_GL_ERROR + } /* @@ -229,7 +229,7 @@ (JNIEnv * env, jclass clazz, jint res, jint in, jint outX, jint outY, jint outZ, jint outW) { glWriteMaskEXT(res, in, outX, outY, outZ, outW); - CHECK_GL_ERROR + } /* @@ -240,7 +240,7 @@ (JNIEnv * env, jclass clazz, jint res, jint src, jint num) { glInsertComponentEXT(res, src, num); - CHECK_GL_ERROR + } /* @@ -251,7 +251,7 @@ (JNIEnv * env, jclass clazz, jint res, jint src, jint num) { glExtractComponentEXT(res, src, num); - CHECK_GL_ERROR + } /* @@ -262,7 +262,7 @@ (JNIEnv * env, jclass clazz, jint dataType, jint storageType, jint range, jint components) { GLuint result = glGenSymbolsEXT(dataType, storageType, range, components); - CHECK_GL_ERROR + return result; } @@ -275,7 +275,7 @@ { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glSetInvariantEXT(id, type, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -287,7 +287,7 @@ { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glSetLocalConstantEXT(id, type, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -299,7 +299,7 @@ { GLbyte *pAddr_ptr = (GLbyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset; glVariantbvEXT(id, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -311,7 +311,7 @@ { GLshort *psAddr_ptr = (GLshort *)env->GetDirectBufferAddress(psAddr) + psAddr_offset; glVariantsvEXT(id, psAddr_ptr); - CHECK_GL_ERROR + } /* @@ -323,7 +323,7 @@ { GLfloat *pfAddr_ptr = (GLfloat *)env->GetDirectBufferAddress(pfAddr) + pfAddr_offset; glVariantfvEXT(id, pfAddr_ptr); - CHECK_GL_ERROR + } /* @@ -335,7 +335,7 @@ { GLint *piAddr_ptr = (GLint *)env->GetDirectBufferAddress(piAddr) + piAddr_offset; glVariantivEXT(id, piAddr_ptr); - CHECK_GL_ERROR + } /* @@ -347,7 +347,7 @@ { GLubyte *pAddr_ptr = (GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset; glVariantubvEXT(id, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -359,7 +359,7 @@ { GLushort *psAddr_ptr = (GLushort *)env->GetDirectBufferAddress(psAddr) + psAddr_offset; glVariantusvEXT(id, psAddr_ptr); - CHECK_GL_ERROR + } /* @@ -371,7 +371,7 @@ { GLuint *piAddr_ptr = (GLuint *)env->GetDirectBufferAddress(piAddr) + piAddr_offset; glVariantuivEXT(id, piAddr_ptr); - CHECK_GL_ERROR + } /* @@ -383,7 +383,7 @@ { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glVariantPointerEXT(id, type, stride, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -394,7 +394,7 @@ (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jint buffer_offset) { glVariantPointerEXT(id, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } /* @@ -405,7 +405,7 @@ (JNIEnv * env, jclass clazz, jint id) { glEnableVariantClientStateEXT(id); - CHECK_GL_ERROR + } /* @@ -416,7 +416,7 @@ (JNIEnv * env, jclass clazz, jint id) { glDisableVariantClientStateEXT(id); - CHECK_GL_ERROR + } /* @@ -427,7 +427,7 @@ (JNIEnv * env, jclass clazz, jint light, jint value) { GLuint result = glBindLightParameterEXT(light, value); - CHECK_GL_ERROR + return result; } @@ -439,7 +439,7 @@ (JNIEnv * env, jclass clazz, jint face, jint value) { GLuint result = glBindMaterialParameterEXT(face, value); - CHECK_GL_ERROR + return result; } @@ -451,7 +451,7 @@ (JNIEnv * env, jclass clazz, jint unit, jint coord, jint value) { GLuint result = glBindTexGenParameterEXT(unit, coord, value); - CHECK_GL_ERROR + return result; } @@ -463,7 +463,7 @@ (JNIEnv * env, jclass clazz, jint unit, jint value) { GLuint result = glBindTextureUnitParameterEXT(unit, value); - CHECK_GL_ERROR + return result; } @@ -475,7 +475,7 @@ (JNIEnv * env, jclass clazz, jint value) { GLuint result = glBindParameterEXT(value); - CHECK_GL_ERROR + return result; } @@ -487,7 +487,7 @@ (JNIEnv * env, jclass clazz, jint id, jint cap) { GLboolean result = glIsVariantEnabledEXT(id, cap); - CHECK_GL_ERROR + return result; } @@ -500,7 +500,7 @@ { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetVariantBooleanvEXT(id, value, pbData_ptr); - CHECK_GL_ERROR + } /* @@ -512,7 +512,7 @@ { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetVariantIntegervEXT(id, value, piData_ptr); - CHECK_GL_ERROR + } /* @@ -524,7 +524,7 @@ { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetVariantFloatvEXT(id, value, pfData_ptr); - CHECK_GL_ERROR + } /* @@ -536,7 +536,7 @@ { void *address; glGetVariantPointervEXT((GLuint)id, (GLuint)value, &address); - CHECK_GL_ERROR + return safeNewBuffer(env, address, size); } @@ -549,7 +549,7 @@ { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetInvariantBooleanvEXT(id, value, pbData_ptr); - CHECK_GL_ERROR + } /* @@ -561,7 +561,7 @@ { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetInvariantIntegervEXT(id, value, piData_ptr); - CHECK_GL_ERROR + } /* @@ -573,7 +573,7 @@ { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetInvariantFloatvEXT(id, value, pfData_ptr); - CHECK_GL_ERROR + } /* @@ -585,7 +585,7 @@ { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetLocalConstantBooleanvEXT(id, value, pbData_ptr); - CHECK_GL_ERROR + } /* @@ -597,7 +597,7 @@ { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetLocalConstantIntegervEXT(id, value, piData_ptr); - CHECK_GL_ERROR + } /* @@ -609,7 +609,7 @@ { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetLocalConstantFloatvEXT(id, value, pfData_ptr); - CHECK_GL_ERROR + } void extgl_InitEXTVertexShader(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_EXTVertexWeighting.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTVertexWeighting.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_EXTVertexWeighting.cpp 7 Mar 2004 16:01:45 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glVertexWeightfEXTPROC) (GLfloat weight); typedef void (APIENTRY * glVertexWeightPointerEXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jfloat weight) { glVertexWeightfEXT(weight); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glVertexWeightPointerEXT(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glVertexWeightPointerEXT(size, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } void extgl_InitEXTVertexWeighting(JNIEnv *env, jobject ext_set) |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/arb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7407/src/native/common/arb Modified Files: org_lwjgl_opengl_ARBImaging.cpp org_lwjgl_opengl_ARBMatrixPalette.cpp org_lwjgl_opengl_ARBMultisample.cpp org_lwjgl_opengl_ARBMultitexture.cpp org_lwjgl_opengl_ARBOcclusionQuery.cpp org_lwjgl_opengl_ARBPointParameters.cpp org_lwjgl_opengl_ARBProgram.cpp org_lwjgl_opengl_ARBShaderObjects.cpp org_lwjgl_opengl_ARBTextureCompression.cpp org_lwjgl_opengl_ARBTransposeMatrix.cpp org_lwjgl_opengl_ARBVertexBlend.cpp org_lwjgl_opengl_ARBVertexBufferObject.cpp org_lwjgl_opengl_ARBVertexProgram.cpp org_lwjgl_opengl_ARBVertexShader.cpp org_lwjgl_opengl_ARBWindowPos.cpp Log Message: Removed GL_CHECK_ERROR Index: org_lwjgl_opengl_ARBImaging.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBImaging.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBImaging.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -39,7 +39,7 @@ * @version $Revision$ */ -#include "checkGLerror.h" + #include "extgl.h" typedef void (APIENTRY * glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ); @@ -122,7 +122,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glColorTable(target, internalFormat, width, format, type, address); - CHECK_GL_ERROR + } /* @@ -135,7 +135,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glColorSubTable(target, start, count, format, type, address); - CHECK_GL_ERROR + } /* @@ -148,7 +148,7 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetColorTable(target, format, type, address); - CHECK_GL_ERROR + } /* @@ -161,7 +161,7 @@ { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetColorTableParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -174,7 +174,7 @@ { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetColorTableParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -187,7 +187,7 @@ { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glColorTableParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -200,7 +200,7 @@ { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glColorTableParameterfv(target, pname, address); - CHECK_GL_ERROR + } @@ -213,7 +213,7 @@ (JNIEnv *env, jclass clazz, jint target, jint start, jint x, jint y, jint width) { glCopyColorSubTable(target, start, x, y, width); - CHECK_GL_ERROR + } @@ -226,7 +226,7 @@ (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width) { glCopyColorTable(target, internalformat, x, y, width); - CHECK_GL_ERROR + } @@ -239,7 +239,7 @@ (JNIEnv *env, jclass clazz, jint mode) { glBlendEquation(mode); - CHECK_GL_ERROR + } /* @@ -249,7 +249,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glBlendColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -261,7 +261,7 @@ (JNIEnv *env, jclass clazz, jint target, jint width, jint internalformat, jboolean sink) { glHistogram(target, width, internalformat, sink); - CHECK_GL_ERROR + } /* @@ -273,7 +273,7 @@ (JNIEnv *env, jclass clazz, jint target) { glResetHistogram(target); - CHECK_GL_ERROR + } /* @@ -286,7 +286,7 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetHistogram(target, reset, format, type, address); - CHECK_GL_ERROR + } /* @@ -299,7 +299,7 @@ { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetHistogramParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -312,7 +312,7 @@ { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetHistogramParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -324,7 +324,7 @@ (JNIEnv *env, jclass clazz, jint target, jint internalformat, jboolean sink) { glMinmax(target, internalformat, sink); - CHECK_GL_ERROR + } /* @@ -336,7 +336,7 @@ (JNIEnv *env, jclass clazz, jint target) { glResetMinmax(target); - CHECK_GL_ERROR + } /* @@ -349,7 +349,7 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetMinmax(target, reset, format, type, address); - CHECK_GL_ERROR + } /* @@ -362,7 +362,7 @@ { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetMinmaxParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -375,7 +375,7 @@ { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetMinmaxParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -388,7 +388,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glConvolutionFilter1D(target, internalformat, width, format, type, address); - CHECK_GL_ERROR + } /* @@ -401,7 +401,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glConvolutionFilter2D(target, internalformat, width, height, format, type, address); - CHECK_GL_ERROR + } /* @@ -413,7 +413,7 @@ (JNIEnv *env, jclass clazz, jint target, jint pname, jfloat params) { glConvolutionParameterf(target, pname, params); - CHECK_GL_ERROR + } /* @@ -426,7 +426,7 @@ { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glConvolutionParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -438,7 +438,7 @@ (JNIEnv *env, jclass clazz, jint target, jint pname, jint params) { glConvolutionParameteri(target, pname, params); - CHECK_GL_ERROR + } /* @@ -451,7 +451,7 @@ { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glConvolutionParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -463,7 +463,7 @@ (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width) { glCopyConvolutionFilter1D(target, internalformat, x, y, width); - CHECK_GL_ERROR + } /* @@ -475,7 +475,7 @@ (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width, jint height) { glCopyConvolutionFilter2D(target, internalformat, x, y, width, height); - CHECK_GL_ERROR + } /* @@ -488,7 +488,7 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetConvolutionFilter(target, format, type, address); - CHECK_GL_ERROR + } /* @@ -501,7 +501,7 @@ { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetConvolutionParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -514,7 +514,7 @@ { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetConvolutionParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -528,7 +528,7 @@ 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 + } /* @@ -543,7 +543,7 @@ 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 + } void extgl_InitARBImaging(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBMatrixPalette.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBMatrixPalette.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBMatrixPalette.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glCurrentPaletteMatrixARBPROC) (GLint index); typedef void (APIENTRY * glMatrixIndexubvARBPROC) (GLint size, GLubyte *indices); @@ -57,7 +57,7 @@ (JNIEnv * env, jclass clazz, jint index) { glCurrentPaletteMatrixARB(index); - CHECK_GL_ERROR + } /* @@ -69,7 +69,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glMatrixIndexPointerARB(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -80,7 +80,7 @@ (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glMatrixIndexPointerARB(size, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ { GLubyte *pIndices_ptr = (GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset; glMatrixIndexubvARB(size, pIndices_ptr); - CHECK_GL_ERROR + } /* @@ -104,7 +104,7 @@ { GLuint *piIndices_ptr = (GLuint *)env->GetDirectBufferAddress(piIndices) + piIndices_offset; glMatrixIndexuivARB(size, piIndices_ptr); - CHECK_GL_ERROR + } /* @@ -116,7 +116,7 @@ { GLushort *psIndices_ptr = (GLushort *)env->GetDirectBufferAddress(psIndices) + psIndices_offset; glMatrixIndexusvARB(size, psIndices_ptr); - CHECK_GL_ERROR + } void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBMultisample.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBMultisample.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBMultisample.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glSampleCoverageARBPROC) (GLclampf value, GLboolean invert); @@ -49,7 +49,7 @@ (JNIEnv * env, jclass clazz, jfloat value, jboolean invert) { glSampleCoverageARB(value, invert); - CHECK_GL_ERROR + } void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBMultitexture.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBMultitexture.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBMultitexture.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glActiveTextureARBPROC) (GLenum texture ); typedef void (APIENTRY * glClientActiveTextureARBPROC) (GLenum texture ); @@ -75,7 +75,7 @@ (JNIEnv * env, jclass clazz, jint texture) { glClientActiveTextureARB(texture); - CHECK_GL_ERROR + } /* @@ -86,7 +86,7 @@ (JNIEnv * env, jclass clazz, jint texture) { glActiveTextureARB(texture); - CHECK_GL_ERROR + } /* @@ -97,7 +97,7 @@ (JNIEnv * env, jclass clazz, jint target, jfloat s) { glMultiTexCoord1fARB(target, s); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ (JNIEnv * env, jclass clazz, jint target, jint s) { glMultiTexCoord1iARB(target, s); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s) { glMultiTexCoord1sARB(target, s); - CHECK_GL_ERROR + } /* @@ -130,7 +130,7 @@ (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t) { glMultiTexCoord2fARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -141,7 +141,7 @@ (JNIEnv * env, jclass clazz, jint target, jint s, jint t) { glMultiTexCoord2iARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -152,7 +152,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { glMultiTexCoord2sARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -163,7 +163,7 @@ (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r) { glMultiTexCoord3fARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -174,7 +174,7 @@ (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r) { glMultiTexCoord3iARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -185,7 +185,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { glMultiTexCoord3sARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jfloat q) { glMultiTexCoord4fARB(target, s, t, r, q); - CHECK_GL_ERROR + } /* @@ -207,7 +207,7 @@ (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r, jint q) { glMultiTexCoord4iARB(target, s, t, r, q); - CHECK_GL_ERROR + } /* @@ -218,7 +218,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { glMultiTexCoord4sARB(target, s, t, r, q); - CHECK_GL_ERROR + } void extgl_InitARBMultitexture(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBOcclusionQuery.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBOcclusionQuery.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBOcclusionQuery.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glGenQueriesARBPROC) (GLsizei n, GLuint *ids); typedef void (APIENTRY * glDeleteQueriesARBPROC) (GLsizei n, const GLuint *ids); @@ -64,7 +64,7 @@ { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glGenQueriesARB(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -76,7 +76,7 @@ { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glDeleteQueriesARB(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -87,7 +87,7 @@ (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsQueryARB(id); - CHECK_GL_ERROR + return result; } @@ -99,7 +99,7 @@ (JNIEnv * env, jclass clazz, jint target, jint id) { glBeginQueryARB(target, id); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ (JNIEnv * env, jclass clazz, jint target) { glEndQueryARB(target); - CHECK_GL_ERROR + } /* @@ -122,7 +122,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryivARB(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -134,7 +134,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectivARB(id, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -146,7 +146,7 @@ { GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectuivARB(id, pname, params_ptr); - CHECK_GL_ERROR + } void extgl_InitARBOcclusionQuery(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBPointParameters.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBPointParameters.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBPointParameters.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPointParameterfARBPROC) (GLenum pname, GLfloat param); typedef void (APIENTRY * glPointParameterfvARBPROC) (GLenum pname, GLfloat *params); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPointParameterfARB(pname, param); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glPointParameterfvARB(pname, pfParams_ptr); - CHECK_GL_ERROR + } void extgl_InitARBPointParameters(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBProgram.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glProgramStringARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); typedef void (APIENTRY * glBindProgramARBPROC) (GLenum target, GLuint program); @@ -75,7 +75,7 @@ { GLvoid *string_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(string) + stringOffset); glProgramStringARB(target, format, length, string_ptr); - CHECK_GL_ERROR + } /* @@ -86,7 +86,7 @@ (JNIEnv * env, jclass clazz, jint target, jint program) { glBindProgramARB(target, program); - CHECK_GL_ERROR + } /* @@ -98,7 +98,7 @@ { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glDeleteProgramsARB(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glGenProgramsARB(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -121,7 +121,7 @@ (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramEnvParameter4fARB(target, index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -133,7 +133,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glProgramEnvParameter4fvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramLocalParameter4fARB(target, index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -156,7 +156,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glProgramLocalParameter4fvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -168,7 +168,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramEnvParameterfvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -180,7 +180,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramLocalParameterfvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -192,7 +192,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramivARB(target, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -204,7 +204,7 @@ { GLvoid *paramString_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(paramString) + paramStringOffset); glGetProgramStringARB(target, parameterName, paramString_ptr); - CHECK_GL_ERROR + } /* @@ -215,7 +215,7 @@ (JNIEnv * env, jclass clazz, jint program) { GLboolean result = glIsProgramARB(program); - CHECK_GL_ERROR + return result; } Index: org_lwjgl_opengl_ARBShaderObjects.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_ARBShaderObjects.cpp 7 Mar 2004 15:41:10 -0000 1.4 +++ org_lwjgl_opengl_ARBShaderObjects.cpp 7 Mar 2004 16:01:44 -0000 1.5 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef unsigned char GLcharARB; typedef unsigned int GLhandleARB; @@ -134,7 +134,7 @@ (JNIEnv * env, jclass clazz, jint obj) { glDeleteObjectARB(obj); - CHECK_GL_ERROR + } /* @@ -145,7 +145,7 @@ (JNIEnv * env, jclass clazz, jint pname) { GLhandleARB result = glGetHandleARB(pname); - CHECK_GL_ERROR + return result; } @@ -157,7 +157,7 @@ (JNIEnv * env, jclass clazz, jint containerObj, jint attachedObj) { glDetachObjectARB(containerObj, attachedObj); - CHECK_GL_ERROR + } /* @@ -168,7 +168,7 @@ (JNIEnv * env, jclass clazz, jint shaderType) { GLhandleARB result = glCreateShaderObjectARB(shaderType); - CHECK_GL_ERROR + return result; } @@ -213,7 +213,7 @@ (JNIEnv * env, jclass clazz, jint shaderObj) { glShaderSourceARB(shaderObj, sourceCount, (const GLcharARB **)sources, (const GLint *)sourcesLengths); - CHECK_GL_ERROR + } /* @@ -224,7 +224,7 @@ (JNIEnv * env, jclass clazz, jint shaderObj) { glCompileShaderARB(shaderObj); - CHECK_GL_ERROR + } /* @@ -235,7 +235,7 @@ (JNIEnv * env, jclass clazz) { GLuint result = glCreateProgramObjectARB(); - CHECK_GL_ERROR + return result; } @@ -247,7 +247,7 @@ (JNIEnv * env, jclass clazz, jint containerObj, jint obj) { glAttachObjectARB(containerObj, obj); - CHECK_GL_ERROR + } /* @@ -258,7 +258,7 @@ (JNIEnv * env, jclass clazz, jint programObj) { glLinkProgramARB(programObj); - CHECK_GL_ERROR + } /* @@ -269,7 +269,7 @@ (JNIEnv * env, jclass clazz, jint programObj) { glUseProgramObjectARB(programObj); - CHECK_GL_ERROR + } /* @@ -280,7 +280,7 @@ (JNIEnv * env, jclass clazz, jint programObj) { glValidateProgramARB(programObj); - CHECK_GL_ERROR + } /* @@ -291,7 +291,7 @@ (JNIEnv * env, jclass clazz, jint location, jfloat v0) { glUniform1fARB(location, v0); - CHECK_GL_ERROR + } /* @@ -302,7 +302,7 @@ (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1) { glUniform2fARB(location, v0, v1); - CHECK_GL_ERROR + } /* @@ -313,7 +313,7 @@ (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1, jfloat v2) { glUniform3fARB(location, v0, v1, v2); - CHECK_GL_ERROR + } /* @@ -324,7 +324,7 @@ (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1, jfloat v2, jfloat v3) { glUniform4fARB(location, v0, v1, v2, v3); - CHECK_GL_ERROR + } /* @@ -335,7 +335,7 @@ (JNIEnv * env, jclass clazz, jint location, jint v0) { glUniform1iARB(location, v0); - CHECK_GL_ERROR + } /* @@ -346,7 +346,7 @@ (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1) { glUniform2iARB(location, v0, v1); - CHECK_GL_ERROR + } /* @@ -357,7 +357,7 @@ (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1, jint v2) { glUniform3iARB(location, v0, v1, v2); - CHECK_GL_ERROR + } /* @@ -368,7 +368,7 @@ (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1, jint v2, jint v3) { glUniform4iARB(location, v0, v1, v2, v3); - CHECK_GL_ERROR + } /* @@ -380,7 +380,7 @@ { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform1fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -392,7 +392,7 @@ { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform2fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -404,7 +404,7 @@ { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform3fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -416,7 +416,7 @@ { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform4fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -428,7 +428,7 @@ { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform1ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -440,7 +440,7 @@ { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform2ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -452,7 +452,7 @@ { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform3ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -464,7 +464,7 @@ { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform4ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -476,7 +476,7 @@ { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix2fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -488,7 +488,7 @@ { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix3fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -500,7 +500,7 @@ { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix4fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -512,7 +512,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetObjectParameterfvARB(obj, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -524,7 +524,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetObjectParameterivARB(obj, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -544,7 +544,7 @@ glGetInfoLogARB(obj, maxLength, length_ptr, infoLog_ptr); } - CHECK_GL_ERROR + } /* @@ -564,7 +564,7 @@ glGetAttachedObjectsARB(containerObj, maxCount, count_ptr, obj_ptr); } - CHECK_GL_ERROR + } /* @@ -576,7 +576,7 @@ { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLuint result = glGetUniformLocationARB(programObj, name_ptr); - CHECK_GL_ERROR + return result; } @@ -599,7 +599,7 @@ glGetActiveUniformARB(programObj, index, maxLength, length_ptr, size_ptr, type_ptr, name_ptr); } - CHECK_GL_ERROR + } /* @@ -611,7 +611,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetUniformfvARB(programObj, location, params_ptr); - CHECK_GL_ERROR + } /* @@ -623,7 +623,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetUniformivARB(programObj, location, params_ptr); - CHECK_GL_ERROR + } /* @@ -642,7 +642,7 @@ glGetShaderSourceARB(obj, maxLength, length_ptr, source_ptr); } - CHECK_GL_ERROR + } void extgl_InitARBShaderObjects(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBTextureCompression.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBTextureCompression.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBTextureCompression.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glCompressedTexImage1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data ); typedef void (APIENTRY * glCompressedTexImage2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data ); @@ -62,7 +62,7 @@ { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -86,7 +86,7 @@ { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -98,7 +98,7 @@ { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -122,7 +122,7 @@ { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -134,7 +134,7 @@ { GLvoid *pImg_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pImg) + pImg_offset); glGetCompressedTexImageARB(target, lod, pImg_ptr); - CHECK_GL_ERROR + } void extgl_InitARBTextureCompression(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBTransposeMatrix.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBTransposeMatrix.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBTransposeMatrix.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glLoadTransposeMatrixfARBPROC) (const GLfloat m[16] ); typedef void (APIENTRY * glMultTransposeMatrixfARBPROC) (const GLfloat m[16] ); @@ -52,7 +52,7 @@ { GLfloat *pfMtx_ptr = (GLfloat *)env->GetDirectBufferAddress(pfMtx) + pfMtx_offset; glLoadTransposeMatrixfARB(pfMtx_ptr); - CHECK_GL_ERROR + } /* @@ -64,7 +64,7 @@ { GLfloat *pfMtx_ptr = (GLfloat *)env->GetDirectBufferAddress(pfMtx) + pfMtx_offset; glMultTransposeMatrixfARB(pfMtx_ptr); - CHECK_GL_ERROR + } void extgl_InitARBTransposeMatrix(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBVertexBlend.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBVertexBlend.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBVertexBlend.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glWeightbvARBPROC) (GLint size, GLbyte *weights); typedef void (APIENTRY * glWeightsvARBPROC) (GLint size, GLshort *weights); @@ -66,7 +66,7 @@ { GLbyte *pWeights_ptr = (GLbyte *)env->GetDirectBufferAddress(pWeights) + pWeights_offset; glWeightbvARB(size, pWeights_ptr); - CHECK_GL_ERROR + } /* @@ -78,7 +78,7 @@ { GLfloat *pfWeights_ptr = (GLfloat *)env->GetDirectBufferAddress(pfWeights) + pfWeights_offset; glWeightfvARB(size, pfWeights_ptr); - CHECK_GL_ERROR + } /* @@ -90,7 +90,7 @@ { GLint *piWeights_ptr = (GLint *)env->GetDirectBufferAddress(piWeights) + piWeights_offset; glWeightivARB(size, piWeights_ptr); - CHECK_GL_ERROR + } /* @@ -102,7 +102,7 @@ { GLshort *psWeights_ptr = (GLshort *)env->GetDirectBufferAddress(psWeights) + psWeights_offset; glWeightsvARB(size, psWeights_ptr); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ { GLubyte *pWeights_ptr = (GLubyte *)env->GetDirectBufferAddress(pWeights) + pWeights_offset; glWeightubvARB(size, pWeights_ptr); - CHECK_GL_ERROR + } /* @@ -126,7 +126,7 @@ { GLuint *piWeights_ptr = (GLuint *)env->GetDirectBufferAddress(piWeights) + piWeights_offset; glWeightuivARB(size, piWeights_ptr); - CHECK_GL_ERROR + } /* @@ -138,7 +138,7 @@ { GLushort *psWeights_ptr = (GLushort *)env->GetDirectBufferAddress(psWeights) + psWeights_offset; glWeightusvARB(size, psWeights_ptr); - CHECK_GL_ERROR + } /* @@ -150,7 +150,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glWeightPointerARB(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -161,7 +161,7 @@ (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glWeightPointerARB(size, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } /* @@ -172,7 +172,7 @@ (JNIEnv * env, jclass clazz, jint count) { glVertexBlendARB(count); - CHECK_GL_ERROR + } void extgl_InitARBVertexBlend(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBVertexBufferObject.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_ARBVertexBufferObject.cpp 7 Mar 2004 15:41:10 -0000 1.4 +++ org_lwjgl_opengl_ARBVertexBufferObject.cpp 7 Mar 2004 16:01:44 -0000 1.5 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef int GLintptrARB; typedef unsigned int GLsizeiptrARB; @@ -72,7 +72,7 @@ (JNIEnv * env, jclass clazz, jint target, jint buffer) { glBindBufferARB(target, buffer); - CHECK_GL_ERROR + } /* @@ -84,7 +84,7 @@ { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glDeleteBuffersARB(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glGenBuffersARB(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -107,7 +107,7 @@ (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsBufferARB(buffer); - CHECK_GL_ERROR + return result; } @@ -120,7 +120,7 @@ { GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset); glBufferDataARB(target, size, data_ptr, usage); - CHECK_GL_ERROR + } /* @@ -132,7 +132,7 @@ { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glBufferSubDataARB(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glGetBufferSubDataARB(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -155,7 +155,7 @@ (JNIEnv * env, jclass clazz, jint target, jint access, jint size, jobject oldBuffer) { void *buffer_address = glMapBufferARB((GLenum)target, (GLenum)access); - CHECK_GL_ERROR + void *old_buffer_address = safeGetBufferAddress(env, oldBuffer, 0); if (old_buffer_address == buffer_address) return oldBuffer; @@ -171,7 +171,7 @@ (JNIEnv * env, jclass clazz, jint target) { GLboolean result = glUnmapBufferARB(target); - CHECK_GL_ERROR + return result; } @@ -184,7 +184,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + params_offset; glGetBufferParameterivARB(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ { void *pointer; glGetBufferPointervARB((GLenum)target, (GLenum)pname, &pointer); - CHECK_GL_ERROR + return safeNewBuffer(env, pointer, size); } Index: org_lwjgl_opengl_ARBVertexProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBVertexProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBVertexProgram.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void (APIENTRY * glVertexAttrib1sARBPROC) (GLuint index, GLshort x); typedef void (APIENTRY * glVertexAttrib1fARBPROC) (GLuint index, GLfloat x); @@ -100,7 +100,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1sARB(index, x); - CHECK_GL_ERROR + } /* @@ -111,7 +111,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x) { glVertexAttrib1fARB(index, x); - CHECK_GL_ERROR + } /* @@ -122,7 +122,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2sARB(index, x, y); - CHECK_GL_ERROR + } /* @@ -133,7 +133,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y) { glVertexAttrib2fARB(index, x, y); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3sARB(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -155,7 +155,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z) { glVertexAttrib3fARB(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -166,7 +166,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { glVertexAttrib4sARB(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -177,7 +177,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glVertexAttrib4fARB(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -188,7 +188,7 @@ (JNIEnv * env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w) { glVertexAttrib4NubARB(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -200,7 +200,7 @@ { GLvoid *buffer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(buffer) + bufferOffset); glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_ptr); - CHECK_GL_ERROR + } /* @@ -211,7 +211,7 @@ (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint bufferOffset) { glVertexAttribPointerARB(index, size, type, normalized, stride, (GLvoid *)bufferOffset); - CHECK_GL_ERROR + } /* @@ -222,7 +222,7 @@ (JNIEnv * env, jclass clazz, jint index) { glEnableVertexAttribArrayARB(index); - CHECK_GL_ERROR + } /* @@ -233,7 +233,7 @@ (JNIEnv * env, jclass clazz, jint index) { glDisableVertexAttribArrayARB(index); - CHECK_GL_ERROR + } /* @@ -245,7 +245,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribfvARB(index, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -257,7 +257,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribivARB(index, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -269,7 +269,7 @@ { void *address; glGetVertexAttribPointervARB((GLuint)index, (GLuint)pname, &address); - CHECK_GL_ERROR + return safeNewBuffer(env, address, size); } Index: org_lwjgl_opengl_ARBVertexShader.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBVertexShader.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBVertexShader.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef unsigned char GLcharARB; typedef unsigned int GLhandleARB; @@ -57,7 +57,7 @@ { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; glBindAttribLocationARB(programObj, index, name_ptr); - CHECK_GL_ERROR + } /* @@ -79,7 +79,7 @@ glGetActiveAttribARB(programObj, index, maxLength, length_ptr, size_ptr, type_ptr, name_ptr); } - CHECK_GL_ERROR + } /* @@ -91,7 +91,7 @@ { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLuint result = glGetAttribLocationARB(programObj, name_ptr); - CHECK_GL_ERROR + return result; } Index: org_lwjgl_opengl_ARBWindowPos.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBWindowPos.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBWindowPos.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glWindowPos2fARBPROC) (GLfloat x, GLfloat y); typedef void (APIENTRY * glWindowPos2iARBPROC) (GLint x, GLint y); @@ -59,7 +59,7 @@ (JNIEnv * env, jclass clazz, jfloat x, jfloat y) { glWindowPos2fARB(x, y); - CHECK_GL_ERROR + } /* @@ -70,7 +70,7 @@ (JNIEnv * env, jclass clazz, jint x, jint y) { glWindowPos2iARB(x, y); - CHECK_GL_ERROR + } /* @@ -81,7 +81,7 @@ (JNIEnv * env, jclass clazz, jshort x, jshort y) { glWindowPos2sARB(x, y); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ (JNIEnv * env, jclass clazz, jfloat x, jfloat y, jfloat z) { glWindowPos3fARB(x, y, z); - CHECK_GL_ERROR + } /* @@ -103,7 +103,7 @@ (JNIEnv * env, jclass clazz, jint x, jint y, jint z) { glWindowPos3iARB(x, y, z); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z) { glWindowPos3sARB(x, y, z); - CHECK_GL_ERROR + } void extgl_InitARBWindowPos(JNIEnv *env, jobject ext_set) |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ati In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7407/src/native/common/ati Modified Files: org_lwjgl_opengl_ATIDrawBuffers.cpp org_lwjgl_opengl_ATIElementArray.cpp org_lwjgl_opengl_ATIEnvmapBumpmap.cpp org_lwjgl_opengl_ATIFragmentShader.cpp org_lwjgl_opengl_ATIMapObjectBuffer.cpp org_lwjgl_opengl_ATIPnTriangles.cpp org_lwjgl_opengl_ATISeparateStencil.cpp org_lwjgl_opengl_ATIVertexArrayObject.cpp org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp org_lwjgl_opengl_ATIVertexStreams.cpp Log Message: Removed GL_CHECK_ERROR Index: org_lwjgl_opengl_ATIDrawBuffers.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIDrawBuffers.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIDrawBuffers.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glDrawBuffersATIPROC) (GLsizei n, const GLenum *bufs); @@ -50,7 +50,7 @@ { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffersOffset; glDrawBuffersATI(size, buffers_ptr); - CHECK_GL_ERROR + } void extgl_InitATIDrawBuffers(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATIElementArray.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIElementArray.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIElementArray.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glElementPointerATIPROC) (GLenum type, const GLvoid *pointer); typedef void (APIENTRY * glDrawElementArrayATIPROC) (GLenum mode, GLsizei count); @@ -54,7 +54,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glElementPointerATI(type, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -65,7 +65,7 @@ (JNIEnv * env, jclass clazz, jint type, jint buffer_offset) { glElementPointerATI(type, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } /* @@ -76,7 +76,7 @@ (JNIEnv * env, jclass clazz, jint mode, jint count) { glDrawElementArrayATI(mode, count); - CHECK_GL_ERROR + } /* @@ -87,7 +87,7 @@ (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count) { glDrawRangeElementArrayATI(mode, start, end, count); - CHECK_GL_ERROR + } void extgl_InitATIElementArray(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATIEnvmapBumpmap.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIEnvmapBumpmap.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIEnvmapBumpmap.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glTexBumpParameterivATIPROC) (GLenum pname, GLint *param); typedef void (APIENTRY * glTexBumpParameterfvATIPROC) (GLenum pname, GLfloat *param); @@ -56,7 +56,7 @@ { GLfloat *pfParam_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParam) + pfParam_offset; glTexBumpParameterfvATI(pname, pfParam_ptr); - CHECK_GL_ERROR + } /* @@ -68,7 +68,7 @@ { GLint *piParam_ptr = (GLint *)env->GetDirectBufferAddress(piParam) + piParam_offset; glTexBumpParameterivATI(pname, piParam_ptr); - CHECK_GL_ERROR + } /* @@ -80,7 +80,7 @@ { GLfloat *pfParam_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParam) + pfParam_offset; glGetTexBumpParameterfvATI(pname, pfParam_ptr); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ { GLint *piParam_ptr = (GLint *)env->GetDirectBufferAddress(piParam) + piParam_offset; glGetTexBumpParameterivATI(pname, piParam_ptr); - CHECK_GL_ERROR + } void extgl_InitATIEnvmapBumpmap(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATIFragmentShader.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIFragmentShader.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIFragmentShader.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef GLuint (APIENTRY * glGenFragmentShadersATIPROC) (GLuint range); typedef void (APIENTRY * glBindFragmentShaderATIPROC) (GLuint id); @@ -75,7 +75,7 @@ (JNIEnv * env, jclass clazz, jint range) { GLuint result = glGenFragmentShadersATI(range); - CHECK_GL_ERROR + return result; } @@ -87,7 +87,7 @@ (JNIEnv * env, jclass clazz, jint id) { glBindFragmentShaderATI(id); - CHECK_GL_ERROR + } /* @@ -98,7 +98,7 @@ (JNIEnv * env, jclass clazz, jint id) { glDeleteFragmentShaderATI(id); - CHECK_GL_ERROR + } /* @@ -109,7 +109,7 @@ (JNIEnv * env, jclass clazz) { glBeginFragmentShaderATI(); - CHECK_GL_ERROR + } /* @@ -120,7 +120,7 @@ (JNIEnv * env, jclass clazz) { glEndFragmentShaderATI(); - CHECK_GL_ERROR + } /* @@ -131,7 +131,7 @@ (JNIEnv * env, jclass clazz, jint dst, jint coord, jint swizzle) { glPassTexCoordATI(dst, coord, swizzle); - CHECK_GL_ERROR + } /* @@ -142,7 +142,7 @@ (JNIEnv * env, jclass clazz, jint dst, jint interp, jint swizzle) { glSampleMapATI(dst, interp, swizzle); - CHECK_GL_ERROR + } /* @@ -153,7 +153,7 @@ (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod) { glColorFragmentOp1ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod); - CHECK_GL_ERROR + } /* @@ -164,7 +164,7 @@ (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod) { glColorFragmentOp2ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod); - CHECK_GL_ERROR + } /* @@ -175,7 +175,7 @@ (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod, jint arg3, jint arg3Rep, jint arg3Mod) { glColorFragmentOp3ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); - CHECK_GL_ERROR + } /* @@ -186,7 +186,7 @@ (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod) { glAlphaFragmentOp1ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod); - CHECK_GL_ERROR + } /* @@ -197,7 +197,7 @@ (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod) { glAlphaFragmentOp2ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod); - CHECK_GL_ERROR + } /* @@ -208,7 +208,7 @@ (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod, jint arg3, jint arg3Rep, jint arg3Mod) { glAlphaFragmentOp3ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); - CHECK_GL_ERROR + } /* @@ -220,7 +220,7 @@ { GLfloat *pfValue_ptr = (GLfloat *)env->GetDirectBufferAddress(pfValue) + pfValue_offset; glSetFragmentShaderConstantATI(dst, pfValue_ptr); - CHECK_GL_ERROR + } void extgl_InitATIFragmentShader(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATIMapObjectBuffer.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIMapObjectBuffer.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIMapObjectBuffer.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void * (APIENTRY * glMapObjectBufferATIPROC) (GLuint buffer); typedef void (APIENTRY * glUnmapObjectBufferATIPROC) (GLuint buffer); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jint buffer, jint size, jobject oldBuffer) { void *buffer_address = glMapObjectBufferATI((GLenum)buffer); - CHECK_GL_ERROR + if (oldBuffer != NULL) { void *old_buffer_address = env->GetDirectBufferAddress(oldBuffer); if (old_buffer_address == buffer_address) @@ -69,7 +69,7 @@ (JNIEnv * env, jclass clazz, jint buffer) { glUnmapObjectBufferATI(buffer); - CHECK_GL_ERROR + } void extgl_InitATIMapObjectBuffer(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATIPnTriangles.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIPnTriangles.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIPnTriangles.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPNTrianglesiATIPROC) (GLenum pname, GLint param); typedef void (APIENTRY * glPNTrianglesfATIPROC) (GLenum pname, GLfloat param); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPNTrianglesfATI(pname, param); - CHECK_GL_ERROR + } /* @@ -62,7 +62,7 @@ (JNIEnv * env, jclass clazz, jint pname, jint param) { glPNTrianglesiATI(pname, param); - CHECK_GL_ERROR + } void extgl_InitATIPNTriangles(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATISeparateStencil.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATISeparateStencil.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATISeparateStencil.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glStencilOpSeparateATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); typedef void (APIENTRY * glStencilFuncSeparateATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); @@ -51,7 +51,7 @@ (JNIEnv * env, jclass clazz, jint face, jint sfail, jint dpfail, jint dppass) { glStencilOpSeparateATI(face, sfail, dpfail, dppass); - CHECK_GL_ERROR + } /* @@ -62,7 +62,7 @@ (JNIEnv * env, jclass clazz, jint frontfunc, jint backfunc, jint ref, jint mask) { glStencilFuncSeparateATI(frontfunc, backfunc, ref, mask); - CHECK_GL_ERROR + } void extgl_InitATISeparateStencil(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATIVertexArrayObject.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIVertexArrayObject.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIVertexArrayObject.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef GLuint (APIENTRY * glNewObjectBufferATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage); typedef GLboolean (APIENTRY * glIsObjectBufferATIPROC) (GLuint buffer); @@ -72,7 +72,7 @@ { GLvoid *pPointer_ptr = safeGetBufferAddress(env, pPointer, pPointer_offset); GLuint result = glNewObjectBufferATI(size, pPointer_ptr, usage); - CHECK_GL_ERROR + return result; } @@ -84,7 +84,7 @@ (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsObjectBufferATI(buffer); - CHECK_GL_ERROR + return result; } @@ -97,7 +97,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glUpdateObjectBufferATI(buffer, offset, size, pPointer_ptr, preserve); - CHECK_GL_ERROR + } /* @@ -109,7 +109,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetObjectBufferfvATI(buffer, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -121,7 +121,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetObjectBufferivATI(buffer, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -132,7 +132,7 @@ (JNIEnv * env, jclass clazz, jint buffer) { glFreeObjectBufferATI(buffer); - CHECK_GL_ERROR + } /* @@ -143,7 +143,7 @@ (JNIEnv * env, jclass clazz, jint array, jint size, jint type, jint stride, jint buffer, jint offset) { glArrayObjectATI(array, size, type, stride, buffer, offset); - CHECK_GL_ERROR + } /* @@ -155,7 +155,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetArrayObjectfvATI(array, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -167,7 +167,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetArrayObjectivATI(array, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -178,7 +178,7 @@ (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jint buffer, jint offset) { glVariantArrayObjectATI(id, type, stride, buffer, offset); - CHECK_GL_ERROR + } /* @@ -190,7 +190,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset_offset; glGetVariantArrayObjectfvATI(id, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -202,7 +202,7 @@ { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetVariantArrayObjectivATI(id, pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitATIVertexArrayObject(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glVertexAttribArrayObjectATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); typedef void (APIENTRY * glGetVertexAttribArrayObjectfvATIPROC) (GLuint index, GLenum pname, GLfloat *params); @@ -53,7 +53,7 @@ (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer, jint offset) { glVertexAttribArrayObjectATI(index, size, type, normalized, stride, buffer, offset); - CHECK_GL_ERROR + } /* @@ -65,7 +65,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribArrayObjectfvATI(index, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -77,7 +77,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribArrayObjectivATI(index, pname, params_ptr); - CHECK_GL_ERROR + } void extgl_InitATIVertexAttribArrayObject(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ATIVertexStreams.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ATIVertexStreams.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ATIVertexStreams.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glClientActiveVertexStreamATIPROC) (GLenum stream); typedef void (APIENTRY * glVertexBlendEnviATIPROC) (GLenum pname, GLint param); @@ -85,7 +85,7 @@ (JNIEnv * env, jclass clazz, jint stream, jfloat x) { glVertexStream1fATI(stream, x); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ (JNIEnv * env, jclass clazz, jint stream, jint x) { glVertexStream1iATI(stream, x); - CHECK_GL_ERROR + } /* @@ -107,7 +107,7 @@ (JNIEnv * env, jclass clazz, jint stream, jshort x) { glVertexStream1sATI(stream, x); - CHECK_GL_ERROR + } /* @@ -118,7 +118,7 @@ (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y) { glVertexStream2fATI(stream, x, y); - CHECK_GL_ERROR + } /* @@ -129,7 +129,7 @@ (JNIEnv * env, jclass clazz, jint stream, jint x, jint y) { glVertexStream2iATI(stream, x, y); - CHECK_GL_ERROR + } /* @@ -140,7 +140,7 @@ (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y) { glVertexStream2sATI(stream, x, y); - CHECK_GL_ERROR + } /* @@ -151,7 +151,7 @@ (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z) { glVertexStream3fATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -162,7 +162,7 @@ (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z) { glVertexStream3iATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -173,7 +173,7 @@ (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z) { glVertexStream3sATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -184,7 +184,7 @@ (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z, jfloat w) { glVertexStream4fATI(stream, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -195,7 +195,7 @@ (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z, jint w) { glVertexStream4iATI(stream, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -206,7 +206,7 @@ (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z, jshort w) { glVertexStream4sATI(stream, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -217,7 +217,7 @@ (JNIEnv * env, jclass clazz, jint stream, jbyte x, jbyte y, jbyte z) { glNormalStream3bATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -228,7 +228,7 @@ (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z) { glNormalStream3fATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -239,7 +239,7 @@ (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z) { glNormalStream3iATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -250,7 +250,7 @@ (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z) { glNormalStream3sATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -261,7 +261,7 @@ (JNIEnv * env, jclass clazz, jint stream) { glClientActiveVertexStreamATI(stream); - CHECK_GL_ERROR + } /* @@ -272,7 +272,7 @@ (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glVertexBlendEnvfATI(pname, param); - CHECK_GL_ERROR + } /* @@ -283,7 +283,7 @@ (JNIEnv * env, jclass clazz, jint pname, jint param) { glVertexBlendEnviATI(pname, param); - CHECK_GL_ERROR + } void extgl_InitATIVertexStreams(JNIEnv *env, jobject ext_set) |
|
From: <eli...@us...> - 2004-03-07 16:25:22
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7407/src/native/common Modified Files: org_lwjgl_opengl_GL11.cpp org_lwjgl_opengl_GL12.cpp org_lwjgl_opengl_GL13.cpp org_lwjgl_opengl_GL14.cpp org_lwjgl_opengl_GL15.cpp org_lwjgl_opengl_GLContext.cpp Removed Files: checkGLerror.h Log Message: Removed GL_CHECK_ERROR Index: org_lwjgl_opengl_GL11.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL11.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- org_lwjgl_opengl_GL11.cpp 7 Mar 2004 15:41:10 -0000 1.5 +++ org_lwjgl_opengl_GL11.cpp 7 Mar 2004 16:01:44 -0000 1.6 @@ -39,8 +39,8 @@ * @version $Revision$ */ -#include "checkGLerror.h" #include "extgl.h" +#include "common_tools.h" typedef void (APIENTRY * glAccumPROC) (GLenum op, GLfloat value); typedef void (APIENTRY * glAlphaFuncPROC) (GLenum func, GLclampf ref); @@ -454,7 +454,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glAccum(JNIEnv * env, jclass clazz, jint p0, jfloat p1) [...1606 lines suppressed...] /* @@ -2559,7 +2559,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glStencilMask(JNIEnv * env, jclass clazz, jint p0) { glStencilMask((GLint) p0); - CHECK_GL_ERROR + } /* @@ -2569,7 +2569,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glViewport(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3) { glViewport((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3); - CHECK_GL_ERROR + } void extgl_InitOpenGL1_1(JNIEnv *env) 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.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- org_lwjgl_opengl_GL12.cpp 7 Mar 2004 15:41:10 -0000 1.5 +++ org_lwjgl_opengl_GL12.cpp 7 Mar 2004 16:01:44 -0000 1.6 @@ -39,8 +39,8 @@ * @version $Revision$ */ -#include "checkGLerror.h" #include "extgl.h" +#include "common_tools.h" 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 ); @@ -62,7 +62,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glDrawRangeElements(mode, start, end, count, type, address); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ (JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint buffer_offset) { glDrawRangeElements(mode, start, end, count, type, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -87,7 +87,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glTexImage3D(target, level, internalformat, width, height, depth, border, format, type, address); - CHECK_GL_ERROR + } /* @@ -100,7 +100,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, address); - CHECK_GL_ERROR + } /* @@ -112,7 +112,7 @@ (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint x, jint y, jint width, jint height) { glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height); - CHECK_GL_ERROR + } void extgl_InitOpenGL1_2(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_GL13.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL13.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_GL13.cpp 7 Mar 2004 15:41:10 -0000 1.4 +++ org_lwjgl_opengl_GL13.cpp 7 Mar 2004 16:01:44 -0000 1.5 @@ -39,7 +39,6 @@ * @version $Revision$ */ -#include "checkGLerror.h" #include "extgl.h" typedef void (APIENTRY * glActiveTexturePROC) (GLenum texture ); @@ -85,7 +84,7 @@ (JNIEnv *env, jclass clazz, jint texture) { glActiveTexture(texture); - CHECK_GL_ERROR + } /* @@ -97,7 +96,7 @@ (JNIEnv *env, jclass clazz, jint texture) { glClientActiveTexture(texture); - CHECK_GL_ERROR + } /* @@ -110,7 +109,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage1D(target, level, internalformat, width, border, imagesize, address); - CHECK_GL_ERROR + } /* @@ -123,7 +122,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage2D(target, level, internalformat, width, height, border, imagesize, address); - CHECK_GL_ERROR + } /* @@ -136,7 +135,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imagesize, address); - CHECK_GL_ERROR + } /* @@ -149,7 +148,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage1D(target, level, xoffset, width, format, imagesize, address); - CHECK_GL_ERROR + } /* @@ -162,7 +161,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imagesize, address); - CHECK_GL_ERROR + } /* @@ -175,7 +174,7 @@ { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imagesize, address); - CHECK_GL_ERROR + } /* @@ -188,7 +187,7 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetCompressedTexImage(target, lod, address); - CHECK_GL_ERROR + } @@ -256,7 +255,7 @@ { const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); glLoadTransposeMatrixf(address); - CHECK_GL_ERROR + } @@ -271,7 +270,7 @@ { const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); glMultTransposeMatrixf(address); - CHECK_GL_ERROR + } /* @@ -283,7 +282,7 @@ (JNIEnv *env, jclass clazz, jfloat value, jboolean invert) { glSampleCoverage(value, invert); - CHECK_GL_ERROR + } void extgl_InitOpenGL1_3(JNIEnv *env, jobject ext_set) 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.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- org_lwjgl_opengl_GL14.cpp 7 Mar 2004 15:41:10 -0000 1.5 +++ org_lwjgl_opengl_GL14.cpp 7 Mar 2004 16:01:44 -0000 1.6 @@ -39,8 +39,8 @@ * @version $Revision$ */ -#include "checkGLerror.h" #include "extgl.h" +#include "common_tools.h" typedef void (APIENTRY * glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); typedef void (APIENTRY * glBlendEquationPROC) (GLenum mode); @@ -80,14 +80,14 @@ (JNIEnv *env, jclass clazz, jint mode) { glBlendEquation(mode); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_GL14_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glBlendColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ (JNIEnv *env, jclass clazz, jint p1, jint p2, jobject buffer, jint offset) { GLvoid *address = (GLvoid *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glFogCoordPointer(p1, p2, address); - CHECK_GL_ERROR + } /* @@ -121,7 +121,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerVBO (JNIEnv *env, jclass clazz, jint p1, jint p2, jint buffer_offset) { glFogCoordPointer(p1, p2, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -134,7 +134,7 @@ GLint *address = first_offset + (GLint *)env->GetDirectBufferAddress(first); GLsizei *address2 = count_offset + (GLsizei *)env->GetDirectBufferAddress(count); glMultiDrawArrays(mode, address, address2, (GLsizei)primcount); - CHECK_GL_ERROR + } /* @@ -145,7 +145,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_glPointParameterf (JNIEnv *env, jclass clazz, jint p1, jfloat p2) { glPointParameterf(p1, p2); - CHECK_GL_ERROR + } /* @@ -157,7 +157,7 @@ (JNIEnv *env, jclass clazz, jint p1, jobject buffer, jint offset) { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glPointParameterfv(p1, address); - CHECK_GL_ERROR + } /* @@ -201,7 +201,7 @@ (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jobject buffer, jint offset) { const GLvoid *address = (const GLvoid *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glSecondaryColorPointer(p1, p2, p3, address); - CHECK_GL_ERROR + } /* @@ -212,7 +212,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerVBO (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jint buffer_offset) { glSecondaryColorPointer(p1, p2, p3, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -223,7 +223,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_glBlendFuncSeparate (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jint p4) { glBlendFuncSeparate(p1, p2, p3, p4); - CHECK_GL_ERROR + } Index: org_lwjgl_opengl_GL15.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL15.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_GL15.cpp 7 Mar 2004 15:41:10 -0000 1.4 +++ org_lwjgl_opengl_GL15.cpp 7 Mar 2004 16:01:44 -0000 1.5 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef int GLintptr; typedef unsigned int GLsizeiptr; @@ -90,7 +90,7 @@ (JNIEnv * env, jclass clazz, jint target, jint buffer) { glBindBuffer(target, buffer); - CHECK_GL_ERROR + } /* @@ -102,7 +102,7 @@ { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glDeleteBuffers(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glGenBuffers(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -125,7 +125,7 @@ (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsBuffer(buffer); - CHECK_GL_ERROR + return result; } @@ -138,7 +138,7 @@ { GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset); glBufferData(target, size, data_ptr, usage); - CHECK_GL_ERROR + } /* @@ -150,7 +150,7 @@ { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glBufferSubData(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -162,7 +162,7 @@ { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glGetBufferSubData(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -173,7 +173,7 @@ (JNIEnv * env, jclass clazz, jint target, jint access, jint size, jobject oldBuffer) { void *buffer_address = glMapBuffer((GLenum)target, (GLenum)access); - CHECK_GL_ERROR + if (oldBuffer != NULL) { void *old_buffer_address = env->GetDirectBufferAddress(oldBuffer); if (old_buffer_address == buffer_address) @@ -190,7 +190,7 @@ (JNIEnv * env, jclass clazz, jint target) { GLboolean result = glUnmapBuffer(target); - CHECK_GL_ERROR + return result; } @@ -203,7 +203,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + params_offset; glGetBufferParameteriv(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -215,7 +215,7 @@ { void *pointer; glGetBufferPointerv((GLenum)target, (GLenum)pname, &pointer); - CHECK_GL_ERROR + return safeNewBuffer(env, pointer, size); } @@ -228,7 +228,7 @@ { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glGenQueries(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -240,7 +240,7 @@ { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glDeleteQueries(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -251,7 +251,7 @@ (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsQuery(id); - CHECK_GL_ERROR + return result; } @@ -263,7 +263,7 @@ (JNIEnv * env, jclass clazz, jint target, jint id) { glBeginQuery(target, id); - CHECK_GL_ERROR + } /* @@ -274,7 +274,7 @@ (JNIEnv * env, jclass clazz, jint target) { glEndQuery(target); - CHECK_GL_ERROR + } /* @@ -286,7 +286,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryiv(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -298,7 +298,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectiv(id, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -310,7 +310,7 @@ { GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectuiv(id, pname, params_ptr); - CHECK_GL_ERROR + } void extgl_InitOpenGL1_5(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_GLContext.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLContext.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_GLContext.cpp 29 Feb 2004 08:24:56 -0000 1.3 +++ org_lwjgl_opengl_GLContext.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -32,7 +32,7 @@ #include "org_lwjgl_opengl_GLContext.h" #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" /* * Class: org_lwjgl_opengl_GLContext --- checkGLerror.h DELETED --- |
|
From: <eli...@us...> - 2004-03-07 16:25:22
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7407/src/java/org/lwjgl/opengl Modified Files: Pbuffer.java Util.java Window.java Log Message: Removed GL_CHECK_ERROR Index: Pbuffer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Pbuffer.java 2 Mar 2004 01:57:03 -0000 1.11 +++ Pbuffer.java 7 Mar 2004 16:01:44 -0000 1.12 @@ -248,8 +248,11 @@ */ public synchronized void destroy() { makeCurrent(); + int error = GL11.glGetError(); VBOTracker.remove(this); nDestroy(handle); + if (error != GL11.GL_NO_ERROR) + throw new OpenGLException(error); } /** Index: Util.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Util.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Util.java 15 Feb 2004 21:46:58 -0000 1.9 +++ Util.java 7 Mar 2004 16:01:44 -0000 1.10 @@ -60,6 +60,13 @@ return buffer.position(); } + static void checkGLError() { + int err = GL11.glGetError(); + if (err != GL11.GL_NO_ERROR) { + throw new OpenGLException(err); + } + } + static int getGLInteger(int gl_enum) { GL11.glGetInteger(gl_enum, int_buffer); return int_buffer.get(0); Index: Window.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Window.java 26 Feb 2004 21:47:58 -0000 1.27 +++ Window.java 7 Mar 2004 16:01:44 -0000 1.28 @@ -209,6 +209,7 @@ */ public static void paint() { assert isCreated() : "Cannot paint uncreated window"; + Util.checkGLError(); swapBuffers(); } |
|
From: <eli...@us...> - 2004-03-07 16:12:38
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4725/common Modified Files: extgl.cpp Log Message: Fixed win32 compile Index: extgl.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- extgl.cpp 7 Mar 2004 15:18:45 -0000 1.26 +++ extgl.cpp 7 Mar 2004 15:49:00 -0000 1.27 @@ -34,6 +34,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <string.h> #include "extgl.h" #include "common_tools.h" @@ -603,7 +604,7 @@ } void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndGLFunction *functions) { - JNINativeMethod methods[num_functions]; + JNINativeMethod *methods = (JNINativeMethod *)malloc(num_functions*sizeof(JNINativeMethod)); for (int i = 0; i < num_functions; i++) { JavaMethodAndGLFunction *function = functions + i; if (function->gl_function_name != NULL) { @@ -612,6 +613,7 @@ printf("NOTICE: %s disabled because of missing driver symbols\n", ext_name); if (ext_set != NULL) extgl_removeExtension(env, ext_set, ext_name); + free(methods); return; } void **gl_function_pointer_pointer = function->gl_function_pointer; @@ -623,6 +625,7 @@ method->fnPtr = function->method_pointer; } jint result = env->RegisterNatives(clazz, methods, num_functions); + free(methods); if (result != 0) printfDebug("Could not register natives for extension %s\n", ext_name); } |
|
From: <ma...@us...> - 2004-03-07 16:05:50
|
Update of /cvsroot/java-game-lib/LWJGL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3382 Modified Files: build.xml Log Message: updated headers target Index: build.xml =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- build.xml 7 Mar 2004 15:26:18 -0000 1.16 +++ build.xml 7 Mar 2004 15:42:13 -0000 1.17 @@ -262,11 +262,6 @@ <class name="org.lwjgl.openal.eax.EAXBufferProperties"/> <class name="org.lwjgl.openal.eax.EAXListenerProperties"/> - <class name="org.lwjgl.opengl.GL11"/> - <class name="org.lwjgl.opengl.GL12"/> - <class name="org.lwjgl.opengl.GL13"/> - <class name="org.lwjgl.opengl.GL14"/> - <class name="org.lwjgl.opengl.GL15"/> <class name="org.lwjgl.opengl.GLContext"/> <class name="org.lwjgl.opengl.Window"/> <class name="org.lwjgl.opengl.Pbuffer"/> |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/arb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3084/common/arb Modified Files: org_lwjgl_opengl_ARBImaging.cpp org_lwjgl_opengl_ARBMatrixPalette.cpp org_lwjgl_opengl_ARBMultisample.cpp org_lwjgl_opengl_ARBMultitexture.cpp org_lwjgl_opengl_ARBOcclusionQuery.cpp org_lwjgl_opengl_ARBPointParameters.cpp org_lwjgl_opengl_ARBProgram.cpp org_lwjgl_opengl_ARBShaderObjects.cpp org_lwjgl_opengl_ARBTextureCompression.cpp org_lwjgl_opengl_ARBTransposeMatrix.cpp org_lwjgl_opengl_ARBVertexBlend.cpp org_lwjgl_opengl_ARBVertexBufferObject.cpp org_lwjgl_opengl_ARBVertexProgram.cpp org_lwjgl_opengl_ARBVertexShader.cpp org_lwjgl_opengl_ARBWindowPos.cpp Log Message: Fixed win32 compile Index: org_lwjgl_opengl_ARBImaging.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBImaging.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBImaging.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -117,7 +117,7 @@ * Method: glColorTable * Signature: (IIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTable +static 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) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -130,7 +130,7 @@ * Method: glColorSubTable * Signature: (IIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable +static 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) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -143,7 +143,7 @@ * Method: glGetColorTable * Signature: (IIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable (JNIEnv * env, jclass clazz, jint target, jint format, jint type, jobject buffer, jint offset) { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -156,7 +156,7 @@ * Method: glGetColorTableParameteriv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv (JNIEnv * env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); @@ -169,7 +169,7 @@ * Method: glGetColorTableParameterfv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv (JNIEnv * env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); @@ -182,7 +182,7 @@ * Method: glColorTableParameteriv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); @@ -195,7 +195,7 @@ * Method: glColorTableParameterfv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); @@ -209,7 +209,7 @@ * Method: glCopyColorSubTable * Signature: (IIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable (JNIEnv *env, jclass clazz, jint target, jint start, jint x, jint y, jint width) { glCopyColorSubTable(target, start, x, y, width); @@ -222,7 +222,7 @@ * Method: glCopyColorTable * Signature: (IIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width) { glCopyColorTable(target, internalformat, x, y, width); @@ -235,7 +235,7 @@ * Method: glBlendEquation * Signature: (I)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation (JNIEnv *env, jclass clazz, jint mode) { glBlendEquation(mode); @@ -246,7 +246,7 @@ * Class: org_lwjgl_opengl_ARBImaging * Method: glBlendColor */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glBlendColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); CHECK_GL_ERROR @@ -257,7 +257,7 @@ * Method: glHistogram * Signature: (IIIZ)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glHistogram +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glHistogram (JNIEnv *env, jclass clazz, jint target, jint width, jint internalformat, jboolean sink) { glHistogram(target, width, internalformat, sink); @@ -269,7 +269,7 @@ * Method: glResetHistogram * Signature: (I)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram (JNIEnv *env, jclass clazz, jint target) { glResetHistogram(target); @@ -281,7 +281,7 @@ * Method: glGetHistogram * Signature: (IZIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram (JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint type, jobject buffer, jint offset) { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -294,7 +294,7 @@ * Method: glGetHistogramParameterfv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); @@ -307,7 +307,7 @@ * Method: glGetHistogramParameteriv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); @@ -320,7 +320,7 @@ * Method: glMinmax * Signature: (IIZ)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glMinmax +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glMinmax (JNIEnv *env, jclass clazz, jint target, jint internalformat, jboolean sink) { glMinmax(target, internalformat, sink); @@ -332,7 +332,7 @@ * Method: glResetMinmax * Signature: (I)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax (JNIEnv *env, jclass clazz, jint target) { glResetMinmax(target); @@ -344,7 +344,7 @@ * Method: glGetMinmax * Signature: (IZIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax (JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint type, jobject buffer, jint offset) { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -357,7 +357,7 @@ * Method: glGetMinmaxParameterfv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); @@ -370,7 +370,7 @@ * Method: glGetMinmaxParameteriv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); @@ -383,7 +383,7 @@ * Method: glConvolutionFilter1D * Signature: (IIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D +static 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) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -396,7 +396,7 @@ * Method: glConvolutionFilter2D * Signature: (IIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D +static 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) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -409,7 +409,7 @@ * Method: glConvolutionParameterf * Signature: (IIF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf (JNIEnv *env, jclass clazz, jint target, jint pname, jfloat params) { glConvolutionParameterf(target, pname, params); @@ -421,7 +421,7 @@ * Method: glConvolutionParameterfv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); @@ -434,7 +434,7 @@ * Method: glConvolutionParameteri * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri (JNIEnv *env, jclass clazz, jint target, jint pname, jint params) { glConvolutionParameteri(target, pname, params); @@ -446,7 +446,7 @@ * Method: glConvolutionParameteriv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); @@ -459,7 +459,7 @@ * Method: glCopyConvolutionFilter1D * Signature: (IIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width) { glCopyConvolutionFilter1D(target, internalformat, x, y, width); @@ -471,7 +471,7 @@ * Method: glCopyConvolutionFilter2D * Signature: (IIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width, jint height) { glCopyConvolutionFilter2D(target, internalformat, x, y, width, height); @@ -483,7 +483,7 @@ * Method: glGetConvolutionFilter * Signature: (IIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter (JNIEnv *env, jclass clazz, jint target, jint format, jint type, jobject buffer, jint offset) { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -496,7 +496,7 @@ * Method: glGetConvolutionParameterfv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterfv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterfv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); @@ -509,7 +509,7 @@ * Method: glGetConvolutionParameteriv * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteriv +static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteriv (JNIEnv *env, jclass clazz, jint target, jint pname, jobject buffer, jint offset) { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); @@ -522,7 +522,7 @@ * Method: glSeparableFilter2D * Signature: (IIIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D +static 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) { const void *address = (const void *)(row_offset + (const GLbyte *)env->GetDirectBufferAddress(row)); @@ -536,7 +536,7 @@ * Method: glGetSeparableFilter * Signature: (IIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter +static 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) { void *address = (void *)(row_offset + (GLbyte *)env->GetDirectBufferAddress(row)); Index: org_lwjgl_opengl_ARBMatrixPalette.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBMatrixPalette.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBMatrixPalette.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -53,7 +53,7 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: glCurrentPaletteMatrixARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatrixARB +static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatrixARB (JNIEnv * env, jclass clazz, jint index) { glCurrentPaletteMatrixARB(index); @@ -64,7 +64,7 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexPointerARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARB +static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARB (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jobject pPointer, jint pPointer_offset) { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); @@ -76,7 +76,7 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexPointerARBVBO */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBVBO +static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBVBO (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glMatrixIndexPointerARB(size, type, stride, (GLvoid *)buffer_offset); @@ -87,7 +87,7 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexubvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB +static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB (JNIEnv * env, jclass clazz, jint size, jobject pIndices, jint pIndices_offset) { GLubyte *pIndices_ptr = (GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset; @@ -99,7 +99,7 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexuivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB +static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB (JNIEnv * env, jclass clazz, jint size, jobject piIndices, jint piIndices_offset) { GLuint *piIndices_ptr = (GLuint *)env->GetDirectBufferAddress(piIndices) + piIndices_offset; @@ -111,7 +111,7 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexusvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB +static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB (JNIEnv * env, jclass clazz, jint size, jobject psIndices, jint psIndices_offset) { GLushort *psIndices_ptr = (GLushort *)env->GetDirectBufferAddress(psIndices) + psIndices_offset; Index: org_lwjgl_opengl_ARBMultisample.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBMultisample.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBMultisample.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -45,7 +45,7 @@ * Class: org.lwjgl.opengl.ARBMultisample * Method: glSampleCoverageARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB (JNIEnv * env, jclass clazz, jfloat value, jboolean invert) { glSampleCoverageARB(value, invert); Index: org_lwjgl_opengl_ARBMultitexture.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBMultitexture.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBMultitexture.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -71,7 +71,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glClientActiveTextureARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureARB (JNIEnv * env, jclass clazz, jint texture) { glClientActiveTextureARB(texture); @@ -82,7 +82,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glActiveTextureARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB (JNIEnv * env, jclass clazz, jint texture) { glActiveTextureARB(texture); @@ -93,7 +93,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB (JNIEnv * env, jclass clazz, jint target, jfloat s) { glMultiTexCoord1fARB(target, s); @@ -104,7 +104,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1iARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB (JNIEnv * env, jclass clazz, jint target, jint s) { glMultiTexCoord1iARB(target, s); @@ -115,7 +115,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1sARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB (JNIEnv * env, jclass clazz, jint target, jshort s) { glMultiTexCoord1sARB(target, s); @@ -126,7 +126,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t) { glMultiTexCoord2fARB(target, s, t); @@ -137,7 +137,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2iARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t) { glMultiTexCoord2iARB(target, s, t); @@ -148,7 +148,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2sARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { glMultiTexCoord2sARB(target, s, t); @@ -159,7 +159,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r) { glMultiTexCoord3fARB(target, s, t, r); @@ -170,7 +170,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3iARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r) { glMultiTexCoord3iARB(target, s, t, r); @@ -181,7 +181,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3sARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { glMultiTexCoord3sARB(target, s, t, r); @@ -192,7 +192,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jfloat q) { glMultiTexCoord4fARB(target, s, t, r, q); @@ -203,7 +203,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4iARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r, jint q) { glMultiTexCoord4iARB(target, s, t, r, q); @@ -214,7 +214,7 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4sARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB +static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { glMultiTexCoord4sARB(target, s, t, r, q); Index: org_lwjgl_opengl_ARBOcclusionQuery.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBOcclusionQuery.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBOcclusionQuery.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -59,7 +59,7 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGenQueriesARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB +static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB (JNIEnv * env, jclass clazz, jint n, jobject ids, jint idsOffset) { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; @@ -71,7 +71,7 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglDeleteQueriesARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB +static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB (JNIEnv * env, jclass clazz, jint n, jobject ids, jint idsOffset) { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; @@ -83,7 +83,7 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glIsQueryARB */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB +static jboolean JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsQueryARB(id); @@ -95,7 +95,7 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glBeginQueryARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB +static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB (JNIEnv * env, jclass clazz, jint target, jint id) { glBeginQueryARB(target, id); @@ -106,7 +106,7 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glEndQueryARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB +static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB (JNIEnv * env, jclass clazz, jint target) { glEndQueryARB(target); @@ -117,7 +117,7 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB +static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB (JNIEnv * env, jclass clazz, jint target, jint pname, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -129,7 +129,7 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryObjectivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivARB +static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivARB (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -141,7 +141,7 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryObjectuivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuivARB +static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuivARB (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; Index: org_lwjgl_opengl_ARBPointParameters.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBPointParameters.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBPointParameters.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.ARBPointParameters * Method: glPointParameterfARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfARB +static void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfARB (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPointParameterfARB(pname, param); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.ARBPointParameters * Method: nglPointParameterfvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfvARB +static void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfvARB (JNIEnv * env, jclass clazz, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; Index: org_lwjgl_opengl_ARBProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBProgram.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -70,7 +70,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglProgramStringARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramStringARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramStringARB (JNIEnv * env, jclass clazz, jint target, jint format, jint length, jobject string, jint stringOffset) { GLvoid *string_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(string) + stringOffset); @@ -82,7 +82,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: glBindProgramARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_glBindProgramARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_glBindProgramARB (JNIEnv * env, jclass clazz, jint target, jint program) { glBindProgramARB(target, program); @@ -93,7 +93,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglDeleteProgramsARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglDeleteProgramsARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglDeleteProgramsARB (JNIEnv * env, jclass clazz, jint n, jobject programs, jint programsOffset) { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; @@ -105,7 +105,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglGenProgramsARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGenProgramsARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGenProgramsARB (JNIEnv * env, jclass clazz, jint n, jobject programs, jint programsOffset) { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; @@ -117,7 +117,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: glProgramEnvParameter4fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_glProgramEnvParameter4fARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_glProgramEnvParameter4fARB (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramEnvParameter4fARB(target, index, x, y, z, w); @@ -128,7 +128,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglProgramEnvParameter4fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramEnvParameter4fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramEnvParameter4fvARB (JNIEnv * env, jclass clazz, jint target, jint index, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -140,7 +140,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: glProgramLocalParameter4fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_glProgramLocalParameter4fARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_glProgramLocalParameter4fARB (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramLocalParameter4fARB(target, index, x, y, z, w); @@ -151,7 +151,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglProgramLocalParameter4fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramLocalParameter4fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramLocalParameter4fvARB (JNIEnv * env, jclass clazz, jint target, jint index, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -163,7 +163,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglGetProgramEnvParameterfvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramEnvParameterfvARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramEnvParameterfvARB (JNIEnv * env, jclass clazz, jint target, jint index, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -175,7 +175,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglGetProgramLocalParameterfvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramLocalParameterfvARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramLocalParameterfvARB (JNIEnv * env, jclass clazz, jint target, jint index, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -187,7 +187,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglGetProgramivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramivARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramivARB (JNIEnv * env, jclass clazz, jint target, jint parameterName, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -199,7 +199,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: nglGetProgramStringARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramStringARB +static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramStringARB (JNIEnv * env, jclass clazz, jint target, jint parameterName, jobject paramString, jint paramStringOffset) { GLvoid *paramString_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(paramString) + paramStringOffset); @@ -211,7 +211,7 @@ * Class: org.lwjgl.opengl.ARBProgram * Method: glIsProgramARB */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ARBProgram_glIsProgramARB +static jboolean JNICALL Java_org_lwjgl_opengl_ARBProgram_glIsProgramARB (JNIEnv * env, jclass clazz, jint program) { GLboolean result = glIsProgramARB(program); Index: org_lwjgl_opengl_ARBShaderObjects.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBShaderObjects.cpp 7 Mar 2004 15:18:46 -0000 1.3 +++ org_lwjgl_opengl_ARBShaderObjects.cpp 7 Mar 2004 15:41:10 -0000 1.4 @@ -130,7 +130,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glDeleteObjectARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glDeleteObjectARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glDeleteObjectARB (JNIEnv * env, jclass clazz, jint obj) { glDeleteObjectARB(obj); @@ -141,7 +141,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glGetHandleARB */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glGetHandleARB +static jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glGetHandleARB (JNIEnv * env, jclass clazz, jint pname) { GLhandleARB result = glGetHandleARB(pname); @@ -153,7 +153,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glDetachObjectARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glDetachObjectARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glDetachObjectARB (JNIEnv * env, jclass clazz, jint containerObj, jint attachedObj) { glDetachObjectARB(containerObj, attachedObj); @@ -164,7 +164,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glCreateShaderObjectARB */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCreateShaderObjectARB +static jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCreateShaderObjectARB (JNIEnv * env, jclass clazz, jint shaderType) { GLhandleARB result = glCreateShaderObjectARB(shaderType); @@ -176,7 +176,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: initShaderSource */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_initShaderSource +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_initShaderSource (JNIEnv * env, jclass clazz, jint count) { sourceCount = count; @@ -196,7 +196,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: setShaderString */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_setShaderString +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_setShaderString (JNIEnv * env, jclass clazz, jint index, jobject string, jint stringOffset, jint stringLength) { GLcharARB *string_ptr = (GLcharARB *)((GLubyte *)env->GetDirectBufferAddress(string) + stringOffset); @@ -209,7 +209,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglShaderSourceARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglShaderSourceARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglShaderSourceARB (JNIEnv * env, jclass clazz, jint shaderObj) { glShaderSourceARB(shaderObj, sourceCount, (const GLcharARB **)sources, (const GLint *)sourcesLengths); @@ -220,7 +220,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glCompileShaderARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCompileShaderARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCompileShaderARB (JNIEnv * env, jclass clazz, jint shaderObj) { glCompileShaderARB(shaderObj); @@ -231,7 +231,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glCreateProgramObjectARB */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCreateProgramObjectARB +static jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCreateProgramObjectARB (JNIEnv * env, jclass clazz) { GLuint result = glCreateProgramObjectARB(); @@ -243,7 +243,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glAttachObjectARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glAttachObjectARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glAttachObjectARB (JNIEnv * env, jclass clazz, jint containerObj, jint obj) { glAttachObjectARB(containerObj, obj); @@ -254,7 +254,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glLinkProgramARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glLinkProgramARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glLinkProgramARB (JNIEnv * env, jclass clazz, jint programObj) { glLinkProgramARB(programObj); @@ -265,7 +265,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUseProgramObjectARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUseProgramObjectARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUseProgramObjectARB (JNIEnv * env, jclass clazz, jint programObj) { glUseProgramObjectARB(programObj); @@ -276,7 +276,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glValidateProgramARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glValidateProgramARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glValidateProgramARB (JNIEnv * env, jclass clazz, jint programObj) { glValidateProgramARB(programObj); @@ -287,7 +287,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUniform1fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform1fARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform1fARB (JNIEnv * env, jclass clazz, jint location, jfloat v0) { glUniform1fARB(location, v0); @@ -298,7 +298,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUniform2fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform2fARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform2fARB (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1) { glUniform2fARB(location, v0, v1); @@ -309,7 +309,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUniform3fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform3fARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform3fARB (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1, jfloat v2) { glUniform3fARB(location, v0, v1, v2); @@ -320,7 +320,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUniform4fARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform4fARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform4fARB (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1, jfloat v2, jfloat v3) { glUniform4fARB(location, v0, v1, v2, v3); @@ -331,7 +331,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUniform1iARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform1iARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform1iARB (JNIEnv * env, jclass clazz, jint location, jint v0) { glUniform1iARB(location, v0); @@ -342,7 +342,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUniform2iARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform2iARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform2iARB (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1) { glUniform2iARB(location, v0, v1); @@ -353,7 +353,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUniform3iARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform3iARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform3iARB (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1, jint v2) { glUniform3iARB(location, v0, v1, v2); @@ -364,7 +364,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: glUniform4iARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform4iARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform4iARB (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1, jint v2, jint v3) { glUniform4iARB(location, v0, v1, v2, v3); @@ -375,7 +375,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniform1fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform1fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform1fvARB (JNIEnv * env, jclass clazz, jint location, jint count, jobject values, jint valuesOffset) { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; @@ -387,7 +387,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniform2fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform2fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform2fvARB (JNIEnv * env, jclass clazz, jint location, jint count, jobject values, jint valuesOffset) { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; @@ -399,7 +399,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniform3fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform3fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform3fvARB (JNIEnv * env, jclass clazz, jint location, jint count, jobject values, jint valuesOffset) { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; @@ -411,7 +411,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniform4fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform4fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform4fvARB (JNIEnv * env, jclass clazz, jint location, jint count, jobject values, jint valuesOffset) { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; @@ -423,7 +423,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniform1ivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform1ivARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform1ivARB (JNIEnv * env, jclass clazz, jint location, jint count, jobject values, jint valuesOffset) { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; @@ -435,7 +435,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniform2ivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform2ivARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform2ivARB (JNIEnv * env, jclass clazz, jint location, jint count, jobject values, jint valuesOffset) { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; @@ -447,7 +447,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniform3ivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform3ivARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform3ivARB (JNIEnv * env, jclass clazz, jint location, jint count, jobject values, jint valuesOffset) { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; @@ -459,7 +459,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniform4ivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform4ivARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform4ivARB (JNIEnv * env, jclass clazz, jint location, jint count, jobject values, jint valuesOffset) { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; @@ -471,7 +471,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniformMatrix2fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix2fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix2fvARB (JNIEnv * env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matricesOffset) { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; @@ -483,7 +483,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniformMatrix3fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix3fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix3fvARB (JNIEnv * env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matricesOffset) { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; @@ -495,7 +495,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglUniformMatrix4fvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix4fvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix4fvARB (JNIEnv * env, jclass clazz, jint location, jint count, jboolean transpose, jobject matrices, jint matricesOffset) { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; @@ -507,7 +507,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetObjectParameterfvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetObjectParameterfvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetObjectParameterfvARB (JNIEnv * env, jclass clazz, jint obj, jint pname, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -519,7 +519,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetObjectParameterivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetObjectParameterivARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetObjectParameterivARB (JNIEnv * env, jclass clazz, jint obj, jint pname, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -531,7 +531,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetInfoLogARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetInfoLogARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetInfoLogARB (JNIEnv * env, jclass clazz, jint obj, jint maxLength, jobject length, jint lengthOffset, jobject infoLog, jint infoLogOffset) { @@ -551,7 +551,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetAttachedObjectsARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetAttachedObjectsARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetAttachedObjectsARB (JNIEnv * env, jclass clazz, jint containerObj, jint maxCount, jobject count, jint countOffset, jobject obj, jint objOffset) { @@ -571,7 +571,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetUniformLocationARB */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformLocationARB +static jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformLocationARB (JNIEnv * env, jclass clazz, jint programObj, jobject name, jint nameOffset) { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; @@ -584,7 +584,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetActiveUniformARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetActiveUniformARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetActiveUniformARB (JNIEnv * env, jclass clazz, jint programObj, jint index, jint maxLength, jobject length, jint lengthOffset, jobject size, jint sizeOffset, jobject type, jint typeOffset, jobject name, jint nameOffset) { @@ -606,7 +606,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetUniformfvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformfvARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformfvARB (JNIEnv * env, jclass clazz, jint programObj, jint location, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -618,7 +618,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetUniformivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformivARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformivARB (JNIEnv * env, jclass clazz, jint programObj, jint location, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -630,7 +630,7 @@ * Class: org.lwjgl.opengl.ARBShaderObjects * Method: nglGetShaderSourceARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetShaderSourceARB +static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetShaderSourceARB (JNIEnv * env, jclass clazz, jint obj, jint maxLength, jobject length, jint lengthOffset, jobject source, jint sourceOffset) { GLubyte *source_ptr = (GLubyte *)env->GetDirectBufferAddress(source) + sourceOffset; Index: org_lwjgl_opengl_ARBTextureCompression.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBTextureCompression.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBTextureCompression.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -57,7 +57,7 @@ * Class: org.lwjgl.opengl.ARBTextureCompression * Method: nglCompressedTexImage1DARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage1DARB +static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage1DARB (JNIEnv * env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jobject pData, jint pData_offset) { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); @@ -69,7 +69,7 @@ * Class: org.lwjgl.opengl.ARBTextureCompression * Method: nglCompressedTexImage2DARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage2DARB +static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage2DARB (JNIEnv * env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jobject pData, jint pData_offset) { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); @@ -81,7 +81,7 @@ * Class: org.lwjgl.opengl.ARBTextureCompression * Method: nglCompressedTexImage3DARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage3DARB +static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage3DARB (JNIEnv * env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jobject pData, jint pData_offset) { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); @@ -93,7 +93,7 @@ * Class: org.lwjgl.opengl.ARBTextureCompression * Method: nglCompressedTexSubImage1DARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage1DARB +static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage1DARB (JNIEnv * env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint border, jint imageSize, jobject pData, jint pData_offset) { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); @@ -105,7 +105,7 @@ * Class: org.lwjgl.opengl.ARBTextureCompression * Method: nglCompressedTexSubImage2DARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage2DARB +static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage2DARB (JNIEnv * env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint border, jint imageSize, jobject pData, jint pData_offset) { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); @@ -117,7 +117,7 @@ * Class: org.lwjgl.opengl.ARBTextureCompression * Method: nglCompressedTexSubImage3DARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage3DARB +static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage3DARB (JNIEnv * env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint border, jint imageSize, jobject pData, jint pData_offset) { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); @@ -129,7 +129,7 @@ * Class: org.lwjgl.opengl.ARBTextureCompression * Method: nglGetCompressedTexImageARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompressedTexImageARB +static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompressedTexImageARB (JNIEnv * env, jclass clazz, jint target, jint lod, jobject pImg, jint pImg_offset) { GLvoid *pImg_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pImg) + pImg_offset); Index: org_lwjgl_opengl_ARBTransposeMatrix.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBTransposeMatrix.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBTransposeMatrix.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.ARBTransposeMatrix * Method: nglLoadTransposeMatrixfARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTransposeMatrix_nglLoadTransposeMatrixfARB +static void JNICALL Java_org_lwjgl_opengl_ARBTransposeMatrix_nglLoadTransposeMatrixfARB (JNIEnv * env, jclass clazz, jobject pfMtx, jint pfMtx_offset) { GLfloat *pfMtx_ptr = (GLfloat *)env->GetDirectBufferAddress(pfMtx) + pfMtx_offset; @@ -59,7 +59,7 @@ * Class: org.lwjgl.opengl.ARBTransposeMatrix * Method: nglMultTransposeMatrixfARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTransposeMatrix_nglMultTransposeMatrixfARB +static void JNICALL Java_org_lwjgl_opengl_ARBTransposeMatrix_nglMultTransposeMatrixfARB (JNIEnv * env, jclass clazz, jobject pfMtx, jint pfMtx_offset) { GLfloat *pfMtx_ptr = (GLfloat *)env->GetDirectBufferAddress(pfMtx) + pfMtx_offset; Index: org_lwjgl_opengl_ARBVertexBlend.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBVertexBlend.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ARBVertexBlend.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -61,7 +61,7 @@ * Class: org.lwjgl.opengl.ARBVertexBlend * Method: nglWeightbvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightbvARB +static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightbvARB (JNIEnv * env, jclass clazz, jint size, jobject pWeights, jint pWeights_offset) { GLbyte *pWeights_ptr = (GLbyte *)env->GetDirectBufferAddress(pWeights) + pWeights_offset; @@ -73,7 +73,7 @@ * Class: org.lwjgl.opengl.ARBVertexBlend * Method: nglWeightfvARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightfvARB +static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightfvARB (JNIEnv * env, jclass clazz, jint size, jobject pfWeights, jint pfWeights_offset) { GLfloat *pfWeights_ptr = (GLfloat *)env->GetDirectBufferAddress(pfWeights) + pfWeights_offset; @@ -85,7 +85,7 @@ * Class: org.lwjgl.opengl.ARBVertexBlend * Method: nglWeightivARB */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightivARB +static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightivARB (JNIEnv * env, jclass clazz, jint size, jobject piWeights, jint piWeights_o... [truncated message content] |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3084/common/ext Modified Files: org_lwjgl_opengl_EXTBlendFuncSeparate.cpp org_lwjgl_opengl_EXTCompiledVertexArray.cpp org_lwjgl_opengl_EXTDrawRangeElements.cpp org_lwjgl_opengl_EXTFogCoord.cpp org_lwjgl_opengl_EXTMultiDrawArrays.cpp org_lwjgl_opengl_EXTPointParameters.cpp org_lwjgl_opengl_EXTSecondaryColor.cpp org_lwjgl_opengl_EXTStencilTwoSide.cpp org_lwjgl_opengl_EXTVertexShader.cpp org_lwjgl_opengl_EXTVertexWeighting.cpp Log Message: Fixed win32 compile Index: org_lwjgl_opengl_EXTBlendFuncSeparate.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTBlendFuncSeparate.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTBlendFuncSeparate.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -45,7 +45,7 @@ * Class: org.lwjgl.opengl.EXTBlendFuncSeparate * Method: glBlendFuncSeparateEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTBlendFuncSeparate_glBlendFuncSeparateEXT +static void JNICALL Java_org_lwjgl_opengl_EXTBlendFuncSeparate_glBlendFuncSeparateEXT (JNIEnv * env, jclass clazz, jint sfactorRGB, jint dfactorRGB, jint sfactorAlpha, jint dfactorAlpha) { glBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); Index: org_lwjgl_opengl_EXTCompiledVertexArray.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTCompiledVertexArray.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTCompiledVertexArray.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.EXTCompiledVertexArray * Method: glLockArraysEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glLockArraysEXT +static void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glLockArraysEXT (JNIEnv * env, jclass clazz, jint first, jint count) { glLockArraysEXT(first, count); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.EXTCompiledVertexArray * Method: glUnlockArraysEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glUnlockArraysEXT +static void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glUnlockArraysEXT (JNIEnv * env, jclass clazz) { glUnlockArraysEXT(); Index: org_lwjgl_opengl_EXTDrawRangeElements.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTDrawRangeElements.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTDrawRangeElements.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -45,7 +45,7 @@ * Class: org.lwjgl.opengl.EXTDrawRangeElements * Method: nglDrawRangeElementsEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXT +static void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXT (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jobject pIndices, jint pIndices_offset) { GLvoid *pIndices_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset); @@ -57,7 +57,7 @@ * Class: org.lwjgl.opengl.EXTDrawRangeElements * Method: nglDrawRangeElementsEXTVBO */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTVBO +static void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTVBO (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint buffer_offset) { glDrawRangeElementsEXT(mode, start, end, count, type, (GLvoid *)buffer_offset); Index: org_lwjgl_opengl_EXTFogCoord.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTFogCoord.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTFogCoord.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.EXTFogCoord * Method: glFogCoordfEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_glFogCoordfEXT +static void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_glFogCoordfEXT (JNIEnv * env, jclass clazz, jfloat coord) { glFogCoordfEXT(coord); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.EXTFogCoord * Method: nglFogCoordPointerEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT +static void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT (JNIEnv * env, jclass clazz, jint type, jint stride, jobject data, jint data_offset) { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); @@ -70,7 +70,7 @@ * Class: org.lwjgl.opengl.EXTFogCoord * Method: nglFogCoordPointerEXTVBO */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTVBO +static void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTVBO (JNIEnv * env, jclass clazz, jint type, jint stride, jint buffer_offset) { glFogCoordPointerEXT(type, stride, (GLvoid *)buffer_offset); Index: org_lwjgl_opengl_EXTMultiDrawArrays.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTMultiDrawArrays.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTMultiDrawArrays.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -45,7 +45,7 @@ * Class: org.lwjgl.opengl.EXTMultiDrawArrays * Method: nglMultiDrawArraysEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTMultiDrawArrays_nglMultiDrawArraysEXT +static void JNICALL Java_org_lwjgl_opengl_EXTMultiDrawArrays_nglMultiDrawArraysEXT (JNIEnv * env, jclass clazz, jint mode, jobject piFirst, jint piFirst_offset, jobject piCount, jint piCount_offset, jint primcount) { GLint *piFirst_ptr = (GLint *)env->GetDirectBufferAddress(piFirst) + piFirst_offset; Index: org_lwjgl_opengl_EXTPointParameters.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTPointParameters.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTPointParameters.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.EXTPointParameters * Method: glPointParameterfEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_glPointParameterfEXT +static void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_glPointParameterfEXT (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPointParameterfEXT(pname, param); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.EXTPointParameters * Method: nglPointParameterfvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_nglPointParameterfvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_nglPointParameterfvEXT (JNIEnv * env, jclass clazz, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; Index: org_lwjgl_opengl_EXTSecondaryColor.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTSecondaryColor.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTSecondaryColor.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -51,7 +51,7 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: glSecondaryColor3bEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3bEXT +static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3bEXT (JNIEnv * env, jclass clazz, jbyte red, jbyte green, jbyte blue) { glSecondaryColor3bEXT(red, green, blue); @@ -62,7 +62,7 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: glSecondaryColor3fEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3fEXT +static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3fEXT (JNIEnv * env, jclass clazz, jfloat red, jfloat green, jfloat blue) { glSecondaryColor3fEXT(red, green, blue); @@ -73,7 +73,7 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: glSecondaryColor3ubEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3ubEXT +static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3ubEXT (JNIEnv * env, jclass clazz, jbyte red, jbyte green, jbyte blue) { glSecondaryColor3ubEXT(red, green, blue); @@ -84,7 +84,7 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: nglSecondaryColorPointerEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXT +static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXT (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jobject pPointer, jint pPointer_offset) { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); @@ -96,7 +96,7 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: nglSecondaryColorPointerEXTVBO */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTVBO +static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTVBO (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glSecondaryColorPointerEXT(size, type, stride, (GLvoid *)buffer_offset); Index: org_lwjgl_opengl_EXTStencilTwoSide.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTStencilTwoSide.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTStencilTwoSide.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -45,7 +45,7 @@ * Class: org.lwjgl.opengl.EXTStencilTwoSide * Method: glActiveStencilFaceEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTStencilTwoSide_glActiveStencilFaceEXT +static void JNICALL Java_org_lwjgl_opengl_EXTStencilTwoSide_glActiveStencilFaceEXT (JNIEnv * env, jclass clazz, jint face) { glActiveStencilFaceEXT(face); Index: org_lwjgl_opengl_EXTVertexShader.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTVertexShader.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTVertexShader.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -125,7 +125,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBeginVertexShaderEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBeginVertexShaderEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBeginVertexShaderEXT (JNIEnv * env, jclass clazz) { glBeginVertexShaderEXT(); @@ -136,7 +136,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glEndVertexShaderEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEndVertexShaderEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEndVertexShaderEXT (JNIEnv * env, jclass clazz) { glEndVertexShaderEXT(); @@ -147,7 +147,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindVertexShaderEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindVertexShaderEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindVertexShaderEXT (JNIEnv * env, jclass clazz, jint id) { glBindVertexShaderEXT(id); @@ -158,7 +158,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glGenVertexShadersEXT */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenVertexShadersEXT +static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenVertexShadersEXT (JNIEnv * env, jclass clazz, jint range) { GLuint result = glGenVertexShadersEXT(range); @@ -170,7 +170,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glDeleteVertexShaderEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDeleteVertexShaderEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDeleteVertexShaderEXT (JNIEnv * env, jclass clazz, jint id) { glDeleteVertexShaderEXT(id); @@ -181,7 +181,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glShaderOp1EXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp1EXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp1EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1) { glShaderOp1EXT(op, res, arg1); @@ -192,7 +192,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glShaderOp2EXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp2EXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp2EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1, jint arg2) { glShaderOp2EXT(op, res, arg1, arg2); @@ -203,7 +203,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glShaderOp3EXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp3EXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp3EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1, jint arg2, jint arg3) { glShaderOp3EXT(op, res, arg1, arg2, arg3); @@ -214,7 +214,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glSwizzleEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glSwizzleEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glSwizzleEXT (JNIEnv * env, jclass clazz, jint res, jint in, jint outX, jint outY, jint outZ, jint outW) { glSwizzleEXT(res, in, outX, outY, outZ, outW); @@ -225,7 +225,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glWriteMaskEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glWriteMaskEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glWriteMaskEXT (JNIEnv * env, jclass clazz, jint res, jint in, jint outX, jint outY, jint outZ, jint outW) { glWriteMaskEXT(res, in, outX, outY, outZ, outW); @@ -236,7 +236,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glInsertComponentEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glInsertComponentEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glInsertComponentEXT (JNIEnv * env, jclass clazz, jint res, jint src, jint num) { glInsertComponentEXT(res, src, num); @@ -247,7 +247,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glExtractComponentEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glExtractComponentEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glExtractComponentEXT (JNIEnv * env, jclass clazz, jint res, jint src, jint num) { glExtractComponentEXT(res, src, num); @@ -258,7 +258,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glGenSymbolsEXT */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenSymbolsEXT +static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenSymbolsEXT (JNIEnv * env, jclass clazz, jint dataType, jint storageType, jint range, jint components) { GLuint result = glGenSymbolsEXT(dataType, storageType, range, components); @@ -270,7 +270,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglSetInvariantEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetInvariantEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetInvariantEXT (JNIEnv * env, jclass clazz, jint id, jint type, jobject pAddr, jint pAddr_offset) { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); @@ -282,7 +282,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglSetLocalConstantEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetLocalConstantEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetLocalConstantEXT (JNIEnv * env, jclass clazz, jint id, jint type, jobject pAddr, jint pAddr_offset) { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); @@ -294,7 +294,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantbvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantbvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantbvEXT (JNIEnv * env, jclass clazz, jint id, jobject pAddr, jint pAddr_offset) { GLbyte *pAddr_ptr = (GLbyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset; @@ -306,7 +306,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantsvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantsvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantsvEXT (JNIEnv * env, jclass clazz, jint id, jobject psAddr, jint psAddr_offset) { GLshort *psAddr_ptr = (GLshort *)env->GetDirectBufferAddress(psAddr) + psAddr_offset; @@ -318,7 +318,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantfvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantfvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantfvEXT (JNIEnv * env, jclass clazz, jint id, jobject pfAddr, jint pfAddr_offset) { GLfloat *pfAddr_ptr = (GLfloat *)env->GetDirectBufferAddress(pfAddr) + pfAddr_offset; @@ -330,7 +330,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantivEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantivEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantivEXT (JNIEnv * env, jclass clazz, jint id, jobject piAddr, jint piAddr_offset) { GLint *piAddr_ptr = (GLint *)env->GetDirectBufferAddress(piAddr) + piAddr_offset; @@ -342,7 +342,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantubvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantubvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantubvEXT (JNIEnv * env, jclass clazz, jint id, jobject pAddr, jint pAddr_offset) { GLubyte *pAddr_ptr = (GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset; @@ -354,7 +354,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantusvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantusvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantusvEXT (JNIEnv * env, jclass clazz, jint id, jobject psAddr, jint psAddr_offset) { GLushort *psAddr_ptr = (GLushort *)env->GetDirectBufferAddress(psAddr) + psAddr_offset; @@ -366,7 +366,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantuivEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantuivEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantuivEXT (JNIEnv * env, jclass clazz, jint id, jobject piAddr, jint piAddr_offset) { GLuint *piAddr_ptr = (GLuint *)env->GetDirectBufferAddress(piAddr) + piAddr_offset; @@ -378,7 +378,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantPointerEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXT (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jobject pAddr, jint pAddr_offset) { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); @@ -390,7 +390,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantPointerEXTVBO */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTVBO +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTVBO (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jint buffer_offset) { glVariantPointerEXT(id, type, stride, (GLvoid *)buffer_offset); @@ -401,7 +401,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glEnableVariantClientStateEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEnableVariantClientStateEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEnableVariantClientStateEXT (JNIEnv * env, jclass clazz, jint id) { glEnableVariantClientStateEXT(id); @@ -412,7 +412,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glDisableVariantClientStateEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDisableVariantClientStateEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDisableVariantClientStateEXT (JNIEnv * env, jclass clazz, jint id) { glDisableVariantClientStateEXT(id); @@ -423,7 +423,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindLightParameterEXT */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindLightParameterEXT +static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindLightParameterEXT (JNIEnv * env, jclass clazz, jint light, jint value) { GLuint result = glBindLightParameterEXT(light, value); @@ -435,7 +435,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindMaterialParameterEXT */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindMaterialParameterEXT +static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindMaterialParameterEXT (JNIEnv * env, jclass clazz, jint face, jint value) { GLuint result = glBindMaterialParameterEXT(face, value); @@ -447,7 +447,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindTexGenParameterEXT */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTexGenParameterEXT +static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTexGenParameterEXT (JNIEnv * env, jclass clazz, jint unit, jint coord, jint value) { GLuint result = glBindTexGenParameterEXT(unit, coord, value); @@ -459,7 +459,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindTextureUnitParameterEXT */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTextureUnitParameterEXT +static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTextureUnitParameterEXT (JNIEnv * env, jclass clazz, jint unit, jint value) { GLuint result = glBindTextureUnitParameterEXT(unit, value); @@ -471,7 +471,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindParameterEXT */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindParameterEXT +static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindParameterEXT (JNIEnv * env, jclass clazz, jint value) { GLuint result = glBindParameterEXT(value); @@ -483,7 +483,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glIsVariantEnabledEXT */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glIsVariantEnabledEXT +static jboolean JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glIsVariantEnabledEXT (JNIEnv * env, jclass clazz, jint id, jint cap) { GLboolean result = glIsVariantEnabledEXT(id, cap); @@ -495,7 +495,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetVariantBooleanvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantBooleanvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantBooleanvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pbData, jint pbData_offset) { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; @@ -507,7 +507,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetVariantIntegervEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantIntegervEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantIntegervEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject piData, jint piData_offset) { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; @@ -519,7 +519,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetVariantFloatvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantFloatvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantFloatvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pfData, jint pfData_offset) { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; @@ -531,7 +531,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glGetVariantPointerEXT */ -static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGetVariantPointerEXT +static jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGetVariantPointerEXT (JNIEnv * env, jclass clazz, jint id, jint value, jint size) { void *address; @@ -544,7 +544,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetInvariantBooleanvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantBooleanvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantBooleanvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pbData, jint pbData_offset) { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; @@ -556,7 +556,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetInvariantIntegervEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantIntegervEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantIntegervEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject piData, jint piData_offset) { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; @@ -568,7 +568,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetInvariantFloatvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantFloatvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantFloatvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pfData, jint pfData_offset) { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; @@ -580,7 +580,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetLocalConstantBooleanvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantBooleanvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantBooleanvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pbData, jint pbData_offset) { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; @@ -592,7 +592,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetLocalConstantIntegervEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantIntegervEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantIntegervEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject piData, jint piData_offset) { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; @@ -604,7 +604,7 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetLocalConstantFloatvEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantFloatvEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantFloatvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pfData, jint pfData_offset) { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; Index: org_lwjgl_opengl_EXTVertexWeighting.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTVertexWeighting.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_EXTVertexWeighting.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.EXTVertexWeighting * Method: glVertexWeightfEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_glVertexWeightfEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_glVertexWeightfEXT (JNIEnv * env, jclass clazz, jfloat weight) { glVertexWeightfEXT(weight); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.EXTVertexWeighting * Method: nglVertexWeightPointerEXT */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXT +static void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXT (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jobject pPointer, jint pPointer_offset) { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); @@ -70,7 +70,7 @@ * Class: org.lwjgl.opengl.EXTVertexWeighting * Method: nglVertexWeightPointerEXTVBO */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXTVBO +static void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXTVBO (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glVertexWeightPointerEXT(size, type, stride, (GLvoid *)buffer_offset); |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/nv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3084/common/nv Modified Files: org_lwjgl_opengl_NVEvaluators.cpp org_lwjgl_opengl_NVFence.cpp org_lwjgl_opengl_NVFragmentProgram.cpp org_lwjgl_opengl_NVHalfFloat.cpp org_lwjgl_opengl_NVOcclusionQuery.cpp org_lwjgl_opengl_NVPixelDataRange.cpp org_lwjgl_opengl_NVPointSprite.cpp org_lwjgl_opengl_NVPrimitiveRestart.cpp org_lwjgl_opengl_NVProgram.cpp org_lwjgl_opengl_NVRegisterCombiners.cpp org_lwjgl_opengl_NVRegisterCombiners2.cpp org_lwjgl_opengl_NVVertexArrayRange.cpp org_lwjgl_opengl_NVVertexProgram.cpp Log Message: Fixed win32 compile Index: org_lwjgl_opengl_NVEvaluators.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVEvaluators.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_NVEvaluators.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -61,7 +61,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapControlPointsNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapControlPointsNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapControlPointsNV (JNIEnv * env, jclass clazz, jint target, jint index, jint type, jint ustride, jint vstride, jboolean packed, jobject pPoints, jint pPoints_offset) { GLvoid *pPoints_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPoints) + pPoints_offset); @@ -73,7 +73,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglMapControlPointsNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapControlPointsNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapControlPointsNV (JNIEnv * env, jclass clazz, jint target, jint index, jint type, jint ustride, jint vstride, jint uorder, jint vorder, jboolean packed, jobject pPoints, jint pPoints_offset) { GLvoid *pPoints_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPoints) + pPoints_offset); @@ -85,7 +85,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglMapParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterfvNV (JNIEnv * env, jclass clazz, jint target, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -97,7 +97,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglMapParameterivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterivNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterivNV (JNIEnv * env, jclass clazz, jint target, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; @@ -109,7 +109,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterfvNV (JNIEnv * env, jclass clazz, jint target, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -121,7 +121,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapParameterivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterivNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterivNV (JNIEnv * env, jclass clazz, jint target, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; @@ -133,7 +133,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapAttribParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterfvNV (JNIEnv * env, jclass clazz, jint target, jint index, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -145,7 +145,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapAttribParameterivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterivNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterivNV (JNIEnv * env, jclass clazz, jint target, jint index, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; @@ -157,7 +157,7 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: glEvalMapsNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_glEvalMapsNV +static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_glEvalMapsNV (JNIEnv * env, jclass clazz, jint target, jint mode) { glEvalMapsNV(target, mode); Index: org_lwjgl_opengl_NVFence.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVFence.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVFence.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_NVFence.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -57,7 +57,7 @@ * Class: org.lwjgl.opengl.NVFence * Method: nglGenFencesNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglGenFencesNV +static void JNICALL Java_org_lwjgl_opengl_NVFence_nglGenFencesNV (JNIEnv * env, jclass clazz, jint n, jobject piFences, jint piFences_offset) { GLuint *piFences_ptr = (GLuint *)env->GetDirectBufferAddress(piFences) + piFences_offset; @@ -69,7 +69,7 @@ * Class: org.lwjgl.opengl.NVFence * Method: nglDeleteFencesNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglDeleteFencesNV +static void JNICALL Java_org_lwjgl_opengl_NVFence_nglDeleteFencesNV (JNIEnv * env, jclass clazz, jint n, jobject piFences, jint piFences_offset) { GLuint *piFences_ptr = (GLuint *)env->GetDirectBufferAddress(piFences) + piFences_offset; @@ -81,7 +81,7 @@ * Class: org.lwjgl.opengl.NVFence * Method: glSetFenceNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_glSetFenceNV +static void JNICALL Java_org_lwjgl_opengl_NVFence_glSetFenceNV (JNIEnv * env, jclass clazz, jint fence, jint condition) { glSetFenceNV(fence, condition); @@ -92,7 +92,7 @@ * Class: org.lwjgl.opengl.NVFence * Method: glTestFenceNV */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glTestFenceNV +static jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glTestFenceNV (JNIEnv * env, jclass clazz, jint fence) { GLboolean result = glTestFenceNV(fence); @@ -104,7 +104,7 @@ * Class: org.lwjgl.opengl.NVFence * Method: glFinishFenceNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_glFinishFenceNV +static void JNICALL Java_org_lwjgl_opengl_NVFence_glFinishFenceNV (JNIEnv * env, jclass clazz, jint fence) { glFinishFenceNV(fence); @@ -115,7 +115,7 @@ * Class: org.lwjgl.opengl.NVFence * Method: glIsFenceNV */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glIsFenceNV +static jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glIsFenceNV (JNIEnv * env, jclass clazz, jint fence) { GLboolean result = glIsFenceNV(fence); @@ -127,7 +127,7 @@ * Class: org.lwjgl.opengl.NVFence * Method: nglGetFenceivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglGetFenceivNV +static void JNICALL Java_org_lwjgl_opengl_NVFence_nglGetFenceivNV (JNIEnv * env, jclass clazz, jint fence, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; Index: org_lwjgl_opengl_NVFragmentProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVFragmentProgram.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_NVFragmentProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -51,7 +51,7 @@ * Class: org.lwjgl.opengl.NVFragmentProgram * Method: nglProgramNamedParameter4fNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglProgramNamedParameter4fNV +static void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglProgramNamedParameter4fNV (JNIEnv * env, jclass clazz, jint id, jint length, jobject name, jint nameOffset, jfloat x, jfloat y, jfloat z, jfloat w) { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; @@ -63,7 +63,7 @@ * Class: org.lwjgl.opengl.NVFragmentProgram * Method: nglGetProgramNamedParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramNamedParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramNamedParameterfvNV (JNIEnv * env, jclass clazz, jint id, jint length, jobject name, jint nameOffset, jobject params, jint paramsOffset) { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; @@ -76,7 +76,7 @@ * Class: org.lwjgl.opengl.NVFragmentProgram * Method: glProgramLocalParameter4fNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_glProgramLocalParameter4fARB +static void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_glProgramLocalParameter4fARB (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramLocalParameter4fARB(target, index, x, y, z, w); @@ -87,7 +87,7 @@ * Class: org.lwjgl.opengl.NVFragmentProgram * Method: nglGetProgramLocalParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramLocalParameterfvARB +static void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramLocalParameterfvARB (JNIEnv * env, jclass clazz, jint target, jint index, jobject params, jint params_offset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + params_offset; Index: org_lwjgl_opengl_NVHalfFloat.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_NVHalfFloat.cpp 7 Mar 2004 15:18:46 -0000 1.3 +++ org_lwjgl_opengl_NVHalfFloat.cpp 7 Mar 2004 15:41:10 -0000 1.4 @@ -93,7 +93,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertex2hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex2hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex2hNV (JNIEnv * env, jclass clazz, jshort x, jshort y) { glVertex2hNV(x, y); @@ -104,7 +104,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertex3hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex3hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex3hNV (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z) { glVertex3hNV(x, y, z); @@ -115,7 +115,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertex4hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex4hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex4hNV (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z, jshort w) { glVertex4hNV(x, y, z, w); @@ -126,7 +126,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glNormal3hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glNormal3hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glNormal3hNV (JNIEnv * env, jclass clazz, jshort nx, jshort ny, jshort nz) { glNormal3hNV(nx, ny, nz); @@ -137,7 +137,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glColor3hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor3hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor3hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue) { glColor3hNV(red, green, blue); @@ -148,7 +148,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glColor4hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor4hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor4hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue, jshort alpha) { glColor4hNV(red, green, blue, alpha); @@ -159,7 +159,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glTexCoord1hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord1hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord1hNV (JNIEnv * env, jclass clazz, jshort s) { glTexCoord1hNV(s); @@ -170,7 +170,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glTexCoord2hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord2hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord2hNV (JNIEnv * env, jclass clazz, jshort s, jshort t) { glTexCoord2hNV(s, t); @@ -181,7 +181,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glTexCoord3hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord3hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord3hNV (JNIEnv * env, jclass clazz, jshort s, jshort t, jshort r) { glTexCoord3hNV(s, t, r); @@ -192,7 +192,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glTexCoord4hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord4hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord4hNV (JNIEnv * env, jclass clazz, jshort s, jshort t, jshort r, jshort q) { glTexCoord4hNV(s, t, r, q); @@ -203,7 +203,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glMultiTexCoord1hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord1hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord1hNV (JNIEnv * env, jclass clazz, jint target, jshort s) { glMultiTexCoord1hNV(target, s); @@ -214,7 +214,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glMultiTexCoord2hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord2hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord2hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { glMultiTexCoord2hNV(target, s, t); @@ -225,7 +225,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glMultiTexCoord3hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord3hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord3hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { glMultiTexCoord3hNV(target, s, t, r); @@ -236,7 +236,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glMultiTexCoord4hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord4hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord4hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { glMultiTexCoord4hNV(target, s, t, r, q); @@ -247,7 +247,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glFogCoordhNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glFogCoordhNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glFogCoordhNV (JNIEnv * env, jclass clazz, jshort fog) { glFogCoordhNV(fog); @@ -258,7 +258,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glSecondaryColor3hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glSecondaryColor3hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glSecondaryColor3hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue) { glSecondaryColor3hNV(red, green, blue); @@ -269,7 +269,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertexAttrib1hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib1hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib1hNV (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1hNV(index, x); @@ -280,7 +280,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertexAttrib2hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib2hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib2hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2hNV(index, x, y); @@ -291,7 +291,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertexAttrib3hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib3hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib3hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3hNV(index, x, y, z); @@ -302,7 +302,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertexAttrib4hNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib4hNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib4hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { glVertexAttrib4hNV(index, x, y, z, w); @@ -313,7 +313,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: nglVertexAttribs1hvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs1hvNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs1hvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject attribs, jint attribsOffset) { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; @@ -325,7 +325,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: nglVertexAttribs2hvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs2hvNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs2hvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject attribs, jint attribsOffset) { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; @@ -337,7 +337,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: nglVertexAttribs3hvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs3hvNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs3hvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject attribs, jint attribsOffset) { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; @@ -349,7 +349,7 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: nglVertexAttribs4hvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs4hvNV +static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs4hvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject attribs, jint attribsOffset) { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; Index: org_lwjgl_opengl_NVOcclusionQuery.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVOcclusionQuery.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_NVOcclusionQuery.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -57,7 +57,7 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: nglGenOcclusionQueriesNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGenOcclusionQueriesNV +static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGenOcclusionQueriesNV (JNIEnv * env, jclass clazz, jint n, jobject piIDs, jint piIDs_offset) { GLuint *piIDs_ptr = (GLuint *)env->GetDirectBufferAddress(piIDs) + piIDs_offset; @@ -69,7 +69,7 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: nglDeleteOcclusionQueriesNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglDeleteOcclusionQueriesNV +static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglDeleteOcclusionQueriesNV (JNIEnv * env, jclass clazz, jint n, jobject piIDs, jint piIDs_offset) { GLuint *piIDs_ptr = (GLuint *)env->GetDirectBufferAddress(piIDs) + piIDs_offset; @@ -81,7 +81,7 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: glIsOcclusionQueryNV */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glIsOcclusionQueryNV +static jboolean JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glIsOcclusionQueryNV (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsOcclusionQueryNV(id); @@ -93,7 +93,7 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: glBeginOcclusionQueryNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glBeginOcclusionQueryNV +static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glBeginOcclusionQueryNV (JNIEnv * env, jclass clazz, jint id) { glBeginOcclusionQueryNV(id); @@ -104,7 +104,7 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: glEndOcclusionQueryNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glEndOcclusionQueryNV +static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glEndOcclusionQueryNV (JNIEnv * env, jclass clazz) { glEndOcclusionQueryNV(); @@ -115,7 +115,7 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: nglGetOcclusionQueryivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryivNV +static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryivNV (JNIEnv * env, jclass clazz, jint id, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; @@ -127,7 +127,7 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: nglGetOcclusionQueryuivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryuivNV +static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryuivNV (JNIEnv * env, jclass clazz, jint id, jint pname, jobject piParams, jint piParams_offset) { GLuint *piParams_ptr = (GLuint *)env->GetDirectBufferAddress(piParams) + piParams_offset; Index: org_lwjgl_opengl_NVPixelDataRange.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVPixelDataRange.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_NVPixelDataRange.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.NVPixelDataRange * Method: nglPixelDataRangeNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_nglPixelDataRangeNV +static void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_nglPixelDataRangeNV (JNIEnv * env, jclass clazz, jint target, jint length, jobject data, jint dataOffset) { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + dataOffset); @@ -59,7 +59,7 @@ * Class: org.lwjgl.opengl.NVPixelDataRange * Method: glFlushPixelDataRangeNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_glFlushPixelDataRangeNV +static void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_glFlushPixelDataRangeNV (JNIEnv * env, jclass clazz, jint target) { glFlushPixelDataRangeNV(target); Index: org_lwjgl_opengl_NVPointSprite.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVPointSprite.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_NVPointSprite.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.NVPointSprite * Method: glPointParameteriNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPointSprite_glPointParameteriNV +static void JNICALL Java_org_lwjgl_opengl_NVPointSprite_glPointParameteriNV (JNIEnv * env, jclass clazz, jint pname, jint param) { glPointParameteriNV(pname, param); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.NVPointSprite * Method: nglPointParameterivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPointSprite_nglPointParameterivNV +static void JNICALL Java_org_lwjgl_opengl_NVPointSprite_nglPointParameterivNV (JNIEnv * env, jclass clazz, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; Index: org_lwjgl_opengl_NVPrimitiveRestart.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVPrimitiveRestart.cpp 7 Mar 2004 15:18:47 -0000 1.2 +++ org_lwjgl_opengl_NVPrimitiveRestart.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.NVPrimitiveRestart * Method: glPrimitiveRestartNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPrimitiveRestart_glPrimitiveRestartNV +static void JNICALL Java_org_lwjgl_opengl_NVPrimitiveRestart_glPrimitiveRestartNV (JNIEnv * env, jclass clazz) { glPrimitiveRestartNV(); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.NVPrimitiveRestart * Method: glPrimitiveRestartIndexNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPrimitiveRestart_glPrimitiveRestartIndexNV +static void JNICALL Java_org_lwjgl_opengl_NVPrimitiveRestart_glPrimitiveRestartIndexNV (JNIEnv * env, jclass clazz, jint index) { glPrimitiveRestartIndexNV(index); Index: org_lwjgl_opengl_NVProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVProgram.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVProgram.cpp 7 Mar 2004 15:18:47 -0000 1.2 +++ org_lwjgl_opengl_NVProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -61,7 +61,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: nglLoadProgramNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVProgram_nglLoadProgramNV +static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglLoadProgramNV (JNIEnv * env, jclass clazz, jint target, jint programID, jint length, jobject string, jint stringOffset) { const GLubyte *string_ptr = (const GLubyte *)env->GetDirectBufferAddress(string) + stringOffset; @@ -73,7 +73,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: glBindProgramNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVProgram_glBindProgramNV +static void JNICALL Java_org_lwjgl_opengl_NVProgram_glBindProgramNV (JNIEnv * env, jclass clazz, jint target, jint programID) { glBindProgramNV(target, programID); @@ -84,7 +84,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: nglDeleteProgramsNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVProgram_nglDeleteProgramsNV +static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglDeleteProgramsNV (JNIEnv * env, jclass clazz, jint n, jobject programs, jint programsOffset) { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; @@ -96,7 +96,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: nglGenProgramsNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGenProgramsNV +static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGenProgramsNV (JNIEnv * env, jclass clazz, jint n, jobject programs, jint programsOffset) { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; @@ -108,7 +108,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: nglGetProgramivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGetProgramivNV +static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGetProgramivNV (JNIEnv * env, jclass clazz, jint programID, jint parameterName, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -120,7 +120,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: nglGetProgramStringNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGetProgramStringNV +static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGetProgramStringNV (JNIEnv * env, jclass clazz, jint programID, jint parameterName, jobject paramString, jint paramStringOffset) { GLubyte *paramString_ptr = (GLubyte *)env->GetDirectBufferAddress(paramString) + paramStringOffset; @@ -132,7 +132,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: glIsProgramNV */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVProgram_glIsProgramNV +static jboolean JNICALL Java_org_lwjgl_opengl_NVProgram_glIsProgramNV (JNIEnv * env, jclass clazz, jint programID) { GLboolean result = glIsProgramNV(programID); @@ -144,7 +144,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: nglAreProgramsResidentNV */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVProgram_nglAreProgramsResidentNV +static jboolean JNICALL Java_org_lwjgl_opengl_NVProgram_nglAreProgramsResidentNV (JNIEnv * env, jclass clazz, jint n, jobject programIDs, jint programIDsOffset, jobject programResidences, jint programResidencesOffset) { GLuint *programIDs_ptr = (GLuint *)env->GetDirectBufferAddress(programIDs) + programIDsOffset; @@ -158,7 +158,7 @@ * Class: org.lwjgl.opengl.NVProgram * Method: nglRequestResidentProgramsNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVProgram_nglRequestResidentProgramsNV +static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglRequestResidentProgramsNV (JNIEnv * env, jclass clazz, jint n, jobject programIDs, jint programIDsOffset) { GLuint *programIDs_ptr = (GLuint *)env->GetDirectBufferAddress(programIDs) + programIDsOffset; Index: org_lwjgl_opengl_NVRegisterCombiners.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVRegisterCombiners.cpp 7 Mar 2004 15:18:47 -0000 1.2 +++ org_lwjgl_opengl_NVRegisterCombiners.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -69,7 +69,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: glCombinerParameterfNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerParameterfNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerParameterfNV (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glCombinerParameterfNV(pname, param); @@ -80,7 +80,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: nglCombinerParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglCombinerParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglCombinerParameterfvNV (JNIEnv * env, jclass clazz, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -92,7 +92,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: glCombinerParameteriNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerParameteriNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerParameteriNV (JNIEnv * env, jclass clazz, jint pname, jint param) { glCombinerParameteriNV(pname, param); @@ -103,7 +103,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: nglCombinerParameterivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglCombinerParameterivNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglCombinerParameterivNV (JNIEnv * env, jclass clazz, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; @@ -115,7 +115,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: glCombinerInputNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerInputNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerInputNV (JNIEnv * env, jclass clazz, jint stage, jint portion, jint variable, jint input, jint mapping, jint componentUsage) { glCombinerInputNV(stage, portion, variable, input, mapping, componentUsage); @@ -126,7 +126,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: glCombinerOutputNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerOutputNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerOutputNV (JNIEnv * env, jclass clazz, jint stage, jint portion, jint abOutput, jint cdOutput, jint sumOutput, jint scale, jint bias, jboolean abDotProduct, jboolean cdDotProduct, jboolean muxSum) { glCombinerOutputNV(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum); @@ -137,7 +137,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: glFinalCombinerInputNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glFinalCombinerInputNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glFinalCombinerInputNV (JNIEnv * env, jclass clazz, jint variable, jint input, jint mapping, jint componentUsage) { glFinalCombinerInputNV(variable, input, mapping, componentUsage); @@ -148,7 +148,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: nglGetCombinerInputParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerInputParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerInputParameterfvNV (JNIEnv * env, jclass clazz, jint stage, jint portion, jint variable, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -160,7 +160,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: nglGetCombinerInputParameterivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerInputParameterivNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerInputParameterivNV (JNIEnv * env, jclass clazz, jint stage, jint portion, jint variable, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; @@ -172,7 +172,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: nglGetCombinerOutputParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerOutputParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerOutputParameterfvNV (JNIEnv * env, jclass clazz, jint stage, jint portion, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -184,7 +184,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: nglGetCombinerOutputParameterivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerOutputParameterivNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerOutputParameterivNV (JNIEnv * env, jclass clazz, jint stage, jint portion, jint pname, jobject piParams, jint pfParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + pfParams_offset; @@ -196,7 +196,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: nglGetFinalCombinerInputParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetFinalCombinerInputParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetFinalCombinerInputParameterfvNV (JNIEnv * env, jclass clazz, jint variable, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -208,7 +208,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners * Method: nglGetFinalCombinerInputParameterivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetFinalCombinerInputParameterivNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetFinalCombinerInputParameterivNV (JNIEnv * env, jclass clazz, jint variable, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; Index: org_lwjgl_opengl_NVRegisterCombiners2.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVRegisterCombiners2.cpp 7 Mar 2004 15:18:47 -0000 1.2 +++ org_lwjgl_opengl_NVRegisterCombiners2.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners2 * Method: nglCombinerStageParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners2_nglCombinerStageParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners2_nglCombinerStageParameterfvNV (JNIEnv * env, jclass clazz, jint stage, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -59,7 +59,7 @@ * Class: org.lwjgl.opengl.NVRegisterCombiners2 * Method: nglGetCombinerStageParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners2_nglGetCombinerStageParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners2_nglGetCombinerStageParameterfvNV (JNIEnv * env, jclass clazz, jint stage, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; Index: org_lwjgl_opengl_NVVertexArrayRange.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVVertexArrayRange.cpp 7 Mar 2004 15:18:47 -0000 1.2 +++ org_lwjgl_opengl_NVVertexArrayRange.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -67,7 +67,7 @@ * Class: org.lwjgl.opengl.NVVertexArrayRange * Method: nglVertexArrayRangeNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_nglVertexArrayRangeNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_nglVertexArrayRangeNV (JNIEnv * env, jclass clazz, jint size, jobject pPointer, jint pPointer_offset) { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); @@ -79,7 +79,7 @@ * Class: org.lwjgl.opengl.NVVertexArrayRange * Method: glFlushVertexArrayRangeNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_glFlushVertexArrayRangeNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_glFlushVertexArrayRangeNV (JNIEnv * env, jclass clazz) { glFlushVertexArrayRangeNV(); @@ -87,14 +87,14 @@ } #ifdef _X11 -static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_glXAllocateMemoryNV +static jobject JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_glXAllocateMemoryNV (JNIEnv * env, jclass clazz, jint size, jfloat readFrequency, jfloat writeFrequency, jfloat priority) { void *mem_address = glXAllocateMemoryNV((GLint) size, (GLfloat)readFrequency, (GLfloat)writeFrequency, (GLfloat)priority); return safeNewBuffer(env, mem_address, size); } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_glXFreeMemoryNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_glXFreeMemoryNV (JNIEnv * env, jclass clazz, jobject pointer) { void *address = (void *)env->GetDirectBufferAddress(pointer); @@ -103,14 +103,14 @@ #endif #ifdef _WIN32 -static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_wglAllocateMemoryNV +static jobject JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_wglAllocateMemoryNV (JNIEnv * env, jclass clazz, jint size, jfloat readFrequency, jfloat writeFrequency, jfloat priority) { void *mem_address = wglAllocateMemoryNV((GLint)size, (GLfloat)readFrequency, (GLfloat)writeFrequency, (GLfloat)priority); return safeNewBuffer(env, mem_address, size); } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_wglFreeMemoryNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_wglFreeMemoryNV (JNIEnv * env, jclass clazz, jobject pointer) { void *address = (void *)env->GetDirectBufferAddress(pointer); Index: org_lwjgl_opengl_NVVertexProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVVertexProgram.cpp 7 Mar 2004 15:18:47 -0000 1.2 +++ org_lwjgl_opengl_NVVertexProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -99,7 +99,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: nglExecuteProgramNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglExecuteProgramNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglExecuteProgramNV (JNIEnv * env, jclass clazz, jint target, jint id, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -111,7 +111,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: nglGetProgramParameterfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetProgramParameterfvNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetProgramParameterfvNV (JNIEnv * env, jclass clazz, jint target, jint index, jint parameterName, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -123,7 +123,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: nglGetTrackMatrixivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetTrackMatrixivNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetTrackMatrixivNV (JNIEnv * env, jclass clazz, jint target, jint address, jint parameterName, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -135,7 +135,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: nglGetVertexAttribfvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetVertexAttribfvNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetVertexAttribfvNV (JNIEnv * env, jclass clazz, jint index, jint parameterName, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -147,7 +147,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: nglGetVertexAttribivNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetVertexAttribivNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetVertexAttribivNV (JNIEnv * env, jclass clazz, jint index, jint parameterName, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -159,7 +159,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glGetVertexAttribPointerNV */ -static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glGetVertexAttribPointerNV +static jobject JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glGetVertexAttribPointerNV (JNIEnv * env, jclass clazz, jint index, jint parameterName, jint size) { void *address; @@ -172,7 +172,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glProgramParameter4fNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glProgramParameter4fNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glProgramParameter4fNV (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramParameter4fNV(target, index, x, y, z, w); @@ -183,7 +183,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: nglProgramParameters4fvNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglProgramParameters4fvNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglProgramParameters4fvNV (JNIEnv * env, jclass clazz, jint target, jint index, jint count, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -195,7 +195,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glTrackMatrixNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glTrackMatrixNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glTrackMatrixNV (JNIEnv * env, jclass clazz, jint target, jint address, jint matrix, jint transform) { glTrackMatrixNV(target, address, matrix, transform); @@ -206,7 +206,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: nglVertexAttribPointerNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointerNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointerNV (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jint stride, jobject buffer, jint bufferOffset) { GLvoid *buffer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(buffer) + bufferOffset); @@ -218,7 +218,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: nglVertexAttribPointerNVVBO */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointerNVVBO +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointerNVVBO (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jint stride, jint bufferOffset) { glVertexAttribPointerNV(index, size, type, stride, (GLvoid *)bufferOffset); @@ -229,7 +229,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib1sNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib1sNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib1sNV (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1sNV(index, x); @@ -240,7 +240,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib1fNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib1fNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib1fNV (JNIEnv * env, jclass clazz, jint index, jfloat x) { glVertexAttrib1fNV(index, x); @@ -251,7 +251,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib2sNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib2sNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib2sNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2sNV(index, x, y); @@ -262,7 +262,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib2fNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib2fNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib2fNV (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y) { glVertexAttrib2fNV(index, x, y); @@ -273,7 +273,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib3sNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib3sNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib3sNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3sNV(index, x, y, z); @@ -284,7 +284,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib3fNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib3fNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib3fNV (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z) { glVertexAttrib3fNV(index, x, y, z); @@ -295,7 +295,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib4sNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4sNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4sNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { glVertexAttrib4sNV(index, x, y, z, w); @@ -306,7 +306,7 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib4fNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4fNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4fNV (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glVertexAttrib4fNV(index, x, y, z, w); @@ -317,14 +317,14 @@ * Class: org.lwjgl.opengl.NVVertexProgram * Method: glVertexAttrib4ubNV */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4ubNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4ubNV (JNIEnv * env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w) { glVertexAttrib4ubNV(index, x, y, z, w); CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1svNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1svNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; @@ -332,7 +332,7 @@ CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1fvNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1fvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; @@ -340,7 +340,7 @@ CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2svNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2svNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; @@ -348,7 +348,7 @@ CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2fvNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2fvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; @@ -356,7 +356,7 @@ CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3svNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3svNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; @@ -364,7 +364,7 @@ CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3fvNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3fvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; @@ -372,7 +372,7 @@ CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4svNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4svNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; @@ -380,7 +380,7 @@ CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4fvNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4fvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; @@ -388,7 +388,7 @@ CHECK_GL_ERROR } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4ubvNV +static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4ubvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject v, jint v_offset) { GLubyte *v_ptr = (GLubyte *)env->GetDirectBufferAddress(v) + v_offset; |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ati In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3084/common/ati Modified Files: org_lwjgl_opengl_ATIDrawBuffers.cpp org_lwjgl_opengl_ATIElementArray.cpp org_lwjgl_opengl_ATIEnvmapBumpmap.cpp org_lwjgl_opengl_ATIFragmentShader.cpp org_lwjgl_opengl_ATIMapObjectBuffer.cpp org_lwjgl_opengl_ATIPnTriangles.cpp org_lwjgl_opengl_ATISeparateStencil.cpp org_lwjgl_opengl_ATIVertexArrayObject.cpp org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp org_lwjgl_opengl_ATIVertexStreams.cpp Log Message: Fixed win32 compile Index: org_lwjgl_opengl_ATIDrawBuffers.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIDrawBuffers.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIDrawBuffers.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -45,7 +45,7 @@ * Class: org.lwjgl.opengl.ATIDrawBuffers * Method: nglDrawBuffersATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIDrawBuffers_nglDrawBuffersATI +static void JNICALL Java_org_lwjgl_opengl_ATIDrawBuffers_nglDrawBuffersATI (JNIEnv * env, jclass clazz, jint size, jobject buffers, jint buffersOffset) { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffersOffset; Index: org_lwjgl_opengl_ATIElementArray.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIElementArray.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIElementArray.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -49,7 +49,7 @@ * Class: org.lwjgl.opengl.ATIElementArray * Method: nglElementPointerATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATI +static void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATI (JNIEnv * env, jclass clazz, jint type, jobject pPointer, jint pPointer_offset) { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); @@ -61,7 +61,7 @@ * Class: org.lwjgl.opengl.ATIElementArray * Method: nglElementPointerATIVBO */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIVBO +static void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIVBO (JNIEnv * env, jclass clazz, jint type, jint buffer_offset) { glElementPointerATI(type, (GLvoid *)buffer_offset); @@ -72,7 +72,7 @@ * Class: org.lwjgl.opengl.ATIElementArray * Method: glDrawElementArrayATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawElementArrayATI +static void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawElementArrayATI (JNIEnv * env, jclass clazz, jint mode, jint count) { glDrawElementArrayATI(mode, count); @@ -83,7 +83,7 @@ * Class: org.lwjgl.opengl.ATIElementArray * Method: glDrawRangeElementArrayATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawRangeElementArrayATI +static void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawRangeElementArrayATI (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count) { glDrawRangeElementArrayATI(mode, start, end, count); Index: org_lwjgl_opengl_ATIEnvmapBumpmap.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIEnvmapBumpmap.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIEnvmapBumpmap.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -51,7 +51,7 @@ * Class: org.lwjgl.opengl.ATIEnvmapBumpmap * Method: nglTexBumpParameterfvATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterfvATI +static void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterfvATI (JNIEnv * env, jclass clazz, jint pname, jobject pfParam, jint pfParam_offset) { GLfloat *pfParam_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParam) + pfParam_offset; @@ -63,7 +63,7 @@ * Class: org.lwjgl.opengl.ATIEnvmapBumpmap * Method: nglTexBumpParameterivATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterivATI +static void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterivATI (JNIEnv * env, jclass clazz, jint pname, jobject piParam, jint piParam_offset) { GLint *piParam_ptr = (GLint *)env->GetDirectBufferAddress(piParam) + piParam_offset; @@ -75,7 +75,7 @@ * Class: org.lwjgl.opengl.ATIEnvmapBumpmap * Method: nglGetTexBumpParameterfvATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterfvATI +static void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterfvATI (JNIEnv * env, jclass clazz, jint pname, jobject pfParam, jint pfParam_offset) { GLfloat *pfParam_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParam) + pfParam_offset; @@ -87,7 +87,7 @@ * Class: org.lwjgl.opengl.ATIEnvmapBumpmap * Method: nglGetTexBumpParameterivATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterivATI +static void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterivATI (JNIEnv * env, jclass clazz, jint pname, jobject piParam, jint piParam_offset) { GLint *piParam_ptr = (GLint *)env->GetDirectBufferAddress(piParam) + piParam_offset; Index: org_lwjgl_opengl_ATIFragmentShader.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIFragmentShader.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIFragmentShader.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -71,7 +71,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glGenFragmentShadersATI */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glGenFragmentShadersATI +static jint JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glGenFragmentShadersATI (JNIEnv * env, jclass clazz, jint range) { GLuint result = glGenFragmentShadersATI(range); @@ -83,7 +83,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glBindFragmentShaderATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBindFragmentShaderATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBindFragmentShaderATI (JNIEnv * env, jclass clazz, jint id) { glBindFragmentShaderATI(id); @@ -94,7 +94,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glDeleteFragmentShaderATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glDeleteFragmentShaderATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glDeleteFragmentShaderATI (JNIEnv * env, jclass clazz, jint id) { glDeleteFragmentShaderATI(id); @@ -105,7 +105,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glBeginFragmentShaderATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBeginFragmentShaderATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBeginFragmentShaderATI (JNIEnv * env, jclass clazz) { glBeginFragmentShaderATI(); @@ -116,7 +116,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glEndFragmentShaderATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glEndFragmentShaderATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glEndFragmentShaderATI (JNIEnv * env, jclass clazz) { glEndFragmentShaderATI(); @@ -127,7 +127,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glPassTexCoordATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glPassTexCoordATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glPassTexCoordATI (JNIEnv * env, jclass clazz, jint dst, jint coord, jint swizzle) { glPassTexCoordATI(dst, coord, swizzle); @@ -138,7 +138,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glSampleMapATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glSampleMapATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glSampleMapATI (JNIEnv * env, jclass clazz, jint dst, jint interp, jint swizzle) { glSampleMapATI(dst, interp, swizzle); @@ -149,7 +149,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glColorFragmentOp1ATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp1ATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp1ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod) { glColorFragmentOp1ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod); @@ -160,7 +160,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glColorFragmentOp2ATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp2ATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp2ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod) { glColorFragmentOp2ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod); @@ -171,7 +171,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glColorFragmentOp3ATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp3ATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp3ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod, jint arg3, jint arg3Rep, jint arg3Mod) { glColorFragmentOp3ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); @@ -182,7 +182,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glAlphaFragmentOp1ATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp1ATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp1ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod) { glAlphaFragmentOp1ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod); @@ -193,7 +193,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glAlphaFragmentOp2ATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp2ATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp2ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod) { glAlphaFragmentOp2ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod); @@ -204,7 +204,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glAlphaFragmentOp3ATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp3ATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp3ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod, jint arg3, jint arg3Rep, jint arg3Mod) { glAlphaFragmentOp3ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); @@ -215,7 +215,7 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: nglSetFragmentShaderConstantATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_nglSetFragmentShaderConstantATI +static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_nglSetFragmentShaderConstantATI (JNIEnv * env, jclass clazz, jint dst, jobject pfValue, jint pfValue_offset) { GLfloat *pfValue_ptr = (GLfloat *)env->GetDirectBufferAddress(pfValue) + pfValue_offset; Index: org_lwjgl_opengl_ATIMapObjectBuffer.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIMapObjectBuffer.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIMapObjectBuffer.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.ATIMapObjectBuffer * Method: glMapObjectBufferATI */ -static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glMapObjectBufferATI +static jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glMapObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer, jint size, jobject oldBuffer) { void *buffer_address = glMapObjectBufferATI((GLenum)buffer); @@ -65,7 +65,7 @@ * Class: org.lwjgl.opengl.ATIMapObjectBuffer * Method: glUnmapObjectBufferATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glUnmapObjectBufferATI +static void JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glUnmapObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer) { glUnmapObjectBufferATI(buffer); Index: org_lwjgl_opengl_ATIPnTriangles.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIPnTriangles.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIPnTriangles.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.ATIPnTriangles * Method: glPNTrianglesfATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesfATI +static void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesfATI (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPNTrianglesfATI(pname, param); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.ATIPnTriangles * Method: glPNTrianglesiATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesiATI +static void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesiATI (JNIEnv * env, jclass clazz, jint pname, jint param) { glPNTrianglesiATI(pname, param); Index: org_lwjgl_opengl_ATISeparateStencil.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATISeparateStencil.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATISeparateStencil.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -47,7 +47,7 @@ * Class: org.lwjgl.opengl.ATISeparateStencil * Method: glStencilOpSeparateATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilOpSeparateATI +static void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilOpSeparateATI (JNIEnv * env, jclass clazz, jint face, jint sfail, jint dpfail, jint dppass) { glStencilOpSeparateATI(face, sfail, dpfail, dppass); @@ -58,7 +58,7 @@ * Class: org.lwjgl.opengl.ATISeparateStencil * Method: glStencilFuncSeparateATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilFuncSeparateATI +static void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilFuncSeparateATI (JNIEnv * env, jclass clazz, jint frontfunc, jint backfunc, jint ref, jint mask) { glStencilFuncSeparateATI(frontfunc, backfunc, ref, mask); Index: org_lwjgl_opengl_ATIVertexArrayObject.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIVertexArrayObject.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIVertexArrayObject.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -67,7 +67,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglNewObjectBufferATI */ -static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBufferATI +static jint JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBufferATI (JNIEnv * env, jclass clazz, jint size, jobject pPointer, jint pPointer_offset, jint usage) { GLvoid *pPointer_ptr = safeGetBufferAddress(env, pPointer, pPointer_offset); @@ -80,7 +80,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: glIsObjectBufferATI */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glIsObjectBufferATI +static jboolean JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glIsObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsObjectBufferATI(buffer); @@ -92,7 +92,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglUpdateObjectBufferATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglUpdateObjectBufferATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglUpdateObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer, jint offset, jint size, jobject pPointer, jint pPointer_offset, jint preserve) { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); @@ -104,7 +104,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetObjectBufferfvATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferfvATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferfvATI (JNIEnv * env, jclass clazz, jint buffer, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -116,7 +116,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetObjectBufferivATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferivATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferivATI (JNIEnv * env, jclass clazz, jint buffer, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; @@ -128,7 +128,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: glFreeObjectBufferATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glFreeObjectBufferATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glFreeObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer) { glFreeObjectBufferATI(buffer); @@ -139,7 +139,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: glArrayObjectATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glArrayObjectATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glArrayObjectATI (JNIEnv * env, jclass clazz, jint array, jint size, jint type, jint stride, jint buffer, jint offset) { glArrayObjectATI(array, size, type, stride, buffer, offset); @@ -150,7 +150,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetArrayObjectfvATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectfvATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectfvATI (JNIEnv * env, jclass clazz, jint array, jint pname, jobject pfParams, jint pfParams_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; @@ -162,7 +162,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetArrayObjectivATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectivATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectivATI (JNIEnv * env, jclass clazz, jint array, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; @@ -174,7 +174,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: glVariantArrayObjectATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glVariantArrayObjectATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glVariantArrayObjectATI (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jint buffer, jint offset) { glVariantArrayObjectATI(id, type, stride, buffer, offset); @@ -185,7 +185,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetVariantArrayObjectfvATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectfvATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectfvATI (JNIEnv * env, jclass clazz, jint id, jint pname, jobject pfParams, jint pfParams_offset_offset) { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset_offset; @@ -197,7 +197,7 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetVariantArrayObjectivATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectivATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectivATI (JNIEnv * env, jclass clazz, jint id, jint pname, jobject piParams, jint piParams_offset) { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; Index: org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -49,7 +49,7 @@ * Class: org.lwjgl.opengl.ATIVertexAttribArrayObject * Method: glVertexAttribArrayObjectATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_glVertexAttribArrayObjectATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_glVertexAttribArrayObjectATI (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer, jint offset) { glVertexAttribArrayObjectATI(index, size, type, normalized, stride, buffer, offset); @@ -60,7 +60,7 @@ * Class: org.lwjgl.opengl.ATIVertexAttribArrayObject * Method: nglGetVertexAttribArrayObjectfvATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectfvATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectfvATI (JNIEnv * env, jclass clazz, jint index, jint pname, jobject params, jint paramsOffset) { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -72,7 +72,7 @@ * Class: org.lwjgl.opengl.ATIVertexAttribArrayObject * Method: nglGetVertexAttribArrayObjectivATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectivATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectivATI (JNIEnv * env, jclass clazz, jint index, jint pname, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; Index: org_lwjgl_opengl_ATIVertexStreams.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ATIVertexStreams.cpp 7 Mar 2004 15:18:46 -0000 1.2 +++ org_lwjgl_opengl_ATIVertexStreams.cpp 7 Mar 2004 15:41:10 -0000 1.3 @@ -81,7 +81,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream1fATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1fATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x) { glVertexStream1fATI(stream, x); @@ -92,7 +92,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream1iATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1iATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1iATI (JNIEnv * env, jclass clazz, jint stream, jint x) { glVertexStream1iATI(stream, x); @@ -103,7 +103,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream1sATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1sATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1sATI (JNIEnv * env, jclass clazz, jint stream, jshort x) { glVertexStream1sATI(stream, x); @@ -114,7 +114,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream2fATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2fATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y) { glVertexStream2fATI(stream, x, y); @@ -125,7 +125,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream2iATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2iATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y) { glVertexStream2iATI(stream, x, y); @@ -136,7 +136,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream2sATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2sATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y) { glVertexStream2sATI(stream, x, y); @@ -147,7 +147,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream3fATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3fATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z) { glVertexStream3fATI(stream, x, y, z); @@ -158,7 +158,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream3iATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3iATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z) { glVertexStream3iATI(stream, x, y, z); @@ -169,7 +169,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream3sATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3sATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z) { glVertexStream3sATI(stream, x, y, z); @@ -180,7 +180,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream4fATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4fATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z, jfloat w) { glVertexStream4fATI(stream, x, y, z, w); @@ -191,7 +191,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream4iATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4iATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z, jint w) { glVertexStream4iATI(stream, x, y, z, w); @@ -202,7 +202,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream4sATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4sATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z, jshort w) { glVertexStream4sATI(stream, x, y, z, w); @@ -213,7 +213,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glNormalStream3bATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3bATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3bATI (JNIEnv * env, jclass clazz, jint stream, jbyte x, jbyte y, jbyte z) { glNormalStream3bATI(stream, x, y, z); @@ -224,7 +224,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glNormalStream3fATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3fATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z) { glNormalStream3fATI(stream, x, y, z); @@ -235,7 +235,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glNormalStream3iATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3iATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z) { glNormalStream3iATI(stream, x, y, z); @@ -246,7 +246,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glNormalStream3sATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3sATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z) { glNormalStream3sATI(stream, x, y, z); @@ -257,7 +257,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glClientActiveVertexStreamATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glClientActiveVertexStreamATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glClientActiveVertexStreamATI (JNIEnv * env, jclass clazz, jint stream) { glClientActiveVertexStreamATI(stream); @@ -268,7 +268,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexBlendEnvfATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnvfATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnvfATI (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glVertexBlendEnvfATI(pname, param); @@ -279,7 +279,7 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexBlendEnviATI */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnviATI +static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnviATI (JNIEnv * env, jclass clazz, jint pname, jint param) { glVertexBlendEnviATI(pname, param); |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3084/common Modified Files: org_lwjgl_opengl_GL11.cpp org_lwjgl_opengl_GL12.cpp org_lwjgl_opengl_GL13.cpp org_lwjgl_opengl_GL14.cpp org_lwjgl_opengl_GL15.cpp Log Message: Fixed win32 compile Index: org_lwjgl_opengl_GL11.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL11.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_GL11.cpp 7 Mar 2004 15:18:45 -0000 1.4 +++ org_lwjgl_opengl_GL11.cpp 7 Mar 2004 15:41:10 -0000 1.5 @@ -451,7 +451,7 @@ * Class: org_lwjgl_opengl_GL11 * Method: glAccum */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_glAccum(JNIEnv * env, jclass clazz, jint p0, jfloat p1) +static void JNICALL Java_org_lwjgl_opengl_GL11_glAccum(JNIEnv * env, jclass clazz, jint p0, jfloat p1) { glAccum((GLint) p0, (GLfloat) p1); CHECK_GL_ERROR @@ -461,7 +461,7 @@ * Class: org_lwjgl_opengl_GL11 * Method: glAlphaFunc [...1818 lines suppressed...] glStencilOp((GLint) p0, (GLint) p1, (GLint) p2); CHECK_GL_ERROR @@ -2556,7 +2556,7 @@ * Class: org_lwjgl_opengl_GL11 * Method: glStencilMask */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_glStencilMask(JNIEnv * env, jclass clazz, jint p0) +static void JNICALL Java_org_lwjgl_opengl_GL11_glStencilMask(JNIEnv * env, jclass clazz, jint p0) { glStencilMask((GLint) p0); CHECK_GL_ERROR @@ -2566,7 +2566,7 @@ * Class: org_lwjgl_opengl_GL11 * Method: glViewport */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_glViewport(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3) +static void JNICALL Java_org_lwjgl_opengl_GL11_glViewport(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3) { glViewport((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3); CHECK_GL_ERROR 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.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_GL12.cpp 7 Mar 2004 15:18:46 -0000 1.4 +++ org_lwjgl_opengl_GL12.cpp 7 Mar 2004 15:41:10 -0000 1.5 @@ -57,7 +57,7 @@ * Method: nglDrawRangeElements * Signature: (IIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElements +static void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElements (JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -70,7 +70,7 @@ * Method: nglDrawRangeElementsVBO * Signature: (IIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsVBO +static void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsVBO (JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint buffer_offset) { glDrawRangeElements(mode, start, end, count, type, offsetToPointer(buffer_offset)); @@ -82,7 +82,7 @@ * Method: glTexImage3D * Signature: (IIIIIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3D +static void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint format, jint type, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -95,7 +95,7 @@ * Method: glTexSubImage3D * Signature: (IIIIIIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3D +static void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint type, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -108,7 +108,7 @@ * Method: glCopyTexSubImage3D * Signature: (IIIIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glCopyTexSubImage3D +static void JNICALL Java_org_lwjgl_opengl_GL12_glCopyTexSubImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint x, jint y, jint width, jint height) { glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height); Index: org_lwjgl_opengl_GL13.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL13.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_GL13.cpp 7 Mar 2004 15:18:46 -0000 1.3 +++ org_lwjgl_opengl_GL13.cpp 7 Mar 2004 15:41:10 -0000 1.4 @@ -81,7 +81,7 @@ * Method: glActiveTexture * Signature: (I)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glActiveTexture +static void JNICALL Java_org_lwjgl_opengl_GL13_glActiveTexture (JNIEnv *env, jclass clazz, jint texture) { glActiveTexture(texture); @@ -93,7 +93,7 @@ * Method: glClientActiveTexture * Signature: (I)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glClientActiveTexture +static void JNICALL Java_org_lwjgl_opengl_GL13_glClientActiveTexture (JNIEnv *env, jclass clazz, jint texture) { glClientActiveTexture(texture); @@ -105,7 +105,7 @@ * Method: glCompressedTexImage1D * Signature: (IIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1D +static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1D (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imagesize, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -118,7 +118,7 @@ * Method: glCompressedTexImage2D * Signature: (IIIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2D +static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2D (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imagesize, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -131,7 +131,7 @@ * Method: glCompressedTexImage3D * Signature: (IIIIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3D +static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imagesize, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -144,7 +144,7 @@ * Method: glCompressedTexSubImage1D * Signature: (IIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1D +static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imagesize, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -157,7 +157,7 @@ * Method: glCompressedTexSubImage2D * Signature: (IIIIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2D +static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imagesize, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -170,7 +170,7 @@ * Method: glCompressedTexSubImage3D * Signature: (IIIIIIIIIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3D +static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imagesize, jobject buffer, jint offset) { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -183,7 +183,7 @@ * Method: glGetCompressedTexImage * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImage +static void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImage (JNIEnv *env, jclass clazz, jint target, jint lod, jobject buffer, jint offset) { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); @@ -198,7 +198,7 @@ * Method: glMultiTexCoord1f * Signature: (IF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord1f +static void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord1f (JNIEnv *env, jclass clazz, jint target, jfloat s) { glMultiTexCoord1f(target, s); @@ -211,7 +211,7 @@ * Method: glMultiTexCoord2f * Signature: (IFF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord2f +static void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord2f (JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t) { glMultiTexCoord2f(target, s, t); @@ -225,7 +225,7 @@ * Method: glMultiTexCoord3f * Signature: (IFFF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord3f +static void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord3f (JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r) { glMultiTexCoord3f(target, s, t, r); @@ -238,7 +238,7 @@ * Method: glMultiTexCoord4f * Signature: (IFFFF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord4f +static void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord4f (JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jfloat q) { glMultiTexCoord4f(target, s, t, r, q); @@ -251,7 +251,7 @@ * Method: glLoadTransposeMatrixf * Signature: (I)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglLoadTransposeMatrixf +static void JNICALL Java_org_lwjgl_opengl_GL13_nglLoadTransposeMatrixf (JNIEnv *env, jclass clazz, jobject buffer, jint offset) { const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); @@ -266,7 +266,7 @@ * Method: glMultTransposeMatrixf * Signature: (I)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultTransposeMatrixf +static void JNICALL Java_org_lwjgl_opengl_GL13_nglMultTransposeMatrixf (JNIEnv *env, jclass clazz, jobject buffer, jint offset) { const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); @@ -279,7 +279,7 @@ * Method: glSampleCoverage * Signature: (FZ)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glSampleCoverage +static void JNICALL Java_org_lwjgl_opengl_GL13_glSampleCoverage (JNIEnv *env, jclass clazz, jfloat value, jboolean invert) { glSampleCoverage(value, invert); 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.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_GL14.cpp 7 Mar 2004 15:18:46 -0000 1.4 +++ org_lwjgl_opengl_GL14.cpp 7 Mar 2004 15:41:10 -0000 1.5 @@ -76,7 +76,7 @@ static glBlendColorPROC glBlendColor; static glBlendEquationPROC glBlendEquation; -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendEquation +static void JNICALL Java_org_lwjgl_opengl_GL14_glBlendEquation (JNIEnv *env, jclass clazz, jint mode) { glBlendEquation(mode); @@ -84,7 +84,7 @@ } -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) +static void JNICALL Java_org_lwjgl_opengl_GL14_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glBlendColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); CHECK_GL_ERROR @@ -95,7 +95,7 @@ * Method: glFogCoordf * Signature: (F)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glFogCoordf +static void JNICALL Java_org_lwjgl_opengl_GL14_glFogCoordf (JNIEnv *env, jclass clazz, jfloat f) { glFogCoordf(f); } @@ -106,7 +106,7 @@ * Method: nglFogCoordPointer * Signature: (IILjava/nio/Buffer;)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointer +static void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointer (JNIEnv *env, jclass clazz, jint p1, jint p2, jobject buffer, jint offset) { GLvoid *address = (GLvoid *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glFogCoordPointer(p1, p2, address); @@ -118,7 +118,7 @@ * Method: nglFogCoordPointerVBO * Signature: (IILjava/nio/Buffer;)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerVBO +static void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerVBO (JNIEnv *env, jclass clazz, jint p1, jint p2, jint buffer_offset) { glFogCoordPointer(p1, p2, offsetToPointer(buffer_offset)); CHECK_GL_ERROR @@ -129,7 +129,7 @@ * Method: glMultiDrawArrays * Signature: (IIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglMultiDrawArrays +static void JNICALL Java_org_lwjgl_opengl_GL14_nglMultiDrawArrays (JNIEnv *env, jclass clazz, jint mode, jobject first, jint first_offset, jobject count, jint count_offset, jint primcount) { GLint *address = first_offset + (GLint *)env->GetDirectBufferAddress(first); GLsizei *address2 = count_offset + (GLsizei *)env->GetDirectBufferAddress(count); @@ -142,7 +142,7 @@ * Method: glPointParameterf * Signature: (IF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glPointParameterf +static void JNICALL Java_org_lwjgl_opengl_GL14_glPointParameterf (JNIEnv *env, jclass clazz, jint p1, jfloat p2) { glPointParameterf(p1, p2); CHECK_GL_ERROR @@ -153,7 +153,7 @@ * Method: glPointParameterfv * Signature: (ILjava/nio/FloatBuffer;)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglPointParameterfv +static void JNICALL Java_org_lwjgl_opengl_GL14_nglPointParameterfv (JNIEnv *env, jclass clazz, jint p1, jobject buffer, jint offset) { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glPointParameterfv(p1, address); @@ -165,7 +165,7 @@ * Method: glSecondaryColor3b * Signature: (BBB)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3b +static void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3b (JNIEnv *env, jclass clazz, jbyte p1, jbyte p2, jbyte p3) { glSecondaryColor3b(p1, p2, p3); } @@ -176,7 +176,7 @@ * Method: glSecondaryColor3f * Signature: (FFF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3f +static void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3f (JNIEnv *env, jclass clazz, jfloat p1, jfloat p2, jfloat p3) { glSecondaryColor3f(p1, p2, p3); } @@ -187,7 +187,7 @@ * Method: glSecondaryColor3ub * Signature: (BBB)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3ub +static void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3ub (JNIEnv *env, jclass clazz, jbyte p1, jbyte p2, jbyte p3) { glSecondaryColor3ub(p1, p2, p3); } @@ -197,7 +197,7 @@ * Method: nglSecondaryColorPointer * Signature: (IIILjava/nio/Buffer;)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointer +static void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointer (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jobject buffer, jint offset) { const GLvoid *address = (const GLvoid *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glSecondaryColorPointer(p1, p2, p3, address); @@ -209,7 +209,7 @@ * Method: nglSecondaryColorPointerVBO * Signature: (IIILjava/nio/Buffer;)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerVBO +static void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerVBO (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jint buffer_offset) { glSecondaryColorPointer(p1, p2, p3, offsetToPointer(buffer_offset)); CHECK_GL_ERROR @@ -220,7 +220,7 @@ * Method: glBlendFuncSeparate * Signature: (IIII)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendFuncSeparate +static void JNICALL Java_org_lwjgl_opengl_GL14_glBlendFuncSeparate (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jint p4) { glBlendFuncSeparate(p1, p2, p3, p4); CHECK_GL_ERROR @@ -232,7 +232,7 @@ * Method: glWindowPos2f * Signature: (FF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos2f +static void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos2f (JNIEnv *env, jclass clazz, jfloat p1, jfloat p2) { glWindowPos2f(p1, p2); } @@ -242,7 +242,7 @@ * Method: glWindowPos2i * Signature: (II)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos2i +static void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos2i (JNIEnv *env, jclass clazz, jint p1, jint p2) { glWindowPos2i(p1, p2); } @@ -253,7 +253,7 @@ * Method: glWindowPos3f * Signature: (FFF)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos3f +static void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos3f (JNIEnv *env, jclass clazz, jfloat p1, jfloat p2, jfloat p3) { glWindowPos3f(p1, p2, p3); } @@ -264,7 +264,7 @@ * Method: glWindowPos3i * Signature: (III)V */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos3i +static void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos3i (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3) { glWindowPos3i(p1, p2, p3); } Index: org_lwjgl_opengl_GL15.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL15.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_GL15.cpp 7 Mar 2004 15:18:46 -0000 1.3 +++ org_lwjgl_opengl_GL15.cpp 7 Mar 2004 15:41:10 -0000 1.4 @@ -86,7 +86,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglBindBuffer */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBindBuffer +static void JNICALL Java_org_lwjgl_opengl_GL15_nglBindBuffer (JNIEnv * env, jclass clazz, jint target, jint buffer) { glBindBuffer(target, buffer); @@ -97,7 +97,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglDeleteBuffers */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglDeleteBuffers +static void JNICALL Java_org_lwjgl_opengl_GL15_nglDeleteBuffers (JNIEnv * env, jclass clazz, jint n, jobject buffers, jint buffers_offset) { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; @@ -109,7 +109,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglGenBuffers */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGenBuffers +static void JNICALL Java_org_lwjgl_opengl_GL15_nglGenBuffers (JNIEnv * env, jclass clazz, jint n, jobject buffers, jint buffers_offset) { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; @@ -121,7 +121,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: glIsBuffer */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GL15_glIsBuffer +static jboolean JNICALL Java_org_lwjgl_opengl_GL15_glIsBuffer (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsBuffer(buffer); @@ -133,7 +133,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglBufferData */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData +static void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData (JNIEnv * env, jclass clazz, jint target, jint size, jobject data, jint data_offset, jint usage) { GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset); @@ -145,7 +145,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglBufferSubData */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferSubData +static void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferSubData (JNIEnv * env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_offset) { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); @@ -157,7 +157,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglGetBufferSubData */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferSubData +static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferSubData (JNIEnv * env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_offset) { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); @@ -169,7 +169,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: glMapBuffer */ -static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_glMapBuffer +static jobject JNICALL Java_org_lwjgl_opengl_GL15_glMapBuffer (JNIEnv * env, jclass clazz, jint target, jint access, jint size, jobject oldBuffer) { void *buffer_address = glMapBuffer((GLenum)target, (GLenum)access); @@ -186,7 +186,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: glUnmapBuffer */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GL15_glUnmapBuffer +static jboolean JNICALL Java_org_lwjgl_opengl_GL15_glUnmapBuffer (JNIEnv * env, jclass clazz, jint target) { GLboolean result = glUnmapBuffer(target); @@ -198,7 +198,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglGetBufferParameteriv */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferParameteriv +static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferParameteriv (JNIEnv * env, jclass clazz, jint target, jint pname, jobject params, jint params_offset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + params_offset; @@ -210,7 +210,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: glGetBufferPointer */ -static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_glGetBufferPointer +static jobject JNICALL Java_org_lwjgl_opengl_GL15_glGetBufferPointer (JNIEnv * env, jclass clazz, jint target, jint pname, jint size) { void *pointer; @@ -223,7 +223,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglGenQueries */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGenQueries +static void JNICALL Java_org_lwjgl_opengl_GL15_nglGenQueries (JNIEnv * env, jclass clazz, jint n, jobject ids, jint idsOffset) { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; @@ -235,7 +235,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglDeleteQueries */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglDeleteQueries +static void JNICALL Java_org_lwjgl_opengl_GL15_nglDeleteQueries (JNIEnv * env, jclass clazz, jint n, jobject ids, jint idsOffset) { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; @@ -247,7 +247,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: glIsQuery */ -static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GL15_glIsQuery +static jboolean JNICALL Java_org_lwjgl_opengl_GL15_glIsQuery (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsQuery(id); @@ -259,7 +259,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: glBeginQuery */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_glBeginQuery +static void JNICALL Java_org_lwjgl_opengl_GL15_glBeginQuery (JNIEnv * env, jclass clazz, jint target, jint id) { glBeginQuery(target, id); @@ -270,7 +270,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: glEndQuery */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_glEndQuery +static void JNICALL Java_org_lwjgl_opengl_GL15_glEndQuery (JNIEnv * env, jclass clazz, jint target) { glEndQuery(target); @@ -281,7 +281,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglGetQueryiv */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryiv +static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryiv (JNIEnv * env, jclass clazz, jint target, jint pname, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -293,7 +293,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglGetQueryObjectiv */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryObjectiv +static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryObjectiv (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; @@ -305,7 +305,7 @@ * Class: org.lwjgl.opengl.GL15 * Method: nglGetQueryObjectuiv */ -static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryObjectuiv +static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryObjectuiv (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; |
|
From: <ma...@us...> - 2004-03-07 15:49:55
|
Update of /cvsroot/java-game-lib/LWJGL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv442 Modified Files: build.xml Log Message: updated headers target Index: build.xml =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- build.xml 20 Jan 2004 11:19:11 -0000 1.15 +++ build.xml 7 Mar 2004 15:26:18 -0000 1.16 @@ -255,10 +255,10 @@ <class name="org.lwjgl.input.Mouse"/> <class name="org.lwjgl.openal.ALC"/> - <class name="org.lwjgl.openal.BaseAL"/> - <class name="org.lwjgl.openal.CoreAL"/> - <class name="org.lwjgl.openal.eax.BaseEAX"/> - <class name="org.lwjgl.openal.eax.CoreEAX"/> + <class name="org.lwjgl.openal.AL"/> + <class name="org.lwjgl.openal.AL10"/> + <class name="org.lwjgl.openal.eax.EAX"/> + <class name="org.lwjgl.openal.eax.EAX20"/> <class name="org.lwjgl.openal.eax.EAXBufferProperties"/> <class name="org.lwjgl.openal.eax.EAXListenerProperties"/> @@ -266,8 +266,8 @@ <class name="org.lwjgl.opengl.GL12"/> <class name="org.lwjgl.opengl.GL13"/> <class name="org.lwjgl.opengl.GL14"/> - <class name="org.lwjgl.opengl.GLU"/> - <class name="org.lwjgl.opengl.GLCaps"/> + <class name="org.lwjgl.opengl.GL15"/> + <class name="org.lwjgl.opengl.GLContext"/> <class name="org.lwjgl.opengl.Window"/> <class name="org.lwjgl.opengl.Pbuffer"/> </javah> |
|
From: <ma...@us...> - 2004-03-07 15:44:08
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31933 Modified Files: Sys.java Added Files: SwingAdapter.java PlatformAdapter.java Removed Files: AWTAdapter.java Adapter.java Log Message: PLATFORM now specifiable from properties AWTAdapter renamed to SwingAdapter Adapter renamed to PlatformAdapter --- NEW FILE: SwingAdapter.java --- /* * Copyright (c) 2002-2004 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; import javax.swing.JOptionPane; import javax.swing.UIManager; /** * $Id: SwingAdapter.java,v 1.1 2004/03/07 15:20:28 matzon Exp $ * <p> * A Swing adapter for using Swing to take care of things on platforms where we * know Swing is present. * <p><em>Note</em> To compile LWJGL applications with Excelsior JET that use JetPerfect * and that have no dependencies on Swing, do not include this class in your * JET project. * * @author cix_foo <ci...@us...> * @version $Revision: 1.1 $ */ final class SwingAdapter implements PlatformAdapter { /** * Constructs a new SwingAdapter */ SwingAdapter() { } /** * Spawn a "modal" dialog in the centre of the screen with a message in it * and an OK button. This method blocks until the dialog is dismissed. * @param title Title of alert * @param message Message to show in alert */ public void alert(String title, String message) { try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch(Exception e) { } JOptionPane.showMessageDialog(null, message, title, JOptionPane.WARNING_MESSAGE); } } --- NEW FILE: PlatformAdapter.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; /** * $Id: PlatformAdapter.java,v 1.1 2004/03/07 15:20:28 matzon Exp $ * * Interface for adapting to window environments. * * @author cix_foo <ci...@us...> * @version $Revision: 1.1 $ */ public interface PlatformAdapter { /** * Spawn a "modal" dialog in the centre of the screen with a message in it * and an OK button. This method blocks until the dialog is dismissed. * @param title * @param message */ public void alert(String title, String message); } Index: Sys.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- Sys.java 24 Feb 2004 14:31:39 -0000 1.41 +++ Sys.java 7 Mar 2004 15:20:28 -0000 1.42 @@ -78,6 +78,9 @@ /** The native library name */ private static String LIBRARY_NAME = "lwjgl"; + + /** The platform being executed on */ + private static String PLATFORM; /** * Debug flag. @@ -86,6 +89,12 @@ static { initialize(); + + // check platform name, and default to awt + PLATFORM = System.getProperty("org.lwjgl.Sys.platform"); + if(PLATFORM == null) { + PLATFORM = "org.lwjgl.SwingAdapter"; + } } /** @@ -208,10 +217,10 @@ nAlert(title, message); } else { try { - Adapter adapter = (Adapter) Class.forName("org.lwjgl.AWTAdapter").newInstance(); // This avoids a Jet error message + PlatformAdapter adapter = (PlatformAdapter) Class.forName(PLATFORM).newInstance(); // This avoids a Jet error message adapter.alert(title, message); } catch (Exception e) { - e.printStackTrace(System.err); + Sys.log("Unable to display alert using: " + PLATFORM); } } } --- AWTAdapter.java DELETED --- --- Adapter.java DELETED --- |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/arb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31365/src/native/common/arb Modified Files: org_lwjgl_opengl_ARBImaging.cpp org_lwjgl_opengl_ARBMatrixPalette.cpp org_lwjgl_opengl_ARBMultisample.cpp org_lwjgl_opengl_ARBMultitexture.cpp org_lwjgl_opengl_ARBOcclusionQuery.cpp org_lwjgl_opengl_ARBPointParameters.cpp org_lwjgl_opengl_ARBProgram.cpp org_lwjgl_opengl_ARBShaderObjects.cpp org_lwjgl_opengl_ARBTextureCompression.cpp org_lwjgl_opengl_ARBTransposeMatrix.cpp org_lwjgl_opengl_ARBVertexBlend.cpp org_lwjgl_opengl_ARBVertexBufferObject.cpp org_lwjgl_opengl_ARBVertexProgram.cpp org_lwjgl_opengl_ARBVertexShader.cpp org_lwjgl_opengl_ARBWindowPos.cpp Removed Files: org_lwjgl_opengl_ARBImaging.h org_lwjgl_opengl_ARBMatrixPalette.h org_lwjgl_opengl_ARBMultisample.h org_lwjgl_opengl_ARBMultitexture.h org_lwjgl_opengl_ARBOcclusionQuery.h org_lwjgl_opengl_ARBPointParameters.h org_lwjgl_opengl_ARBProgram.h org_lwjgl_opengl_ARBShaderObjects.h org_lwjgl_opengl_ARBTextureCompression.h org_lwjgl_opengl_ARBTransposeMatrix.h org_lwjgl_opengl_ARBVertexBlend.h org_lwjgl_opengl_ARBVertexBufferObject.h org_lwjgl_opengl_ARBVertexProgram.h org_lwjgl_opengl_ARBVertexShader.h org_lwjgl_opengl_ARBWindowPos.h Log Message: Replaced CHECK_EXISTS with one time check at symbol load time Index: org_lwjgl_opengl_ARBImaging.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBImaging.cpp 17 Feb 2004 21:59:17 -0000 1.1 +++ org_lwjgl_opengl_ARBImaging.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -39,7 +39,6 @@ * @version $Revision$ */ -#include "org_lwjgl_opengl_ARBImaging.h" #include "checkGLerror.h" #include "extgl.h" @@ -113,56 +112,14 @@ 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 +static 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 @@ -173,10 +130,9 @@ * Method: glColorSubTable * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable +static 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 @@ -187,10 +143,9 @@ * Method: glGetColorTable * Signature: (IIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable +static 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 @@ -201,10 +156,9 @@ * Method: glGetColorTableParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv +static 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 @@ -215,10 +169,9 @@ * Method: glGetColorTableParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv +static 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 @@ -229,10 +182,9 @@ * Method: glColorTableParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv +static 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 @@ -243,10 +195,9 @@ * Method: glColorTableParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv +static 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 @@ -258,10 +209,9 @@ * Method: glCopyColorSubTable * Signature: (IIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable +static 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 } @@ -272,10 +222,9 @@ * Method: glCopyColorTable * Signature: (IIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable +static 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 } @@ -286,10 +235,9 @@ * Method: glBlendEquation * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation (JNIEnv *env, jclass clazz, jint mode) { - CHECK_EXISTS(glBlendEquation) glBlendEquation(mode); CHECK_GL_ERROR } @@ -298,9 +246,8 @@ * 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) +static 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 } @@ -310,10 +257,9 @@ * Method: glHistogram * Signature: (IIIZ)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glHistogram +static 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 } @@ -323,10 +269,9 @@ * Method: glResetHistogram * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram (JNIEnv *env, jclass clazz, jint target) { - CHECK_EXISTS(glResetHistogram) glResetHistogram(target); CHECK_GL_ERROR } @@ -336,10 +281,9 @@ * Method: glGetHistogram * Signature: (IZIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram +static 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 @@ -350,10 +294,9 @@ * Method: glGetHistogramParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv +static 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 @@ -364,10 +307,9 @@ * Method: glGetHistogramParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv +static 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 @@ -378,10 +320,9 @@ * Method: glMinmax * Signature: (IIZ)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glMinmax +static 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 } @@ -391,10 +332,9 @@ * Method: glResetMinmax * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax (JNIEnv *env, jclass clazz, jint target) { - CHECK_EXISTS(glResetMinmax) glResetMinmax(target); CHECK_GL_ERROR } @@ -404,10 +344,9 @@ * Method: glGetMinmax * Signature: (IZIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax +static 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 @@ -418,10 +357,9 @@ * Method: glGetMinmaxParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv +static 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 @@ -432,10 +370,9 @@ * Method: glGetMinmaxParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv +static 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 @@ -446,10 +383,9 @@ * Method: glConvolutionFilter1D * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D +static 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 @@ -460,10 +396,9 @@ * Method: glConvolutionFilter2D * Signature: (IIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D +static 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 @@ -474,10 +409,9 @@ * Method: glConvolutionParameterf * Signature: (IIF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf +static 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 } @@ -487,10 +421,9 @@ * Method: glConvolutionParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv +static 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 @@ -501,10 +434,9 @@ * Method: glConvolutionParameteri * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri +static 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 } @@ -514,10 +446,9 @@ * Method: glConvolutionParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv +static 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 @@ -528,10 +459,9 @@ * Method: glCopyConvolutionFilter1D * Signature: (IIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D +static 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 } @@ -541,10 +471,9 @@ * Method: glCopyConvolutionFilter2D * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D +static 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 } @@ -554,10 +483,9 @@ * Method: glGetConvolutionFilter * Signature: (IIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter +static 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 @@ -568,10 +496,9 @@ * Method: glGetConvolutionParameterfv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterfv +static 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 @@ -582,10 +509,9 @@ * Method: glGetConvolutionParameteriv * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteriv +static 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 @@ -596,10 +522,9 @@ * Method: glSeparableFilter2D * Signature: (IIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D +static 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); @@ -611,13 +536,57 @@ * Method: glGetSeparableFilter * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter +static 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 } + +void extgl_InitARBImaging(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglColorTable", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglColorTable, "glColorTable", (void**)&glColorTable}, + {"nglColorSubTable", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable, "glColorSubTable", (void**)&glColorSubTable}, + {"nglColorTableParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv, "glColorTableParameteriv", (void**)&glColorTableParameteriv}, + {"nglColorTableParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv, "glColorTableParameterfv", (void**)&glColorTableParameterfv}, + {"glCopyColorSubTable", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable, "glCopyColorSubTable", (void**)&glCopyColorSubTable}, + {"glCopyColorTable", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable, "glCopyColorTable", (void**)&glCopyColorTable}, + {"nglGetColorTable", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable, "glGetColorTable", (void**)&glGetColorTable}, + {"nglGetColorTableParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv, "glGetColorTableParameteriv", (void**)&glGetColorTableParameteriv}, + {"nglGetColorTableParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv, "glGetColorTableParameterfv", (void**)&glGetColorTableParameterfv}, + {"glBlendEquation", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glBlendEquation, "glBlendEquation", (void**)&glBlendEquation}, + {"glBlendColor", "(FFFF)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glBlendColor, "glBlendColor", (void**)&glBlendColor}, + {"glHistogram", "(IIIZ)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glHistogram, "glHistogram", (void**)&glHistogram}, + {"glResetHistogram", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glResetHistogram, "glResetHistogram", (void**)&glResetHistogram}, + {"nglGetHistogram", "(IZIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram, "glGetHistogram", (void**)&glGetHistogram}, + {"nglGetHistogramParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv, "glGetHistogramParameterfv", (void**)&glGetHistogramParameterfv}, + {"nglGetHistogramParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv, "glGetHistogramParameteriv", (void**)&glGetHistogramParameteriv}, + {"glMinmax", "(IIZ)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glMinmax, "glMinmax", (void**)&glMinmax}, + {"glResetMinmax", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glResetMinmax, "glResetMinmax", (void**)&glResetMinmax}, + {"nglGetMinmax", "(IZIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax, "glGetMinmax", (void**)&glGetMinmax}, + {"nglGetMinmaxParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv, "glGetMinmaxParameterfv", (void**)&glGetMinmaxParameterfv}, + {"nglGetMinmaxParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv, "glGetMinmaxParameteriv", (void**)&glGetMinmaxParameteriv}, + {"nglConvolutionFilter1D", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D, "glConvolutionFilter1D", (void**)&glConvolutionFilter1D}, + {"nglConvolutionFilter2D", "(IIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D, "glConvolutionFilter2D", (void**)&glConvolutionFilter2D}, + {"glConvolutionParameterf", "(IIF)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf, "glConvolutionParameterf", (void**)&glConvolutionParameterf}, + {"nglConvolutionParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv, "glConvolutionParameterfv", (void**)&glConvolutionParameterfv}, + {"glConvolutionParameteri", "(III)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri, "glConvolutionParameteri", (void**)&glConvolutionParameteri}, + {"nglConvolutionParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv, "glConvolutionParameteriv", (void**)&glConvolutionParameteriv}, + {"glCopyConvolutionFilter1D", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D, "glCopyConvolutionFilter1D", (void**)&glCopyConvolutionFilter1D}, + {"glCopyConvolutionFilter2D", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D, "glCopyConvolutionFilter2D", (void**)&glCopyConvolutionFilter2D}, + {"nglGetConvolutionFilter", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter, "glGetConvolutionFilter", (void**)&glGetConvolutionFilter}, + {"nglGetConvolutionParameterfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterfv, "glGetConvolutionParameterfv", (void**)&glGetConvolutionParameterfv}, + {"nglGetConvolutionParameteriv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteriv, "glGetConvolutionParameteriv", (void**)&glGetConvolutionParameteriv}, + {"nglSeparableFilter2D", "(IIIIIILjava/nio/Buffer;ILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D, "glSeparableFilter2D", (void**)&glSeparableFilter2D}, + {"nglGetSeparableFilter", "(IIILjava/nio/Buffer;ILjava/nio/Buffer;ILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter, "glGetSeparableFilter", (void**)&glGetSeparableFilter} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBImaging"); + if (extgl_Extensions.GL_ARB_imaging) + extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_imaging", num_functions, functions); +} + Index: org_lwjgl_opengl_ARBMatrixPalette.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBMatrixPalette.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBMatrixPalette.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBMatrixPalette // ---------------------------------- -#include "org_lwjgl_opengl_ARBMatrixPalette.h" #include "extgl.h" #include "checkGLerror.h" @@ -50,26 +49,13 @@ static glMatrixIndexuivARBPROC glMatrixIndexuivARB; static glMatrixIndexPointerARBPROC glMatrixIndexPointerARB; -void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_matrix_palette) - return; - glCurrentPaletteMatrixARB = (glCurrentPaletteMatrixARBPROC) extgl_GetProcAddress("glCurrentPaletteMatrixARB"); - glMatrixIndexubvARB = (glMatrixIndexubvARBPROC) extgl_GetProcAddress("glMatrixIndexubvARB"); - glMatrixIndexusvARB = (glMatrixIndexusvARBPROC) extgl_GetProcAddress("glMatrixIndexusvARB"); - glMatrixIndexuivARB = (glMatrixIndexuivARBPROC) extgl_GetProcAddress("glMatrixIndexuivARB"); - glMatrixIndexPointerARB = (glMatrixIndexPointerARBPROC) extgl_GetProcAddress("glMatrixIndexPointerARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_matrix_palette) -} - /* * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: glCurrentPaletteMatrixARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatrixARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatrixARB (JNIEnv * env, jclass clazz, jint index) { - CHECK_EXISTS(glCurrentPaletteMatrixARB) glCurrentPaletteMatrixARB(index); CHECK_GL_ERROR } @@ -78,10 +64,9 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexPointerARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARB (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jobject pPointer, jint pPointer_offset) { - CHECK_EXISTS(glMatrixIndexPointerARB) GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glMatrixIndexPointerARB(size, type, stride, pPointer_ptr); CHECK_GL_ERROR @@ -91,10 +76,9 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexPointerARBVBO */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBVBO (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { - CHECK_EXISTS(glMatrixIndexPointerARB) glMatrixIndexPointerARB(size, type, stride, (GLvoid *)buffer_offset); CHECK_GL_ERROR } @@ -103,10 +87,9 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexubvARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB (JNIEnv * env, jclass clazz, jint size, jobject pIndices, jint pIndices_offset) { - CHECK_EXISTS(glMatrixIndexubvARB) GLubyte *pIndices_ptr = (GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset; glMatrixIndexubvARB(size, pIndices_ptr); CHECK_GL_ERROR @@ -116,10 +99,9 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexuivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB (JNIEnv * env, jclass clazz, jint size, jobject piIndices, jint piIndices_offset) { - CHECK_EXISTS(glMatrixIndexuivARB) GLuint *piIndices_ptr = (GLuint *)env->GetDirectBufferAddress(piIndices) + piIndices_offset; glMatrixIndexuivARB(size, piIndices_ptr); CHECK_GL_ERROR @@ -129,11 +111,27 @@ * Class: org.lwjgl.opengl.ARBMatrixPalette * Method: nglMatrixIndexusvARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB (JNIEnv * env, jclass clazz, jint size, jobject psIndices, jint psIndices_offset) { - CHECK_EXISTS(glMatrixIndexusvARB) GLushort *psIndices_ptr = (GLushort *)env->GetDirectBufferAddress(psIndices) + psIndices_offset; glMatrixIndexusvARB(size, psIndices_ptr); CHECK_GL_ERROR } + +void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glCurrentPaletteMatrixARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatrixARB, "glCurrentPaletteMatrixARB", (void**)&glCurrentPaletteMatrixARB}, + {"nglMatrixIndexPointerARB", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARB, "glMatrixIndexPointerARB", (void**)&glMatrixIndexPointerARB}, + {"nglMatrixIndexPointerARBVBO", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBVBO, NULL, NULL}, + {"nglMatrixIndexubvARB", "(ILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB, "glMatrixIndexubvARB", (void**)&glMatrixIndexubvARB}, + {"nglMatrixIndexuivARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB, "glMatrixIndexuivARB", (void**)&glMatrixIndexuivARB}, + {"nglMatrixIndexusvARB", "(ILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB, "glMatrixIndexusvARB", (void**)&glMatrixIndexusvARB} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBMatrixPalette"); + if (extgl_Extensions.GL_ARB_matrix_palette) + extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_matrix_palette", num_functions, functions); +} + Index: org_lwjgl_opengl_ARBMultisample.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBMultisample.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBMultisample.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,30 +34,32 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBMultisample // ---------------------------------- -#include "org_lwjgl_opengl_ARBMultisample.h" #include "extgl.h" #include "checkGLerror.h" -typedef void (APIENTRY * glSampleCoverageARBPROC) (GLclampf value, GLboolean invert ); +typedef void (APIENTRY * glSampleCoverageARBPROC) (GLclampf value, GLboolean invert); static glSampleCoverageARBPROC glSampleCoverageARB; -void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_multisample) - return; - glSampleCoverageARB = (glSampleCoverageARBPROC) extgl_GetProcAddress("glSampleCoverageARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_multisample) -} - /* * Class: org.lwjgl.opengl.ARBMultisample * Method: glSampleCoverageARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB (JNIEnv * env, jclass clazz, jfloat value, jboolean invert) { - CHECK_EXISTS(glSampleCoverageARB) glSampleCoverageARB(value, invert); CHECK_GL_ERROR } + +void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glSampleCoverageARB", "(FZ)V", (void*)&Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB, "glSampleCoverageARB", (void**)&glSampleCoverageARB} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBMultisample"); + if (extgl_Extensions.GL_ARB_multisample) + extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_multisample", num_functions, functions); +} + Index: org_lwjgl_opengl_ARBMultitexture.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBMultitexture.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBMultitexture.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBMultitexture // ---------------------------------- -#include "org_lwjgl_opengl_ARBMultitexture.h" #include "extgl.h" #include "checkGLerror.h" @@ -68,39 +67,13 @@ static glMultiTexCoord4iARBPROC glMultiTexCoord4iARB; static glMultiTexCoord4sARBPROC glMultiTexCoord4sARB; -void extgl_InitARBMultitexture(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_multitexture) - return; - glActiveTextureARB = (glActiveTextureARBPROC) extgl_GetProcAddress("glActiveTextureARB"); - glClientActiveTextureARB = (glClientActiveTextureARBPROC) extgl_GetProcAddress("glClientActiveTextureARB"); - - glMultiTexCoord1fARB = (glMultiTexCoord1fARBPROC) extgl_GetProcAddress("glMultiTexCoord1fARB"); - glMultiTexCoord1iARB = (glMultiTexCoord1iARBPROC) extgl_GetProcAddress("glMultiTexCoord1iARB"); - glMultiTexCoord1sARB = (glMultiTexCoord1sARBPROC) extgl_GetProcAddress("glMultiTexCoord1sARB"); - - glMultiTexCoord2fARB = (glMultiTexCoord2fARBPROC) extgl_GetProcAddress("glMultiTexCoord2fARB"); - glMultiTexCoord2iARB = (glMultiTexCoord2iARBPROC) extgl_GetProcAddress("glMultiTexCoord2iARB"); - glMultiTexCoord2sARB = (glMultiTexCoord2sARBPROC) extgl_GetProcAddress("glMultiTexCoord2sARB"); - - glMultiTexCoord3fARB = (glMultiTexCoord3fARBPROC) extgl_GetProcAddress("glMultiTexCoord3fARB"); - glMultiTexCoord3iARB = (glMultiTexCoord3iARBPROC) extgl_GetProcAddress("glMultiTexCoord3iARB"); - glMultiTexCoord3sARB = (glMultiTexCoord3sARBPROC) extgl_GetProcAddress("glMultiTexCoord3sARB"); - - glMultiTexCoord4fARB = (glMultiTexCoord4fARBPROC) extgl_GetProcAddress("glMultiTexCoord4fARB"); - glMultiTexCoord4iARB = (glMultiTexCoord4iARBPROC) extgl_GetProcAddress("glMultiTexCoord4iARB"); - glMultiTexCoord4sARB = (glMultiTexCoord4sARBPROC) extgl_GetProcAddress("glMultiTexCoord4sARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_multitexture) -} - /* * Class: org.lwjgl.opengl.ARBMultitexture * Method: glClientActiveTextureARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureARB (JNIEnv * env, jclass clazz, jint texture) { - CHECK_EXISTS(glClientActiveTextureARB) glClientActiveTextureARB(texture); CHECK_GL_ERROR } @@ -109,10 +82,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glActiveTextureARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB (JNIEnv * env, jclass clazz, jint texture) { - CHECK_EXISTS(glActiveTextureARB) glActiveTextureARB(texture); CHECK_GL_ERROR } @@ -121,10 +93,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1fARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB (JNIEnv * env, jclass clazz, jint target, jfloat s) { - CHECK_EXISTS(glMultiTexCoord1fARB) glMultiTexCoord1fARB(target, s); CHECK_GL_ERROR } @@ -133,10 +104,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1iARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB (JNIEnv * env, jclass clazz, jint target, jint s) { - CHECK_EXISTS(glMultiTexCoord1iARB) glMultiTexCoord1iARB(target, s); CHECK_GL_ERROR } @@ -145,10 +115,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord1sARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB (JNIEnv * env, jclass clazz, jint target, jshort s) { - CHECK_EXISTS(glMultiTexCoord1sARB) glMultiTexCoord1sARB(target, s); CHECK_GL_ERROR } @@ -157,10 +126,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2fARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t) { - CHECK_EXISTS(glMultiTexCoord2fARB) glMultiTexCoord2fARB(target, s, t); CHECK_GL_ERROR } @@ -169,10 +137,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2iARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t) { - CHECK_EXISTS(glMultiTexCoord2iARB) glMultiTexCoord2iARB(target, s, t); CHECK_GL_ERROR } @@ -181,10 +148,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord2sARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { - CHECK_EXISTS(glMultiTexCoord2sARB) glMultiTexCoord2sARB(target, s, t); CHECK_GL_ERROR } @@ -193,10 +159,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3fARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r) { - CHECK_EXISTS(glMultiTexCoord3fARB) glMultiTexCoord3fARB(target, s, t, r); CHECK_GL_ERROR } @@ -205,10 +170,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3iARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r) { - CHECK_EXISTS(glMultiTexCoord3iARB) glMultiTexCoord3iARB(target, s, t, r); CHECK_GL_ERROR } @@ -217,10 +181,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord3sARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { - CHECK_EXISTS(glMultiTexCoord3sARB) glMultiTexCoord3sARB(target, s, t, r); CHECK_GL_ERROR } @@ -229,10 +192,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4fARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jfloat q) { - CHECK_EXISTS(glMultiTexCoord4fARB) glMultiTexCoord4fARB(target, s, t, r, q); CHECK_GL_ERROR } @@ -241,10 +203,9 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4iARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r, jint q) { - CHECK_EXISTS(glMultiTexCoord4iARB) glMultiTexCoord4iARB(target, s, t, r, q); CHECK_GL_ERROR } @@ -253,10 +214,34 @@ * Class: org.lwjgl.opengl.ARBMultitexture * Method: glMultiTexCoord4sARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { - CHECK_EXISTS(glMultiTexCoord4sARB) glMultiTexCoord4sARB(target, s, t, r, q); CHECK_GL_ERROR } + +void extgl_InitARBMultitexture(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glClientActiveTextureARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureARB, "glClientActiveTextureARB", (void**)&glClientActiveTextureARB}, + {"glActiveTextureARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB, "glActiveTextureARB", (void**)&glActiveTextureARB}, + {"glMultiTexCoord1fARB", "(IF)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB, "glMultiTexCoord1fARB", (void**)&glMultiTexCoord1fARB}, + {"glMultiTexCoord1iARB", "(II)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB, "glMultiTexCoord1iARB", (void**)&glMultiTexCoord1iARB}, + {"glMultiTexCoord1sARB", "(IS)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB, "glMultiTexCoord1sARB", (void**)&glMultiTexCoord1sARB}, + {"glMultiTexCoord2fARB", "(IFF)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB, "glMultiTexCoord2fARB", (void**)&glMultiTexCoord2fARB}, + {"glMultiTexCoord2iARB", "(III)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB, "glMultiTexCoord2iARB", (void**)&glMultiTexCoord2iARB}, + {"glMultiTexCoord2sARB", "(ISS)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB, "glMultiTexCoord2sARB", (void**)&glMultiTexCoord2sARB}, + {"glMultiTexCoord3fARB", "(IFFF)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB, "glMultiTexCoord3fARB", (void**)&glMultiTexCoord3fARB}, + {"glMultiTexCoord3iARB", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB, "glMultiTexCoord3iARB", (void**)&glMultiTexCoord3iARB}, + {"glMultiTexCoord3sARB", "(ISSS)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB, "glMultiTexCoord3sARB", (void**)&glMultiTexCoord3sARB}, + {"glMultiTexCoord4fARB", "(IFFFF)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB, "glMultiTexCoord4fARB", (void**)&glMultiTexCoord4fARB}, + {"glMultiTexCoord4iARB", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB, "glMultiTexCoord4iARB", (void**)&glMultiTexCoord4iARB}, + {"glMultiTexCoord4sARB", "(ISSSS)V", (void*)&Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB, "glMultiTexCoord4sARB", (void**)&glMultiTexCoord4sARB} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBMultitexture"); + if (extgl_Extensions.GL_ARB_multitexture) + extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_multitexture", num_functions, functions); +} + Index: org_lwjgl_opengl_ARBOcclusionQuery.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBOcclusionQuery.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBOcclusionQuery.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBOcclusionQuery // ---------------------------------- -#include "org_lwjgl_opengl_ARBOcclusionQuery.h" #include "extgl.h" #include "checkGLerror.h" @@ -56,31 +55,13 @@ static glGetQueryObjectivARBPROC glGetQueryObjectivARB; static glGetQueryObjectuivARBPROC glGetQueryObjectuivARB; -void extgl_InitARBOcclusionQuery(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_occlusion_query) - return; - - glGenQueriesARB = (glGenQueriesARBPROC) extgl_GetProcAddress("glGenQueriesARB"); - glDeleteQueriesARB = (glDeleteQueriesARBPROC) extgl_GetProcAddress("glDeleteQueriesARB"); - glIsQueryARB = (glIsQueryARBPROC) extgl_GetProcAddress("glIsQueryARB"); - glBeginQueryARB = (glBeginQueryARBPROC) extgl_GetProcAddress("glBeginQueryARB"); - glEndQueryARB = (glEndQueryARBPROC) extgl_GetProcAddress("glEndQueryARB"); - glGetQueryivARB = (glGetQueryivARBPROC) extgl_GetProcAddress("glGetQueryivARB"); - glGetQueryObjectivARB = (glGetQueryObjectivARBPROC) extgl_GetProcAddress("glGetQueryObjectivARB"); - glGetQueryObjectuivARB = (glGetQueryObjectuivARBPROC) extgl_GetProcAddress("glGetQueryObjectuivARB"); - - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_occlusion_query) -} - /* * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGenQueriesARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB (JNIEnv * env, jclass clazz, jint n, jobject ids, jint idsOffset) { - CHECK_EXISTS(glGenQueriesARB) GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glGenQueriesARB(n, ids_ptr); CHECK_GL_ERROR @@ -90,10 +71,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglDeleteQueriesARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB (JNIEnv * env, jclass clazz, jint n, jobject ids, jint idsOffset) { - CHECK_EXISTS(glDeleteQueriesARB) GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glDeleteQueriesARB(n, ids_ptr); CHECK_GL_ERROR @@ -103,10 +83,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glIsQueryARB */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB +static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glIsQueryARB) GLboolean result = glIsQueryARB(id); CHECK_GL_ERROR return result; @@ -116,10 +95,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glBeginQueryARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB (JNIEnv * env, jclass clazz, jint target, jint id) { - CHECK_EXISTS(glBeginQueryARB) glBeginQueryARB(target, id); CHECK_GL_ERROR } @@ -128,10 +106,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: glEndQueryARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB (JNIEnv * env, jclass clazz, jint target) { - CHECK_EXISTS(glEndQueryARB) glEndQueryARB(target); CHECK_GL_ERROR } @@ -140,10 +117,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB (JNIEnv * env, jclass clazz, jint target, jint pname, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetQueryivARB) GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryivARB(target, pname, params_ptr); CHECK_GL_ERROR @@ -153,10 +129,9 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryObjectivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivARB (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetQueryObjectivARB) GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectivARB(id, pname, params_ptr); CHECK_GL_ERROR @@ -166,11 +141,29 @@ * Class: org.lwjgl.opengl.ARBOcclusionQuery * Method: nglGetQueryObjectuivARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuivARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuivARB (JNIEnv * env, jclass clazz, jint id, jint pname, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetQueryObjectuivARB) GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectuivARB(id, pname, params_ptr); CHECK_GL_ERROR } + +void extgl_InitARBOcclusionQuery(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglGenQueriesARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB, "glGenQueriesARB", (void**)&glGenQueriesARB}, + {"nglDeleteQueriesARB", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB, "glDeleteQueriesARB", (void**)&glDeleteQueriesARB}, + {"glIsQueryARB", "(I)Z", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB, "glIsQueryARB", (void**)&glIsQueryARB}, + {"glBeginQueryARB", "(II)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB, "glBeginQueryARB", (void**)&glBeginQueryARB}, + {"glEndQueryARB", "(I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB, "glEndQueryARB", (void**)&glEndQueryARB}, + {"nglGetQueryivARB", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB, "glGetQueryivARB", (void**)&glGetQueryivARB}, + {"nglGetQueryObjectivARB", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivARB, "glGetQueryObjectivARB", (void**)&glGetQueryObjectivARB}, + {"nglGetQueryObjectuivARB", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuivARB, "glGetQueryObjectuivARB", (void**)&glGetQueryObjectuivARB} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBOcclusionQuery"); + if (extgl_Extensions.GL_ARB_occlusion_query) + extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_occlusion_query", num_functions, functions); +} + Index: org_lwjgl_opengl_ARBPointParameters.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBPointParameters.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBPointParameters.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBPointParameters // ---------------------------------- -#include "org_lwjgl_opengl_ARBPointParameters.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,23 +43,13 @@ static glPointParameterfARBPROC glPointParameterfARB; static glPointParameterfvARBPROC glPointParameterfvARB; -void extgl_InitARBPointParameters(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_point_parameters) - return; - glPointParameterfARB = (glPointParameterfARBPROC) extgl_GetProcAddress("glPointParameterfARB"); - glPointParameterfvARB = (glPointParameterfvARBPROC) extgl_GetProcAddress("glPointParameterfvARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ARB_point_parameters) -} - /* * Class: org.lwjgl.opengl.ARBPointParameters * Method: glPointParameterfARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfARB (JNIEnv * env, jclass clazz, jint pname, jfloat param) { - CHECK_EXISTS(glPointParameterfARB) glPointParameterfARB(pname, param); CHECK_GL_ERROR } @@ -69,11 +58,23 @@ * Class: org.lwjgl.opengl.ARBPointParameters * Method: nglPointParameterfvARB */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfvARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfvARB (JNIEnv * env, jclass clazz, jint pname, jobject pfParams, jint pfParams_offset) { - CHECK_EXISTS(glPointParameterfvARB) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glPointParameterfvARB(pname, pfParams_ptr); CHECK_GL_ERROR } + +void extgl_InitARBPointParameters(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glPointParameterfARB", "(IF)V", (void*)&Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfARB, "glPointParameterfARB", (void**)&glPointParameterfARB}, + {"nglPointParameterfvARB", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfvARB, "glPointParameterfvARB", (void**)&glPointParameterfvARB} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ARBPointParameters"); + if (extgl_Extensions.GL_ARB_point_parameters) + extgl_InitializeClass(env, clazz, ext_set, "GL_ARB_point_parameters", num_functions, functions); +} + Index: org_lwjgl_opengl_ARBProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBProgram.cpp 8 Feb 2004 20:31:36 -0000 1.1 +++ org_lwjgl_opengl_ARBProgram.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ARBProgram // ---------------------------------- -#include "org_lwjgl_opengl_ARBProgram.h" #include "extgl.h" #include "checkGLerror.h" @@ -67,34 +66,13 @@ static glGetProgramStringARBPROC glGetProgramStringARB; static glIsProgramARBPROC glIsProgramARB; -void extgl_InitARBProgram(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ARB_fragment_program) - return; - glProgramStringARB = (glProgramStringARBPROC) extgl_GetProcAddress("glProgramStringARB"); - glBindProgramARB = (glBindProgramARBPROC) extgl_GetProcAddress("glBindProgramARB"); - glDeleteProgramsARB = (glDeleteProgramsARBPROC) extgl_GetProcAddress("glDeleteProgramsARB"); - glGenProgramsARB = (glGenProgramsARBPROC) extgl_GetProcAddress("glGenProgramsARB"); - glProgramEnvParameter4fARB = (glProgramEnvParameter4fARBPROC) extgl_GetProcAddress("glProgramEnvParameter4fARB"); - glProgramEnvParameter4fvARB = (glProgramEnvParameter4fvARBPROC) extgl_GetProcAddress("glProgramEnvParameter4fvARB"); - glProgramLocalParameter4fARB = (glProgramLocalP... [truncated message content] |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31365/src/native/common Modified Files: checkGLerror.h extgl.cpp extgl.h org_lwjgl_opengl_GL11.cpp org_lwjgl_opengl_GL12.cpp org_lwjgl_opengl_GL13.cpp org_lwjgl_opengl_GL14.cpp org_lwjgl_opengl_GL15.cpp Removed Files: org_lwjgl_opengl_GL11.h org_lwjgl_opengl_GL12.h org_lwjgl_opengl_GL13.h org_lwjgl_opengl_GL14.h org_lwjgl_opengl_GL15.h Log Message: Replaced CHECK_EXISTS with one time check at symbol load time Index: checkGLerror.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/checkGLerror.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- checkGLerror.h 5 Feb 2004 17:14:50 -0000 1.11 +++ checkGLerror.h 7 Mar 2004 15:18:45 -0000 1.12 @@ -28,13 +28,4 @@ } \ } -#define CHECK_EXISTS(f) \ - { \ - if (!f) { \ - jclass cls = env->FindClass("org/lwjgl/opengl/OpenGLException"); \ - env->ThrowNew(cls, "This function is not available in this driver."); \ - env->DeleteLocalRef(cls); \ - } \ - } \ - #endif /* _CHECKGLERROR_H_INCLUDED_ */ Index: extgl.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- extgl.cpp 5 Mar 2004 22:57:51 -0000 1.25 +++ extgl.cpp 7 Mar 2004 15:18:45 -0000 1.26 @@ -594,6 +594,39 @@ CFBundleRef agl_bundle_ref = NULL; #endif +jclass extgl_ResetClass(JNIEnv *env, const char *class_name) { + jclass clazz = env->FindClass(class_name); + jint result = env->UnregisterNatives(clazz); + if (result != 0) + printfDebug("Could not unregister natives for class %s\n", class_name); + return clazz; +} + +void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndGLFunction *functions) { + JNINativeMethod methods[num_functions]; + for (int i = 0; i < num_functions; i++) { + JavaMethodAndGLFunction *function = functions + i; + if (function->gl_function_name != NULL) { + void *gl_func_pointer = extgl_GetProcAddress(function->gl_function_name); + if (gl_func_pointer == NULL) { + printf("NOTICE: %s disabled because of missing driver symbols\n", ext_name); + if (ext_set != NULL) + extgl_removeExtension(env, ext_set, ext_name); + return; + } + void **gl_function_pointer_pointer = function->gl_function_pointer; + *gl_function_pointer_pointer = gl_func_pointer; + } + JNINativeMethod *method = methods + i; + method->name = function->method_name; + method->signature = function->signature; + method->fnPtr = function->method_pointer; + } + jint result = env->RegisterNatives(clazz, methods, num_functions); + if (result != 0) + printfDebug("Could not register natives for extension %s\n", ext_name); +} + static void doExtension(JNIEnv *env, jobject ext_set, const char *method_name, const char *ext) { jclass clazz = env->GetObjectClass(ext_set); jmethodID id = env->GetMethodID(clazz, method_name, "(Ljava/lang/Object;)Z"); @@ -802,7 +835,7 @@ wglSaveBufferRegionARB = (wglSaveBufferRegionARBPROC) extgl_GetProcAddress("wglSaveBufferRegionARB"); wglRestoreBufferRegionARB = (wglRestoreBufferRegionARBPROC) extgl_GetProcAddress("wglRestoreBufferRegionARB"); - EXTGL_SANITY_CHECK(env, NULL, WGL_ARB_buffer_region); + EXTGL_SANITY_CHECK(env, WGL_ARB_buffer_region); } static void extgl_InitWGLARBPbuffer(JNIEnv *env) @@ -814,7 +847,7 @@ wglReleasePbufferDCARB = (wglReleasePbufferDCARBPROC) extgl_GetProcAddress("wglReleasePbufferDCARB"); wglDestroyPbufferARB = (wglDestroyPbufferARBPROC) extgl_GetProcAddress("wglDestroyPbufferARB"); wglQueryPbufferARB = (wglQueryPbufferARBPROC) extgl_GetProcAddress("wglQueryPbufferARB"); - EXTGL_SANITY_CHECK(env, NULL, WGL_ARB_pbuffer); + EXTGL_SANITY_CHECK(env, WGL_ARB_pbuffer); } @@ -825,7 +858,7 @@ wglGetPixelFormatAttribivARB = (wglGetPixelFormatAttribivARBPROC) extgl_GetProcAddress("wglGetPixelFormatAttribivARB"); wglGetPixelFormatAttribfvARB = (wglGetPixelFormatAttribfvARBPROC) extgl_GetProcAddress("wglGetPixelFormatAttribfvARB"); wglChoosePixelFormatARB = (wglChoosePixelFormatARBPROC) extgl_GetProcAddress("wglChoosePixelFormatARB"); - EXTGL_SANITY_CHECK(env, NULL, WGL_ARB_pixel_format); + EXTGL_SANITY_CHECK(env, WGL_ARB_pixel_format); } @@ -836,7 +869,7 @@ wglBindTexImageARB = (wglBindTexImageARBPROC) extgl_GetProcAddress("wglBindTexImageARB"); wglReleaseTexImageARB = (wglReleaseTexImageARBPROC) extgl_GetProcAddress("wglReleaseTexImageARB"); wglSetPbufferAttribARB = (wglSetPbufferAttribARBPROC) extgl_GetProcAddress("wglSetPbufferAttribARB"); - EXTGL_SANITY_CHECK(env, NULL, WGL_ARB_render_texture); + EXTGL_SANITY_CHECK(env, WGL_ARB_render_texture); } @@ -846,7 +879,7 @@ return; wglSwapIntervalEXT = (wglSwapIntervalEXTPROC) extgl_GetProcAddress("wglSwapIntervalEXT"); wglGetSwapIntervalEXT = (wglGetSwapIntervalEXTPROC) extgl_GetProcAddress("wglGetSwapIntervalEXT"); - EXTGL_SANITY_CHECK(env, NULL, WGL_EXT_swap_control); + EXTGL_SANITY_CHECK(env, WGL_EXT_swap_control); } @@ -856,7 +889,7 @@ return; wglMakeContextCurrentARB = (wglMakeContextCurrentARBPROC) extgl_GetProcAddress("wglMakeContextCurrentARB"); wglGetCurrentReadDCARB = (wglGetCurrentReadDCARBPROC) extgl_GetProcAddress("wglGetCurrentReadDCARB"); - EXTGL_SANITY_CHECK(env, NULL, WGL_ARB_make_current_read); + EXTGL_SANITY_CHECK(env, WGL_ARB_make_current_read); } @@ -960,37 +993,6 @@ return QueryExtension(env, ext_set, glGetString(GL_EXTENSIONS), name); } -/*static void extgl_InitNVPrimitiveRestart(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_primitive_restart) - return; - glPrimitiveRestartNV = (glPrimitiveRestartNVPROC) extgl_GetProcAddress("glPrimitiveRestartNV"); - glPrimitiveRestartIndexNV = (glPrimitiveRestartIndexNVPROC) extgl_GetProcAddress("glPrimitiveRestartIndexNV"); - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_primitive_restart) -} - -static void extgl_InitNVElementArray(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_element_array) - return; - glElementPointerNV = (glElementPointerNVPROC) extgl_GetProcAddress("glElementPointerNV"); - glDrawElementArrayNV = (glDrawElementArrayNVPROC) extgl_GetProcAddress("glDrawElementArrayNV"); - glDrawRangeElementArrayNV = (glDrawRangeElementArrayNVPROC) extgl_GetProcAddress("glDrawRangeElementArrayNV"); - glMultiDrawElementArrayNV = (glMultiDrawElementArrayNVPROC) extgl_GetProcAddress("glMultiDrawElementArrayNV"); - glMultiDrawRangeElementArrayNV = (glMultiDrawRangeElementArrayNVPROC) extgl_GetProcAddress("glMultiDrawRangeElementArrayNV"); - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_element_array) -} - - -static void extgl_InitEXTCullVertex(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_cull_vertex) - return; - glCullParameterfvEXT = (glCullParameterfvEXTPROC) extgl_GetProcAddress("glCullParameterfvEXT"); - glCullParameterdvEXT = (glCullParameterdvEXTPROC) extgl_GetProcAddress("glCullParameterdvEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_cull_vertex) -} -*/ #ifdef _X11 static void extgl_InitGLX13(JNIEnv *env) @@ -1015,7 +1017,7 @@ glXQueryContext = (glXQueryContextPROC) extgl_GetProcAddress("glXQueryContext"); glXSelectEvent = (glXSelectEventPROC) extgl_GetProcAddress("glXSelectEvent"); glXGetSelectedEvent = (glXGetSelectedEventPROC) extgl_GetProcAddress("glXGetSelectedEvent"); - EXTGL_SANITY_CHECK(env, (jobject)NULL, GLX13); + EXTGL_SANITY_CHECK(env, GLX13); } static bool extgl_InitGLX12(void) @@ -1056,7 +1058,7 @@ if (extgl_Extensions.GLX_SGI_swap_control != 1) return; glXSwapIntervalSGI = (glXSwapIntervalSGIPROC)extgl_GetProcAddress("glXSwapIntervalSGI"); - EXTGL_SANITY_CHECK(env, (jobject)NULL, GLX_SGI_swap_control); + EXTGL_SANITY_CHECK(env, GLX_SGI_swap_control); } bool extgl_InitGLX(JNIEnv *env, Display *disp, int screen) @@ -1208,7 +1210,7 @@ extgl_Extensions.GL_SGIX_shadow = GLQueryExtension(env, ext_set, "GL_SGIX_shadow"); } -extern void extgl_InitOpenGL1_1(); +extern void extgl_InitOpenGL1_1(JNIEnv *env); //extern void extgl_InitARBFragmentProgram(JNIEnv *env, jobject ext_set); extern void extgl_InitARBImaging(JNIEnv *env, jobject ext_set); extern void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set); @@ -1271,7 +1273,7 @@ bool extgl_Initialize(JNIEnv *env, jobject ext_set) { extgl_error = false; - extgl_InitOpenGL1_1(); + extgl_InitOpenGL1_1(env); if (extgl_error) return false; @@ -1323,7 +1325,6 @@ extgl_InitNVRegisterCombiners2(env, ext_set); extgl_InitNVVertexArrayRange(env, ext_set); extgl_InitNVVertexProgram(env, ext_set); - extgl_InitATIDrawBuffers(env, ext_set); extgl_InitATIElementArray(env, ext_set); extgl_InitATIEnvmapBumpmap(env, ext_set); Index: extgl.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- extgl.h 25 Feb 2004 18:09:01 -0000 1.28 +++ extgl.h 7 Mar 2004 15:18:45 -0000 1.29 @@ -3213,19 +3213,19 @@ bool GL_EXT_texture_lod_bias; bool GL_EXT_vertex_shader; bool GL_EXT_vertex_weighting; - bool GL_EXT_draw_range_elements; - bool GL_ATI_draw_buffers; + bool GL_EXT_draw_range_elements; + bool GL_ATI_draw_buffers; bool GL_ATI_element_array; bool GL_ATI_envmap_bumpmap; bool GL_ATI_fragment_shader; - bool GL_ATI_map_object_buffer; + bool GL_ATI_map_object_buffer; bool GL_ATI_pn_triangles; bool GL_ATI_point_cull_mode; bool GL_ATI_separate_stencil; bool GL_ATI_text_fragment_shader; bool GL_ATI_texture_mirror_once; bool GL_ATI_vertex_array_object; - bool GL_ATI_vertex_attrib_array_object; + bool GL_ATI_vertex_attrib_array_object; bool GL_ATI_vertex_streams; bool GL_ATIX_point_sprites; bool GL_ATIX_texture_env_route; @@ -3239,11 +3239,11 @@ bool GL_NV_float_buffer; bool GL_NV_fog_distance; bool GL_NV_fragment_program; - bool GL_NV_half_float; + bool GL_NV_half_float; bool GL_NV_light_max_exponent; bool GL_NV_occlusion_query; bool GL_NV_packed_depth_stencil; - bool GL_NV_pixel_data_range; + bool GL_NV_pixel_data_range; bool GL_NV_point_sprite; bool GL_NV_primitive_restart; bool GL_NV_register_combiners; @@ -3290,14 +3290,25 @@ void extgl_Close(void); void extgl_removeExtension(JNIEnv *env, jobject ext_set, const char *ext); -#define EXTGL_SANITY_CHECK(e,h,x) if (extgl_error) { \ +typedef struct { + char *method_name; + char *signature; + void *method_pointer; + + char *gl_function_name; + void **gl_function_pointer; +} JavaMethodAndGLFunction; + +#define NUMFUNCTIONS(x) (sizeof(x)/sizeof(JavaMethodAndGLFunction)); + +jclass extgl_ResetClass(JNIEnv *env, const char *class_name); +void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndGLFunction *functions); +#define EXTGL_SANITY_CHECK(e,x) if (extgl_error) { \ extgl_Extensions.x = false; \ printf("NOTICE: %s disabled because of missing driver symbols\n", #x); \ extgl_error = false; \ - if (h != NULL) { \ - extgl_removeExtension(e, h, #x); \ - } \ } + #ifdef __cplusplus } #endif Index: org_lwjgl_opengl_GL11.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL11.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_GL11.cpp 29 Jan 2004 22:07:03 -0000 1.3 +++ org_lwjgl_opengl_GL11.cpp 7 Mar 2004 15:18:45 -0000 1.4 @@ -39,13 +39,12 @@ * @version $Revision$ */ -#include "org_lwjgl_opengl_GL11.h" #include "checkGLerror.h" #include "extgl.h" typedef void (APIENTRY * glAccumPROC) (GLenum op, GLfloat value); typedef void (APIENTRY * glAlphaFuncPROC) (GLenum func, GLclampf ref); -typedef GLboolean (APIENTRY * glAreTexturesResidentPROC) (GLsizei n, const GLuint *textures, GLboolean *residences); +//typedef GLboolean (APIENTRY * glAreTexturesResidentPROC) (GLsizei n, const GLuint *textures, GLboolean *residences); [...2927 lines suppressed...] + {"glTexEnvf", "(IIF)V", (void*)&Java_org_lwjgl_opengl_GL11_glTexEnvf, "glTexEnvf", (void**)&glTexEnvf}, + {"glTexEnvi", "(III)V", (void*)&Java_org_lwjgl_opengl_GL11_glTexEnvi, "glTexEnvi", (void**)&glTexEnvi}, + {"nglTexEnvfv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_GL11_nglTexEnvfv, "glTexEnvfv", (void**)&glTexEnvfv}, + {"nglTexEnviv", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_GL11_nglTexEnviv, "glTexEnviv", (void**)&glTexEnviv}, + {"nglTexCoordPointer", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL11_nglTexCoordPointer, "glTexCoordPointer", (void**)&glTexCoordPointer}, + {"nglTexCoordPointerVBO", "(IIII)V", (void*)&Java_org_lwjgl_opengl_GL11_nglTexCoordPointerVBO, NULL, NULL}, + {"glTexCoord1f", "(F)V", (void*)&Java_org_lwjgl_opengl_GL11_glTexCoord1f, "glTexCoord1f", (void**)&glTexCoord1f}, + {"glTexCoord2f", "(FF)V", (void*)&Java_org_lwjgl_opengl_GL11_glTexCoord2f, "glTexCoord2f", (void**)&glTexCoord2f}, + {"glTexCoord3f", "(FFF)V", (void*)&Java_org_lwjgl_opengl_GL11_glTexCoord3f, "glTexCoord3f", (void**)&glTexCoord3f}, + {"glTexCoord4f", "(FFFF)V", (void*)&Java_org_lwjgl_opengl_GL11_glTexCoord4f, "glTexCoord4f", (void**)&glTexCoord4f}, + {"glStencilOp", "(III)V", (void*)&Java_org_lwjgl_opengl_GL11_glStencilOp, "glStencilOp", (void**)&glStencilOp}, + {"glStencilMask", "(I)V", (void*)&Java_org_lwjgl_opengl_GL11_glStencilMask, "glStencilMask", (void**)&glStencilMask}, + {"glViewport", "(IIII)V", (void*)&Java_org_lwjgl_opengl_GL11_glViewport, "glViewport", (void**)&glViewport} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/GL11"); + if (true) + extgl_InitializeClass(env, clazz, NULL, "GL11", num_functions, functions); +} + 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.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_GL12.cpp 17 Feb 2004 21:59:08 -0000 1.3 +++ org_lwjgl_opengl_GL12.cpp 7 Mar 2004 15:18:46 -0000 1.4 @@ -39,7 +39,6 @@ * @version $Revision$ */ -#include "org_lwjgl_opengl_GL12.h" #include "checkGLerror.h" #include "extgl.h" @@ -53,26 +52,14 @@ static glTexSubImage3DPROC glTexSubImage3D; static glCopyTexSubImage3DPROC glCopyTexSubImage3D; -void extgl_InitOpenGL1_2(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.OpenGL12) - return; - glTexImage3D = (glTexImage3DPROC) extgl_GetProcAddress("glTexImage3D"); - glTexSubImage3D = (glTexSubImage3DPROC) extgl_GetProcAddress("glTexSubImage3D"); - glCopyTexSubImage3D = (glCopyTexSubImage3DPROC) extgl_GetProcAddress("glCopyTexSubImage3D"); - glDrawRangeElements = (glDrawRangeElementsPROC) extgl_GetProcAddress("glDrawRangeElements"); - EXTGL_SANITY_CHECK(env, ext_set, OpenGL12) -} - /* * Class: org_lwjgl_opengl_GL12 * Method: nglDrawRangeElements * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElements +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElements (JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glDrawRangeElements) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glDrawRangeElements(mode, start, end, count, type, address); CHECK_GL_ERROR @@ -83,10 +70,9 @@ * Method: nglDrawRangeElementsVBO * Signature: (IIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsVBO (JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint buffer_offset) { - CHECK_EXISTS(glDrawRangeElements) glDrawRangeElements(mode, start, end, count, type, offsetToPointer(buffer_offset)); CHECK_GL_ERROR } @@ -96,10 +82,9 @@ * Method: glTexImage3D * Signature: (IIIIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glTexImage3D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glTexImage3D(target, level, internalformat, width, height, depth, border, format, type, address); CHECK_GL_ERROR @@ -110,10 +95,9 @@ * Method: glTexSubImage3D * Signature: (IIIIIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint type, jobject buffer, jint offset) { - CHECK_EXISTS(glTexSubImage3D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, address); CHECK_GL_ERROR @@ -124,11 +108,25 @@ * Method: glCopyTexSubImage3D * Signature: (IIIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glCopyTexSubImage3D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_glCopyTexSubImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint x, jint y, jint width, jint height) { - CHECK_EXISTS(glCopyTexSubImage3D) glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height); CHECK_GL_ERROR } +void extgl_InitOpenGL1_2(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglDrawRangeElements", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL12_nglDrawRangeElements, "glDrawRangeElements", (void**)&glDrawRangeElements}, + {"nglDrawRangeElementsVBO", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsVBO, NULL, NULL}, + {"nglTexImage3D", "(IIIIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL12_nglTexImage3D, "glTexImage3D", (void**)&glTexImage3D}, + {"nglTexSubImage3D", "(IIIIIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL12_nglTexSubImage3D, "glTexSubImage3D", (void**)&glTexSubImage3D}, + {"glCopyTexSubImage3D", "(IIIIIIIII)V", (void*)&Java_org_lwjgl_opengl_GL12_glCopyTexSubImage3D, "glCopyTexSubImage3D", (void**)&glCopyTexSubImage3D} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/GL12"); + if (extgl_Extensions.OpenGL12) + extgl_InitializeClass(env, clazz, ext_set, "OpenGL12", num_functions, functions); +} + Index: org_lwjgl_opengl_GL13.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL13.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_GL13.cpp 29 Jan 2004 22:07:03 -0000 1.2 +++ org_lwjgl_opengl_GL13.cpp 7 Mar 2004 15:18:46 -0000 1.3 @@ -39,7 +39,6 @@ * @version $Revision$ */ -#include "org_lwjgl_opengl_GL13.h" #include "checkGLerror.h" #include "extgl.h" @@ -52,82 +51,22 @@ typedef void (APIENTRY * glCompressedTexSubImage2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data ); typedef void (APIENTRY * glCompressedTexSubImage3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data ); typedef void (APIENTRY * glGetCompressedTexImagePROC) (GLenum target, GLint lod, GLvoid *img ); -typedef void (APIENTRY * glMultiTexCoord1dPROC) (GLenum target, GLdouble s ); -typedef void (APIENTRY * glMultiTexCoord1dvPROC) (GLenum target, const GLdouble *v ); typedef void (APIENTRY * glMultiTexCoord1fPROC) (GLenum target, GLfloat s ); -typedef void (APIENTRY * glMultiTexCoord1fvPROC) (GLenum target, const GLfloat *v ); -typedef void (APIENTRY * glMultiTexCoord1iPROC) (GLenum target, GLint s ); -typedef void (APIENTRY * glMultiTexCoord1ivPROC) (GLenum target, const GLint *v ); -typedef void (APIENTRY * glMultiTexCoord1sPROC) (GLenum target, GLshort s ); -typedef void (APIENTRY * glMultiTexCoord1svPROC) (GLenum target, const GLshort *v ); -typedef void (APIENTRY * glMultiTexCoord2dPROC) (GLenum target, GLdouble s, GLdouble t ); -typedef void (APIENTRY * glMultiTexCoord2dvPROC) (GLenum target, const GLdouble *v ); typedef void (APIENTRY * glMultiTexCoord2fPROC) (GLenum target, GLfloat s, GLfloat t ); -typedef void (APIENTRY * glMultiTexCoord2fvPROC) (GLenum target, const GLfloat *v ); -typedef void (APIENTRY * glMultiTexCoord2iPROC) (GLenum target, GLint s, GLint t ); -typedef void (APIENTRY * glMultiTexCoord2ivPROC) (GLenum target, const GLint *v ); -typedef void (APIENTRY * glMultiTexCoord2sPROC) (GLenum target, GLshort s, GLshort t ); -typedef void (APIENTRY * glMultiTexCoord2svPROC) (GLenum target, const GLshort *v ); -typedef void (APIENTRY * glMultiTexCoord3dPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r ); -typedef void (APIENTRY * glMultiTexCoord3dvPROC) (GLenum target, const GLdouble *v ); typedef void (APIENTRY * glMultiTexCoord3fPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r ); -typedef void (APIENTRY * glMultiTexCoord3fvPROC) (GLenum target, const GLfloat *v ); -typedef void (APIENTRY * glMultiTexCoord3iPROC) (GLenum target, GLint s, GLint t, GLint r ); -typedef void (APIENTRY * glMultiTexCoord3ivPROC) (GLenum target, const GLint *v ); -typedef void (APIENTRY * glMultiTexCoord3sPROC) (GLenum target, GLshort s, GLshort t, GLshort r ); -typedef void (APIENTRY * glMultiTexCoord3svPROC) (GLenum target, const GLshort *v ); -typedef void (APIENTRY * glMultiTexCoord4dPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q ); -typedef void (APIENTRY * glMultiTexCoord4dvPROC) (GLenum target, const GLdouble *v ); typedef void (APIENTRY * glMultiTexCoord4fPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q ); -typedef void (APIENTRY * glMultiTexCoord4fvPROC) (GLenum target, const GLfloat *v ); -typedef void (APIENTRY * glMultiTexCoord4iPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q ); -typedef void (APIENTRY * glMultiTexCoord4ivPROC) (GLenum target, const GLint *v ); -typedef void (APIENTRY * glMultiTexCoord4sPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q ); -typedef void (APIENTRY * glMultiTexCoord4svPROC) (GLenum target, const GLshort *v ); -typedef void (APIENTRY * glLoadTransposeMatrixdPROC) (const GLdouble m[16] ); typedef void (APIENTRY * glLoadTransposeMatrixfPROC) (const GLfloat m[16] ); -typedef void (APIENTRY * glMultTransposeMatrixdPROC) (const GLdouble m[16] ); typedef void (APIENTRY * glMultTransposeMatrixfPROC) (const GLfloat m[16] ); typedef void (APIENTRY * glSampleCoveragePROC) (GLclampf value, GLboolean invert ); static glActiveTexturePROC glActiveTexture; static glClientActiveTexturePROC glClientActiveTexture; -static glMultiTexCoord1dPROC glMultiTexCoord1d; -static glMultiTexCoord1dvPROC glMultiTexCoord1dv; static glMultiTexCoord1fPROC glMultiTexCoord1f; -static glMultiTexCoord1fvPROC glMultiTexCoord1fv; -static glMultiTexCoord1iPROC glMultiTexCoord1i; -static glMultiTexCoord1ivPROC glMultiTexCoord1iv; -static glMultiTexCoord1sPROC glMultiTexCoord1s; -static glMultiTexCoord1svPROC glMultiTexCoord1sv; -static glMultiTexCoord2dPROC glMultiTexCoord2d; -static glMultiTexCoord2dvPROC glMultiTexCoord2dv; static glMultiTexCoord2fPROC glMultiTexCoord2f; -static glMultiTexCoord2fvPROC glMultiTexCoord2fv; -static glMultiTexCoord2iPROC glMultiTexCoord2i; -static glMultiTexCoord2ivPROC glMultiTexCoord2iv; -static glMultiTexCoord2sPROC glMultiTexCoord2s; -static glMultiTexCoord2svPROC glMultiTexCoord2sv; -static glMultiTexCoord3dPROC glMultiTexCoord3d; -static glMultiTexCoord3dvPROC glMultiTexCoord3dv; static glMultiTexCoord3fPROC glMultiTexCoord3f; -static glMultiTexCoord3fvPROC glMultiTexCoord3fv; -static glMultiTexCoord3iPROC glMultiTexCoord3i; -static glMultiTexCoord3ivPROC glMultiTexCoord3iv; -static glMultiTexCoord3sPROC glMultiTexCoord3s; -static glMultiTexCoord3svPROC glMultiTexCoord3sv; -static glMultiTexCoord4dPROC glMultiTexCoord4d; -static glMultiTexCoord4dvPROC glMultiTexCoord4dv; static glMultiTexCoord4fPROC glMultiTexCoord4f; -static glMultiTexCoord4fvPROC glMultiTexCoord4fv; -static glMultiTexCoord4iPROC glMultiTexCoord4i; -static glMultiTexCoord4ivPROC glMultiTexCoord4iv; -static glMultiTexCoord4sPROC glMultiTexCoord4s; -static glMultiTexCoord4svPROC glMultiTexCoord4sv; static glLoadTransposeMatrixfPROC glLoadTransposeMatrixf; -static glLoadTransposeMatrixdPROC glLoadTransposeMatrixd; static glMultTransposeMatrixfPROC glMultTransposeMatrixf; -static glMultTransposeMatrixdPROC glMultTransposeMatrixd; static glCompressedTexImage3DPROC glCompressedTexImage3D; static glCompressedTexImage2DPROC glCompressedTexImage2D; static glCompressedTexImage1DPROC glCompressedTexImage1D; @@ -137,74 +76,14 @@ static glGetCompressedTexImagePROC glGetCompressedTexImage; static glSampleCoveragePROC glSampleCoverage; -void extgl_InitOpenGL1_3(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.OpenGL13) - return; - glActiveTexture = (glActiveTexturePROC) extgl_GetProcAddress("glActiveTexture"); - glClientActiveTexture = (glClientActiveTexturePROC) extgl_GetProcAddress("glClientActiveTexture"); - - glMultiTexCoord1d = (glMultiTexCoord1dPROC) extgl_GetProcAddress("glMultiTexCoord1d"); - glMultiTexCoord1dv = (glMultiTexCoord1dvPROC) extgl_GetProcAddress("glMultiTexCoord1dv"); - glMultiTexCoord1f = (glMultiTexCoord1fPROC) extgl_GetProcAddress("glMultiTexCoord1f"); - glMultiTexCoord1fv = (glMultiTexCoord1fvPROC) extgl_GetProcAddress("glMultiTexCoord1fv"); - glMultiTexCoord1i = (glMultiTexCoord1iPROC) extgl_GetProcAddress("glMultiTexCoord1i"); - glMultiTexCoord1iv = (glMultiTexCoord1ivPROC) extgl_GetProcAddress("glMultiTexCoord1iv"); - glMultiTexCoord1s = (glMultiTexCoord1sPROC) extgl_GetProcAddress("glMultiTexCoord1s"); - glMultiTexCoord1sv = (glMultiTexCoord1svPROC) extgl_GetProcAddress("glMultiTexCoord1sv"); - - glMultiTexCoord2d = (glMultiTexCoord2dPROC) extgl_GetProcAddress("glMultiTexCoord2d"); - glMultiTexCoord2dv = (glMultiTexCoord2dvPROC) extgl_GetProcAddress("glMultiTexCoord2dv"); - glMultiTexCoord2f = (glMultiTexCoord2fPROC) extgl_GetProcAddress("glMultiTexCoord2f"); - glMultiTexCoord2fv = (glMultiTexCoord2fvPROC) extgl_GetProcAddress("glMultiTexCoord2fv"); - glMultiTexCoord2i = (glMultiTexCoord2iPROC) extgl_GetProcAddress("glMultiTexCoord2i"); - glMultiTexCoord2iv = (glMultiTexCoord2ivPROC) extgl_GetProcAddress("glMultiTexCoord2iv"); - glMultiTexCoord2s = (glMultiTexCoord2sPROC) extgl_GetProcAddress("glMultiTexCoord2s"); - glMultiTexCoord2sv = (glMultiTexCoord2svPROC) extgl_GetProcAddress("glMultiTexCoord2sv"); - - glMultiTexCoord3d = (glMultiTexCoord3dPROC) extgl_GetProcAddress("glMultiTexCoord3d"); - glMultiTexCoord3dv = (glMultiTexCoord3dvPROC) extgl_GetProcAddress("glMultiTexCoord3dv"); - glMultiTexCoord3f = (glMultiTexCoord3fPROC) extgl_GetProcAddress("glMultiTexCoord3f"); - glMultiTexCoord3fv = (glMultiTexCoord3fvPROC) extgl_GetProcAddress("glMultiTexCoord3fv"); - glMultiTexCoord3i = (glMultiTexCoord3iPROC) extgl_GetProcAddress("glMultiTexCoord3i"); - glMultiTexCoord3iv = (glMultiTexCoord3ivPROC) extgl_GetProcAddress("glMultiTexCoord3iv"); - glMultiTexCoord3s = (glMultiTexCoord3sPROC) extgl_GetProcAddress("glMultiTexCoord3s"); - glMultiTexCoord3sv = (glMultiTexCoord3svPROC) extgl_GetProcAddress("glMultiTexCoord3sv"); - - glMultiTexCoord4d = (glMultiTexCoord4dPROC) extgl_GetProcAddress("glMultiTexCoord4d"); - glMultiTexCoord4dv = (glMultiTexCoord4dvPROC) extgl_GetProcAddress("glMultiTexCoord4dv"); - glMultiTexCoord4f = (glMultiTexCoord4fPROC) extgl_GetProcAddress("glMultiTexCoord4f"); - glMultiTexCoord4fv = (glMultiTexCoord4fvPROC) extgl_GetProcAddress("glMultiTexCoord4fv"); - glMultiTexCoord4i = (glMultiTexCoord4iPROC) extgl_GetProcAddress("glMultiTexCoord4i"); - glMultiTexCoord4iv = (glMultiTexCoord4ivPROC) extgl_GetProcAddress("glMultiTexCoord4iv"); - glMultiTexCoord4s = (glMultiTexCoord4sPROC) extgl_GetProcAddress("glMultiTexCoord4s"); - glMultiTexCoord4sv = (glMultiTexCoord4svPROC) extgl_GetProcAddress("glMultiTexCoord4sv"); - - glLoadTransposeMatrixf = (glLoadTransposeMatrixfPROC) extgl_GetProcAddress("glLoadTransposeMatrixf"); - glLoadTransposeMatrixd = (glLoadTransposeMatrixdPROC) extgl_GetProcAddress("glLoadTransposeMatrixd"); - glMultTransposeMatrixf = (glMultTransposeMatrixfPROC) extgl_GetProcAddress("glMultTransposeMatrixf"); - glMultTransposeMatrixd = (glMultTransposeMatrixdPROC) extgl_GetProcAddress("glMultTransposeMatrixd"); - glCompressedTexImage3D = (glCompressedTexImage3DPROC) extgl_GetProcAddress("glCompressedTexImage3D"); - glCompressedTexImage2D = (glCompressedTexImage2DPROC) extgl_GetProcAddress("glCompressedTexImage2D"); - glCompressedTexImage1D = (glCompressedTexImage1DPROC) extgl_GetProcAddress("glCompressedTexImage1D"); - glCompressedTexSubImage3D = (glCompressedTexSubImage3DPROC) extgl_GetProcAddress("glCompressedTexSubImage3D"); - glCompressedTexSubImage2D = (glCompressedTexSubImage2DPROC) extgl_GetProcAddress("glCompressedTexSubImage2D"); - glCompressedTexSubImage1D = (glCompressedTexSubImage1DPROC) extgl_GetProcAddress("glCompressedTexSubImage1D"); - glGetCompressedTexImage = (glGetCompressedTexImagePROC) extgl_GetProcAddress("glGetCompressedTexImage"); - - glSampleCoverage = (glSampleCoveragePROC) extgl_GetProcAddress("glSampleCoverage"); - EXTGL_SANITY_CHECK(env, ext_set, OpenGL13) -} - /* * Class: org_lwjgl_opengl_GL13 * Method: glActiveTexture * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glActiveTexture +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glActiveTexture (JNIEnv *env, jclass clazz, jint texture) { - CHECK_EXISTS(glActiveTexture) glActiveTexture(texture); CHECK_GL_ERROR } @@ -214,10 +93,9 @@ * Method: glClientActiveTexture * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glClientActiveTexture +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glClientActiveTexture (JNIEnv *env, jclass clazz, jint texture) { - CHECK_EXISTS(glClientActiveTexture) glClientActiveTexture(texture); CHECK_GL_ERROR } @@ -227,10 +105,9 @@ * Method: glCompressedTexImage1D * Signature: (IIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1D (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imagesize, jobject buffer, jint offset) { - CHECK_EXISTS(glCompressedTexImage1D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage1D(target, level, internalformat, width, border, imagesize, address); CHECK_GL_ERROR @@ -241,10 +118,9 @@ * Method: glCompressedTexImage2D * Signature: (IIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2D (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imagesize, jobject buffer, jint offset) { - CHECK_EXISTS(glCompressedTexImage2D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage2D(target, level, internalformat, width, height, border, imagesize, address); CHECK_GL_ERROR @@ -255,10 +131,9 @@ * Method: glCompressedTexImage3D * Signature: (IIIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imagesize, jobject buffer, jint offset) { - CHECK_EXISTS(glCompressedTexImage3D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imagesize, address); CHECK_GL_ERROR @@ -269,10 +144,9 @@ * Method: glCompressedTexSubImage1D * Signature: (IIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imagesize, jobject buffer, jint offset) { - CHECK_EXISTS(glCompressedTexSubImage1D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage1D(target, level, xoffset, width, format, imagesize, address); CHECK_GL_ERROR @@ -283,10 +157,9 @@ * Method: glCompressedTexSubImage2D * Signature: (IIIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imagesize, jobject buffer, jint offset) { - CHECK_EXISTS(glCompressedTexSubImage2D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imagesize, address); CHECK_GL_ERROR @@ -297,10 +170,9 @@ * Method: glCompressedTexSubImage3D * Signature: (IIIIIIIIIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3D +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imagesize, jobject buffer, jint offset) { - CHECK_EXISTS(glCompressedTexSubImage3D) const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imagesize, address); CHECK_GL_ERROR @@ -311,10 +183,9 @@ * Method: glGetCompressedTexImage * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImage +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImage (JNIEnv *env, jclass clazz, jint target, jint lod, jobject buffer, jint offset) { - CHECK_EXISTS(glGetCompressedTexImage) void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetCompressedTexImage(target, lod, address); CHECK_GL_ERROR @@ -327,10 +198,9 @@ * Method: glMultiTexCoord1f * Signature: (IF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord1f +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord1f (JNIEnv *env, jclass clazz, jint target, jfloat s) { - CHECK_EXISTS(glMultiTexCoord1f) glMultiTexCoord1f(target, s); } @@ -341,10 +211,9 @@ * Method: glMultiTexCoord2f * Signature: (IFF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord2f +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord2f (JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t) { - CHECK_EXISTS(glMultiTexCoord2f) glMultiTexCoord2f(target, s, t); } @@ -356,10 +225,9 @@ * Method: glMultiTexCoord3f * Signature: (IFFF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord3f +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord3f (JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r) { - CHECK_EXISTS(glMultiTexCoord3f) glMultiTexCoord3f(target, s, t, r); } @@ -370,10 +238,9 @@ * Method: glMultiTexCoord4f * Signature: (IFFFF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord4f +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glMultiTexCoord4f (JNIEnv *env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jfloat q) { - CHECK_EXISTS(glMultiTexCoord4f) glMultiTexCoord4f(target, s, t, r, q); } @@ -384,10 +251,9 @@ * Method: glLoadTransposeMatrixf * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglLoadTransposeMatrixf +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglLoadTransposeMatrixf (JNIEnv *env, jclass clazz, jobject buffer, jint offset) { - CHECK_EXISTS(glLoadTransposeMatrixf) const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); glLoadTransposeMatrixf(address); CHECK_GL_ERROR @@ -400,10 +266,9 @@ * Method: glMultTransposeMatrixf * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultTransposeMatrixf +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglMultTransposeMatrixf (JNIEnv *env, jclass clazz, jobject buffer, jint offset) { - CHECK_EXISTS(glMultTransposeMatrixf) const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); glMultTransposeMatrixf(address); CHECK_GL_ERROR @@ -414,10 +279,36 @@ * Method: glSampleCoverage * Signature: (FZ)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glSampleCoverage +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_glSampleCoverage (JNIEnv *env, jclass clazz, jfloat value, jboolean invert) { - CHECK_EXISTS(glSampleCoverage) glSampleCoverage(value, invert); CHECK_GL_ERROR } + +void extgl_InitOpenGL1_3(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glActiveTexture", "(I)V", (void*)&Java_org_lwjgl_opengl_GL13_glActiveTexture, "glActiveTexture", (void**)&glActiveTexture}, + {"glClientActiveTexture", "(I)V", (void*)&Java_org_lwjgl_opengl_GL13_glClientActiveTexture, "glClientActiveTexture", (void**)&glClientActiveTexture}, + {"nglCompressedTexImage1D", "(IIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1D, "glCompressedTexImage1D", (void**)&glCompressedTexImage1D}, + {"nglCompressedTexImage2D", "(IIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2D, "glCompressedTexImage2D", (void**)&glCompressedTexImage2D}, + {"nglCompressedTexImage3D", "(IIIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3D, "glCompressedTexImage3D", (void**)&glCompressedTexImage3D}, + {"nglCompressedTexSubImage1D", "(IIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1D, "glCompressedTexSubImage1D", (void**)&glCompressedTexSubImage1D}, + {"nglCompressedTexSubImage2D", "(IIIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2D, "glCompressedTexSubImage2D", (void**)&glCompressedTexSubImage2D}, + {"nglCompressedTexSubImage3D", "(IIIIIIIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3D, "glCompressedTexSubImage3D", (void**)&glCompressedTexSubImage3D}, + {"nglGetCompressedTexImage", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImage, "glGetCompressedTexImage", (void**)&glGetCompressedTexImage}, + {"glMultiTexCoord1f", "(IF)V", (void*)&Java_org_lwjgl_opengl_GL13_glMultiTexCoord1f, "glMultiTexCoord1f", (void**)&glMultiTexCoord1f}, + {"glMultiTexCoord2f", "(IFF)V", (void*)&Java_org_lwjgl_opengl_GL13_glMultiTexCoord2f, "glMultiTexCoord2f", (void**)&glMultiTexCoord2f}, + {"glMultiTexCoord3f", "(IFFF)V", (void*)&Java_org_lwjgl_opengl_GL13_glMultiTexCoord3f, "glMultiTexCoord3f", (void**)&glMultiTexCoord3f}, + {"glMultiTexCoord4f", "(IFFFF)V", (void*)&Java_org_lwjgl_opengl_GL13_glMultiTexCoord4f, "glMultiTexCoord4f", (void**)&glMultiTexCoord4f}, + {"nglLoadTransposeMatrixf", "(Ljava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglLoadTransposeMatrixf, "glLoadTransposeMatrixf", (void**)&glLoadTransposeMatrixf}, + {"nglMultTransposeMatrixf", "(Ljava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_GL13_nglMultTransposeMatrixf, "glMultTransposeMatrixf", (void**)&glMultTransposeMatrixf}, + {"glSampleCoverage", "(FZ)V", (void*)&Java_org_lwjgl_opengl_GL13_glSampleCoverage, "glSampleCoverage", (void**)&glSampleCoverage} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/GL13"); + if (extgl_Extensions.OpenGL13) + extgl_InitializeClass(env, clazz, ext_set, "OpenGL13", num_functions, 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.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_GL14.cpp 17 Feb 2004 21:36:17 -0000 1.3 +++ org_lwjgl_opengl_GL14.cpp 7 Mar 2004 15:18:46 -0000 1.4 @@ -39,166 +39,53 @@ * @version $Revision$ */ -#include "org_lwjgl_opengl_GL14.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 * glFogCoordfPROC) (GLfloat coord); -typedef void (APIENTRY * glFogCoordfvPROC) (const GLfloat *coord); -typedef void (APIENTRY * glFogCoorddPROC) (GLdouble coord); -typedef void (APIENTRY * glFogCoorddvPROC) (const GLdouble *coord); typedef void (APIENTRY * glFogCoordPointerPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); typedef void (APIENTRY * glMultiDrawArraysPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (APIENTRY * glMultiDrawElementsPROC) (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount); typedef void (APIENTRY * glPointParameterfPROC) (GLenum pname, GLfloat param); typedef void (APIENTRY * glPointParameterfvPROC) (GLenum pname, GLfloat *params); typedef void (APIENTRY * glSecondaryColor3bPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRY * glSecondaryColor3bvPROC) (const GLbyte *v); -typedef void (APIENTRY * glSecondaryColor3dPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRY * glSecondaryColor3dvPROC) (const GLdouble *v); typedef void (APIENTRY * glSecondaryColor3fPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRY * glSecondaryColor3fvPROC) (const GLfloat *v); -typedef void (APIENTRY * glSecondaryColor3iPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRY * glSecondaryColor3ivPROC) (const GLint *v); -typedef void (APIENTRY * glSecondaryColor3sPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRY * glSecondaryColor3svPROC) (const GLshort *v); typedef void (APIENTRY * glSecondaryColor3ubPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRY * glSecondaryColor3ubvPROC) (const GLubyte *v); -typedef void (APIENTRY * glSecondaryColor3uiPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRY * glSecondaryColor3uivPROC) (const GLuint *v); -typedef void (APIENTRY * glSecondaryColor3usPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRY * glSecondaryColor3usvPROC) (const GLushort *v); typedef void (APIENTRY * glSecondaryColorPointerPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); typedef void (APIENTRY * glBlendFuncSeparatePROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (APIENTRY * glWindowPos2dPROC) (GLdouble x, GLdouble y); typedef void (APIENTRY * glWindowPos2fPROC) (GLfloat x, GLfloat y); typedef void (APIENTRY * glWindowPos2iPROC) (GLint x, GLint y); -typedef void (APIENTRY * glWindowPos2sPROC) (GLshort x, GLshort y); -typedef void (APIENTRY * glWindowPos2dvPROC) (const GLdouble *p); -typedef void (APIENTRY * glWindowPos2fvPROC) (const GLfloat *p); -typedef void (APIENTRY * glWindowPos2ivPROC) (const GLint *p); -typedef void (APIENTRY * glWindowPos2svPROC) (const GLshort *p); -typedef void (APIENTRY * glWindowPos3dPROC) (GLdouble x, GLdouble y, GLdouble z); typedef void (APIENTRY * glWindowPos3fPROC) (GLfloat x, GLfloat y, GLfloat z); typedef void (APIENTRY * glWindowPos3iPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRY * glWindowPos3sPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRY * glWindowPos3dvPROC) (const GLdouble *p); -typedef void (APIENTRY * glWindowPos3fvPROC) (const GLfloat *p); -typedef void (APIENTRY * glWindowPos3ivPROC) (const GLint *p); -typedef void (APIENTRY * glWindowPos3svPROC) (const GLshort *p); static glFogCoordfPROC glFogCoordf; -static glFogCoordfvPROC glFogCoordfv; -static glFogCoorddPROC glFogCoordd; -static glFogCoorddvPROC glFogCoorddv; static glFogCoordPointerPROC glFogCoordPointer; static glMultiDrawArraysPROC glMultiDrawArrays; -static glMultiDrawElementsPROC glMultiDrawElements; static glPointParameterfPROC glPointParameterf; static glPointParameterfvPROC glPointParameterfv; static glSecondaryColor3bPROC glSecondaryColor3b; -static glSecondaryColor3bvPROC glSecondaryColor3bv; -static glSecondaryColor3dPROC glSecondaryColor3d; -static glSecondaryColor3dvPROC glSecondaryColor3dv; static glSecondaryColor3fPROC glSecondaryColor3f; -static glSecondaryColor3fvPROC glSecondaryColor3fv; -static glSecondaryColor3iPROC glSecondaryColor3i; -static glSecondaryColor3ivPROC glSecondaryColor3iv; -static glSecondaryColor3sPROC glSecondaryColor3s; -static glSecondaryColor3svPROC glSecondaryColor3sv; static glSecondaryColor3ubPROC glSecondaryColor3ub; -static glSecondaryColor3ubvPROC glSecondaryColor3ubv; -static glSecondaryColor3uiPROC glSecondaryColor3ui; -static glSecondaryColor3uivPROC glSecondaryColor3uiv; -static glSecondaryColor3usPROC glSecondaryColor3us; -static glSecondaryColor3usvPROC glSecondaryColor3usv; static glSecondaryColorPointerPROC glSecondaryColorPointer; static glBlendFuncSeparatePROC glBlendFuncSeparate; -static glWindowPos2dPROC glWindowPos2d; static glWindowPos2fPROC glWindowPos2f; static glWindowPos2iPROC glWindowPos2i; -static glWindowPos2sPROC glWindowPos2s; -static glWindowPos2dvPROC glWindowPos2dv; -static glWindowPos2fvPROC glWindowPos2fv; -static glWindowPos2ivPROC glWindowPos2iv; -static glWindowPos2svPROC glWindowPos2sv; -static glWindowPos3dPROC glWindowPos3d; static glWindowPos3fPROC glWindowPos3f; static glWindowPos3iPROC glWindowPos3i; -static glWindowPos3sPROC glWindowPos3s; -static glWindowPos3dvPROC glWindowPos3dv; -static glWindowPos3fvPROC glWindowPos3fv; -static glWindowPos3ivPROC glWindowPos3iv; -static glWindowPos3svPROC glWindowPos3sv; static glBlendColorPROC glBlendColor; static glBlendEquationPROC glBlendEquation; -void extgl_InitOpenGL1_4(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.OpenGL14) - return; - glBlendColor = (glBlendColorPROC) extgl_GetProcAddress("glBlendColor"); - glBlendEquation = (glBlendEquationPROC) extgl_GetProcAddress("glBlendEquation"); - glFogCoordf = (glFogCoordfPROC) extgl_GetProcAddress("glFogCoordf"); - glFogCoordfv = (glFogCoordfvPROC) extgl_GetProcAddress("glFogCoordfv"); - glFogCoordd = (glFogCoorddPROC) extgl_GetProcAddress("glFogCoordd"); - glFogCoorddv = (glFogCoorddvPROC) extgl_GetProcAddress("glFogCoorddv"); - glFogCoordPointer = (glFogCoordPointerPROC) extgl_GetProcAddress("glFogCoordPointer"); - glMultiDrawArrays = (glMultiDrawArraysPROC) extgl_GetProcAddress("glMultiDrawArrays"); - glMultiDrawElements = (glMultiDrawElementsPROC) extgl_GetProcAddress("glMultiDrawElements"); - glPointParameterf = (glPointParameterfPROC) extgl_GetProcAddress("glPointParameterf"); - glPointParameterfv = (glPointParameterfvPROC) extgl_GetProcAddress("glPointParameterfv"); - glSecondaryColor3b = (glSecondaryColor3bPROC) extgl_GetProcAddress("glSecondaryColor3b"); - glSecondaryColor3bv = (glSecondaryColor3bvPROC) extgl_GetProcAddress("glSecondaryColor3bv"); - glSecondaryColor3d = (glSecondaryColor3dPROC) extgl_GetProcAddress("glSecondaryColor3d"); - glSecondaryColor3dv = (glSecondaryColor3dvPROC) extgl_GetProcAddress("glSecondaryColor3dv"); - glSecondaryColor3f = (glSecondaryColor3fPROC) extgl_GetProcAddress("glSecondaryColor3f"); - glSecondaryColor3fv = (glSecondaryColor3fvPROC) extgl_GetProcAddress("glSecondaryColor3fv"); - glSecondaryColor3i = (glSecondaryColor3iPROC) extgl_GetProcAddress("glSecondaryColor3i"); - glSecondaryColor3iv = (glSecondaryColor3ivPROC) extgl_GetProcAddress("glSecondaryColor3iv"); - glSecondaryColor3s = (glSecondaryColor3sPROC) extgl_GetProcAddress("glSecondaryColor3s"); - glSecondaryColor3sv = (glSecondaryColor3svPROC) extgl_GetProcAddress("glSecondaryColor3sv"); - glSecondaryColor3ub = (glSecondaryColor3ubPROC) extgl_GetProcAddress("glSecondaryColor3ub"); - glSecondaryColor3ubv = (glSecondaryColor3ubvPROC) extgl_GetProcAddress("glSecondaryColor3ubv"); - glSecondaryColor3ui = (glSecondaryColor3uiPROC) extgl_GetProcAddress("glSecondaryColor3ui"); - glSecondaryColor3uiv = (glSecondaryColor3uivPROC) extgl_GetProcAddress("glSecondaryColor3uiv"); - glSecondaryColor3us = (glSecondaryColor3usPROC) extgl_GetProcAddress("glSecondaryColor3us"); - glSecondaryColor3usv = (glSecondaryColor3usvPROC) extgl_GetProcAddress("glSecondaryColor3usv"); - glSecondaryColorPointer = (glSecondaryColorPointerPROC) extgl_GetProcAddress("glSecondaryColorPointer"); - glBlendFuncSeparate = (glBlendFuncSeparatePROC) extgl_GetProcAddress("glBlendFuncSeparate"); - glWindowPos2d = (glWindowPos2dPROC) extgl_GetProcAddress("glWindowPos2d"); - glWindowPos2f = (glWindowPos2fPROC) extgl_GetProcAddress("glWindowPos2f"); - glWindowPos2i = (glWindowPos2iPROC) extgl_GetProcAddress("glWindowPos2i"); - glWindowPos2s = (glWindowPos2sPROC) extgl_GetProcAddress("glWindowPos2s"); - glWindowPos2dv = (glWindowPos2dvPROC) extgl_GetProcAddress("glWindowPos2dv"); - glWindowPos2fv = (glWindowPos2fvPROC) extgl_GetProcAddress("glWindowPos2fv"); - glWindowPos2iv = (glWindowPos2ivPROC) extgl_GetProcAddress("glWindowPos2iv"); - glWindowPos2sv = (glWindowPos2svPROC) extgl_GetProcAddress("glWindowPos2sv"); - glWindowPos3d = (glWindowPos3dPROC) extgl_GetProcAddress("glWindowPos3d"); - glWindowPos3f = (glWindowPos3fPROC) extgl_GetProcAddress("glWindowPos3f"); - glWindowPos3i = (glWindowPos3iPROC) extgl_GetProcAddress("glWindowPos3i"); - glWindowPos3s = (glWindowPos3sPROC) extgl_GetProcAddress("glWindowPos3s"); - glWindowPos3dv = (glWindowPos3dvPROC) extgl_GetProcAddress("glWindowPos3dv"); - glWindowPos3fv = (glWindowPos3fvPROC) extgl_GetProcAddress("glWindowPos3fv"); - glWindowPos3iv = (glWindowPos3ivPROC) extgl_GetProcAddress("glWindowPos3iv"); - glWindowPos3sv = (glWindowPos3svPROC) extgl_GetProcAddress("glWindowPos3sv"); - EXTGL_SANITY_CHECK(env, ext_set, OpenGL14) -} - -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendEquation +static 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) +static 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 } @@ -208,9 +95,8 @@ * Method: glFogCoordf * Signature: (F)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glFogCoordf +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glFogCoordf (JNIEnv *env, jclass clazz, jfloat f) { - CHECK_EXISTS(glFogCoordf) glFogCoordf(f); } @@ -220,9 +106,8 @@ * Method: nglFogCoordPointer * Signature: (IILjava/nio/Buffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointer +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointer (JNIEnv *env, jclass clazz, jint p1, jint p2, jobject buffer, jint offset) { - CHECK_EXISTS(glFogCoordPointer) GLvoid *address = (GLvoid *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glFogCoordPointer(p1, p2, address); CHECK_GL_ERROR @@ -233,9 +118,8 @@ * Method: nglFogCoordPointerVBO * Signature: (IILjava/nio/Buffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerVBO (JNIEnv *env, jclass clazz, jint p1, jint p2, jint buffer_offset) { - CHECK_EXISTS(glFogCoordPointer) glFogCoordPointer(p1, p2, offsetToPointer(buffer_offset)); CHECK_GL_ERROR } @@ -245,9 +129,8 @@ * Method: glMultiDrawArrays * Signature: (IIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglMultiDrawArrays +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglMultiDrawArrays (JNIEnv *env, jclass clazz, jint mode, jobject first, jint first_offset, jobject count, jint count_offset, jint primcount) { - CHECK_EXISTS(glMultiDrawArrays) GLint *address = first_offset + (GLint *)env->GetDirectBufferAddress(first); GLsizei *address2 = count_offset + (GLsizei *)env->GetDirectBufferAddress(count); glMultiDrawArrays(mode, address, address2, (GLsizei)primcount); @@ -256,27 +139,11 @@ /* * Class: org_lwjgl_opengl_GL14 - * Method: glMultiDrawElements - * Signature: (IIIII)V - */ -/*JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glMultiDrawElements - (JNIEnv *env, jclass clazz, jint mode, jobject count, jint type, jobject indices, jint primcount) { - CHECK_EXISTS(glMultiDrawElements) - const GLsizei *address = (const GLsizei *)env->GetDirectBufferAddress(count); - const void *address2 = (const void *)env->GetDirectBufferAddress(indices); - glMultiDrawElements(mode, address, type, address2, primcount); - CHECK_GL_ERROR -} -*/ - -/* - * Class: org_lwjgl_opengl_GL14 * Method: glPointParameterf * Signature: (IF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glPointParameterf +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glPointParameterf (JNIEnv *env, jclass clazz, jint p1, jfloat p2) { - CHECK_EXISTS(glPointParameterf) glPointParameterf(p1, p2); CHECK_GL_ERROR } @@ -286,9 +153,8 @@ * Method: glPointParameterfv * Signature: (ILjava/nio/FloatBuffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglPointParameterfv +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglPointParameterfv (JNIEnv *env, jclass clazz, jint p1, jobject buffer, jint offset) { - CHECK_EXISTS(glPointParameterfv) GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glPointParameterfv(p1, address); CHECK_GL_ERROR @@ -299,9 +165,8 @@ * Method: glSecondaryColor3b * Signature: (BBB)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3b +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3b (JNIEnv *env, jclass clazz, jbyte p1, jbyte p2, jbyte p3) { - CHECK_EXISTS(glSecondaryColor3b) glSecondaryColor3b(p1, p2, p3); } @@ -311,9 +176,8 @@ * Method: glSecondaryColor3f * Signature: (FFF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3f +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3f (JNIEnv *env, jclass clazz, jfloat p1, jfloat p2, jfloat p3) { - CHECK_EXISTS(glSecondaryColor3f) glSecondaryColor3f(p1, p2, p3); } @@ -323,9 +187,8 @@ * Method: glSecondaryColor3ub * Signature: (BBB)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3ub +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glSecondaryColor3ub (JNIEnv *env, jclass clazz, jbyte p1, jbyte p2, jbyte p3) { - CHECK_EXISTS(glSecondaryColor3ub) glSecondaryColor3ub(p1, p2, p3); } @@ -334,9 +197,8 @@ * Method: nglSecondaryColorPointer * Signature: (IIILjava/nio/Buffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointer +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointer (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jobject buffer, jint offset) { - CHECK_EXISTS(glSecondaryColorPointer) const GLvoid *address = (const GLvoid *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glSecondaryColorPointer(p1, p2, p3, address); CHECK_GL_ERROR @@ -347,9 +209,8 @@ * Method: nglSecondaryColorPointerVBO * Signature: (IIILjava/nio/Buffer;)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerVBO (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jint buffer_offset) { - CHECK_EXISTS(glSecondaryColorPointer) glSecondaryColorPointer(p1, p2, p3, offsetToPointer(buffer_offset)); CHECK_GL_ERROR } @@ -359,9 +220,8 @@ * Method: glBlendFuncSeparate * Signature: (IIII)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendFuncSeparate +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glBlendFuncSeparate (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jint p4) { - CHECK_EXISTS(glBlendFuncSeparate) glBlendFuncSeparate(p1, p2, p3, p4); CHECK_GL_ERROR } @@ -372,9 +232,8 @@ * Method: glWindowPos2f * Signature: (FF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos2f +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos2f (JNIEnv *env, jclass clazz, jfloat p1, jfloat p2) { - CHECK_EXISTS(glWindowPos2f); glWindowPos2f(p1, p2); } @@ -383,9 +242,8 @@ * Method: glWindowPos2i * Signature: (II)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos2i +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos2i (JNIEnv *env, jclass clazz, jint p1, jint p2) { - CHECK_EXISTS(glWindowPos2i) glWindowPos2i(p1, p2); } @@ -395,9 +253,8 @@ * Method: glWindowPos3f * Signature: (FFF)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos3f +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos3f (JNIEnv *env, jclass clazz, jfloat p1, jfloat p2, jfloat p3) { - CHECK_EXISTS(glWindowPos3f) glWindowPos3f(p1, p2, p3); } @@ -407,8 +264,36 @@ * Method: glWindowPos3i * Signature: (III)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos3i +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_glWindowPos3i (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3) { - CHECK_EXISTS(glWindowPos3i) glWindowPos3i(p1, p2, p3); } + +void extgl_InitOpenGL1_4(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glBlendEquation", "(I)V", (void*)&Java_org_lwjgl_opengl_GL14_glBlendEquation, "glBlendEquation", (void**)&glBlendEquation}, + {"glBlendColor", "(FFFF)V", (void*)&Java_org_lwjgl_opengl_GL14_glBlendColor, "glBlendColor", (void**)&glBlendColor}, + {"glFogCoordf", "(F)V", (void*)&Java_org_lwjgl_opengl_GL14_glFogCoordf, "glFogCoordf", (void**)&glFogCoordf}, + {"nglFogCoordPointer", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_GL14_nglFogCoordPointer, "glFogCoordPointer", (void**)&glFogCoordPointer}, + {"nglFogCoordPointerVBO", "(III)V", (void*)&Java_org_lwjgl_opengl_GL14_nglFogCoordPointerVBO, NULL, NULL}, + {"nglMultiDrawArrays", "(ILjava/nio/IntBuffer;ILjava/nio/IntBuffer;II)V", (void*)&Java_org_lwjgl_opengl_GL14_nglMultiDrawArrays, "glMultiDrawArrays", (void*... [truncated message content] |
|
From: <eli...@us...> - 2004-03-07 15:42:27
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31365/src/java/org/lwjgl/opengl Modified Files: GL11.java NVVertexProgram.java Log Message: Replaced CHECK_EXISTS with one time check at symbol load time Index: GL11.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL11.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- GL11.java 18 Feb 2004 23:54:46 -0000 1.10 +++ GL11.java 7 Mar 2004 15:18:45 -0000 1.11 @@ -1035,6 +1035,12 @@ } private static native void nglGetTexImage(int target, int level, int format, int type, Buffer pixels, int pixels_offset); + public static void glGetTexGen(int coord, int pname, IntBuffer params) { + BufferChecks.checkBuffer(params); + nglGetTexGeniv(coord, pname, params, params.position()); + } + private static native void nglGetTexGeniv(int coord, int pname, IntBuffer params, int params_offset); + public static void glGetTexGen(int coord, int pname, FloatBuffer params) { BufferChecks.checkBuffer(params); nglGetTexGenfv(coord, pname, params, params.position()); Index: NVVertexProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/NVVertexProgram.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- NVVertexProgram.java 18 Feb 2004 23:54:45 -0000 1.4 +++ NVVertexProgram.java 7 Mar 2004 15:18:45 -0000 1.5 @@ -469,4 +469,48 @@ public static native void glVertexAttrib4ubNV(int index, byte x, byte y, byte z, byte w); + public static void glVertexAttribs1NV(int index, int n, ShortBuffer v) { + nglVertexAttribs1svNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs1svNV(int index, int n, ShortBuffer v, int v_offset); + + public static void glVertexAttribs1NV(int index, int n, FloatBuffer v) { + nglVertexAttribs1fvNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs1fvNV(int index, int n, FloatBuffer v, int v_offset); + + public static void glVertexAttribs2NV(int index, int n, ShortBuffer v) { + nglVertexAttribs2svNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs2svNV(int index, int n, ShortBuffer v, int v_offset); + + public static void glVertexAttribs2NV(int index, int n, FloatBuffer v) { + nglVertexAttribs2fvNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs2fvNV(int index, int n, FloatBuffer v, int v_offset); + + public static void glVertexAttribs3NV(int index, int n, ShortBuffer v) { + nglVertexAttribs3svNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs3svNV(int index, int n, ShortBuffer v, int v_offset); + + public static void glVertexAttribs3NV(int index, int n, FloatBuffer v) { + nglVertexAttribs3fvNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs3fvNV(int index, int n, FloatBuffer v, int v_offset); + + public static void glVertexAttribs4NV(int index, int n, ShortBuffer v) { + nglVertexAttribs4svNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs4svNV(int index, int n, ShortBuffer v, int v_offset); + + public static void glVertexAttribs4NV(int index, int n, FloatBuffer v) { + nglVertexAttribs4fvNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs4fvNV(int index, int n, FloatBuffer v, int v_offset); + + public static void glVertexAttribs4uNV(int index, int n, ByteBuffer v) { + nglVertexAttribs4ubvNV(index, n, v, v.position()); + } + private static native void nglVertexAttribs4ubvNV(int index, int n, ByteBuffer v, int v_offset); } |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/nv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31365/src/native/common/nv Modified Files: org_lwjgl_opengl_NVEvaluators.cpp org_lwjgl_opengl_NVFence.cpp org_lwjgl_opengl_NVFragmentProgram.cpp org_lwjgl_opengl_NVHalfFloat.cpp org_lwjgl_opengl_NVOcclusionQuery.cpp org_lwjgl_opengl_NVPixelDataRange.cpp org_lwjgl_opengl_NVPointSprite.cpp org_lwjgl_opengl_NVPrimitiveRestart.cpp org_lwjgl_opengl_NVProgram.cpp org_lwjgl_opengl_NVRegisterCombiners.cpp org_lwjgl_opengl_NVRegisterCombiners2.cpp org_lwjgl_opengl_NVVertexArrayRange.cpp org_lwjgl_opengl_NVVertexProgram.cpp Removed Files: org_lwjgl_opengl_NVEvaluators.h org_lwjgl_opengl_NVFence.h org_lwjgl_opengl_NVFragmentProgram.h org_lwjgl_opengl_NVHalfFloat.h org_lwjgl_opengl_NVOcclusionQuery.h org_lwjgl_opengl_NVPixelDataRange.h org_lwjgl_opengl_NVPointSprite.h org_lwjgl_opengl_NVPrimitiveRestart.h org_lwjgl_opengl_NVProgram.h org_lwjgl_opengl_NVRegisterCombiners.h org_lwjgl_opengl_NVRegisterCombiners2.h org_lwjgl_opengl_NVVertexArrayRange.h org_lwjgl_opengl_NVVertexProgram.h Log Message: Replaced CHECK_EXISTS with one time check at symbol load time Index: org_lwjgl_opengl_NVEvaluators.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_NVEvaluators.cpp 8 Feb 2004 20:28:48 -0000 1.1 +++ org_lwjgl_opengl_NVEvaluators.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.NVEvaluators // ---------------------------------- -#include "org_lwjgl_opengl_NVEvaluators.h" #include "extgl.h" #include "checkGLerror.h" @@ -58,30 +57,13 @@ static glGetMapAttribParameterfvNVPROC glGetMapAttribParameterfvNV; static glEvalMapsNVPROC glEvalMapsNV; -void extgl_InitNVEvaluators(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_evaluators) - return; - glMapControlPointsNV = (glMapControlPointsNVPROC) extgl_GetProcAddress("glMapControlPointsNV"); - glMapParameterivNV = (glMapParameterivNVPROC) extgl_GetProcAddress("glMapParameterivNV"); - glMapParameterfvNV = (glMapParameterfvNVPROC) extgl_GetProcAddress("glMapParameterfvNV"); - glGetMapControlPointsNV = (glGetMapControlPointsNVPROC) extgl_GetProcAddress("glGetMapControlPointsNV"); - glGetMapParameterivNV = (glGetMapParameterivNVPROC) extgl_GetProcAddress("glGetMapParameterivNV"); - glGetMapParameterfvNV = (glGetMapParameterfvNVPROC) extgl_GetProcAddress("glGetMapParameterfvNV"); - glGetMapAttribParameterivNV = (glGetMapAttribParameterivNVPROC) extgl_GetProcAddress("glGetMapAttribParameterivNV"); - glGetMapAttribParameterfvNV = (glGetMapAttribParameterfvNVPROC) extgl_GetProcAddress("glGetMapAttribParameterfvNV"); - glEvalMapsNV = (glEvalMapsNVPROC) extgl_GetProcAddress("glEvalMapsNV"); - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_evaluators) -} - /* * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapControlPointsNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapControlPointsNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapControlPointsNV (JNIEnv * env, jclass clazz, jint target, jint index, jint type, jint ustride, jint vstride, jboolean packed, jobject pPoints, jint pPoints_offset) { - CHECK_EXISTS(glGetMapControlPointsNV) GLvoid *pPoints_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPoints) + pPoints_offset); glGetMapControlPointsNV(target, index, type, ustride, vstride, packed, pPoints_ptr); CHECK_GL_ERROR @@ -91,10 +73,9 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglMapControlPointsNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapControlPointsNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapControlPointsNV (JNIEnv * env, jclass clazz, jint target, jint index, jint type, jint ustride, jint vstride, jint uorder, jint vorder, jboolean packed, jobject pPoints, jint pPoints_offset) { - CHECK_EXISTS(glMapControlPointsNV) GLvoid *pPoints_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPoints) + pPoints_offset); glMapControlPointsNV(target, index, type, ustride, vstride, uorder, vorder, packed, pPoints_ptr); CHECK_GL_ERROR @@ -104,10 +85,9 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglMapParameterfvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterfvNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterfvNV (JNIEnv * env, jclass clazz, jint target, jint pname, jobject pfParams, jint pfParams_offset) { - CHECK_EXISTS(glMapParameterfvNV) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glMapParameterfvNV(target, pname, pfParams_ptr); CHECK_GL_ERROR @@ -117,10 +97,9 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglMapParameterivNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterivNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterivNV (JNIEnv * env, jclass clazz, jint target, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glMapParameterivNV) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glMapParameterivNV(target, pname, piParams_ptr); CHECK_GL_ERROR @@ -130,10 +109,9 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapParameterfvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterfvNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterfvNV (JNIEnv * env, jclass clazz, jint target, jint pname, jobject pfParams, jint pfParams_offset) { - CHECK_EXISTS(glGetMapParameterfvNV) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetMapParameterfvNV(target, pname, pfParams_ptr); CHECK_GL_ERROR @@ -143,10 +121,9 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapParameterivNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterivNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterivNV (JNIEnv * env, jclass clazz, jint target, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glGetMapParameterivNV) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetMapParameterivNV(target, pname, piParams_ptr); CHECK_GL_ERROR @@ -156,10 +133,9 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapAttribParameterfvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterfvNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterfvNV (JNIEnv * env, jclass clazz, jint target, jint index, jint pname, jobject pfParams, jint pfParams_offset) { - CHECK_EXISTS(glGetMapAttribParameterfvNV) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetMapAttribParameterfvNV(target, index, pname, pfParams_ptr); CHECK_GL_ERROR @@ -169,10 +145,9 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: nglGetMapAttribParameterivNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterivNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterivNV (JNIEnv * env, jclass clazz, jint target, jint index, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glGetMapAttribParameterivNV) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetMapAttribParameterivNV(target, index, pname, piParams_ptr); CHECK_GL_ERROR @@ -182,10 +157,28 @@ * Class: org.lwjgl.opengl.NVEvaluators * Method: glEvalMapsNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_glEvalMapsNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVEvaluators_glEvalMapsNV (JNIEnv * env, jclass clazz, jint target, jint mode) { - CHECK_EXISTS(glEvalMapsNV) glEvalMapsNV(target, mode); CHECK_GL_ERROR } + +void extgl_InitNVEvaluators(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglGetMapControlPointsNV", "(IIIIIZLjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglGetMapControlPointsNV, "glGetMapControlPointsNV", (void**)&glGetMapControlPointsNV}, + {"nglMapControlPointsNV", "(IIIIIIIZLjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglMapControlPointsNV, "glMapControlPointsNV", (void**)&glMapControlPointsNV}, + {"nglMapParameterfvNV", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterfvNV, "glMapParameterfvNV", (void**)&glMapParameterfvNV}, + {"nglMapParameterivNV", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterivNV, "glMapParameterivNV", (void**)&glMapParameterivNV}, + {"nglGetMapParameterfvNV", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterfvNV, "glGetMapParameterfvNV", (void**)&glGetMapParameterfvNV}, + {"nglGetMapParameterivNV", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterivNV, "glGetMapParameterivNV", (void**)&glGetMapParameterivNV}, + {"nglGetMapAttribParameterfvNV", "(IIILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterfvNV, "glGetMapAttribParameterfvNV", (void**)&glGetMapAttribParameterfvNV}, + {"nglGetMapAttribParameterivNV", "(IIILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterivNV, "glGetMapAttribParameterivNV", (void**)&glGetMapAttribParameterivNV}, + {"glEvalMapsNV", "(II)V", (void*)&Java_org_lwjgl_opengl_NVEvaluators_glEvalMapsNV, "glEvalMapsNV", (void**)&glEvalMapsNV} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVEvaluators"); + if (extgl_Extensions.GL_NV_evaluators) + extgl_InitializeClass(env, clazz, ext_set, "GL_NV_evaluators", num_functions, functions); +} Index: org_lwjgl_opengl_NVFence.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVFence.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_NVFence.cpp 8 Feb 2004 20:28:48 -0000 1.1 +++ org_lwjgl_opengl_NVFence.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.NVFence // ---------------------------------- -#include "org_lwjgl_opengl_NVFence.h" #include "extgl.h" #include "checkGLerror.h" @@ -54,28 +53,13 @@ static glIsFenceNVPROC glIsFenceNV; static glGetFenceivNVPROC glGetFenceivNV; -void extgl_InitNVFence(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_fence) - return; - glGenFencesNV = (glGenFencesNVPROC) extgl_GetProcAddress("glGenFencesNV"); - glDeleteFencesNV = (glDeleteFencesNVPROC) extgl_GetProcAddress("glDeleteFencesNV"); - glSetFenceNV = (glSetFenceNVPROC) extgl_GetProcAddress("glSetFenceNV"); - glTestFenceNV = (glTestFenceNVPROC) extgl_GetProcAddress("glTestFenceNV"); - glFinishFenceNV = (glFinishFenceNVPROC) extgl_GetProcAddress("glFinishFenceNV"); - glIsFenceNV = (glIsFenceNVPROC) extgl_GetProcAddress("glIsFenceNV"); - glGetFenceivNV = (glGetFenceivNVPROC) extgl_GetProcAddress("glGetFenceivNV"); - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_fence) -} - /* * Class: org.lwjgl.opengl.NVFence * Method: nglGenFencesNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglGenFencesNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglGenFencesNV (JNIEnv * env, jclass clazz, jint n, jobject piFences, jint piFences_offset) { - CHECK_EXISTS(glGenFencesNV) GLuint *piFences_ptr = (GLuint *)env->GetDirectBufferAddress(piFences) + piFences_offset; glGenFencesNV(n, piFences_ptr); CHECK_GL_ERROR @@ -85,10 +69,9 @@ * Class: org.lwjgl.opengl.NVFence * Method: nglDeleteFencesNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglDeleteFencesNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglDeleteFencesNV (JNIEnv * env, jclass clazz, jint n, jobject piFences, jint piFences_offset) { - CHECK_EXISTS(glDeleteFencesNV) GLuint *piFences_ptr = (GLuint *)env->GetDirectBufferAddress(piFences) + piFences_offset; glDeleteFencesNV(n, piFences_ptr); CHECK_GL_ERROR @@ -98,10 +81,9 @@ * Class: org.lwjgl.opengl.NVFence * Method: glSetFenceNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_glSetFenceNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_glSetFenceNV (JNIEnv * env, jclass clazz, jint fence, jint condition) { - CHECK_EXISTS(glSetFenceNV) glSetFenceNV(fence, condition); CHECK_GL_ERROR } @@ -110,10 +92,9 @@ * Class: org.lwjgl.opengl.NVFence * Method: glTestFenceNV */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glTestFenceNV +static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glTestFenceNV (JNIEnv * env, jclass clazz, jint fence) { - CHECK_EXISTS(glTestFenceNV) GLboolean result = glTestFenceNV(fence); CHECK_GL_ERROR return result; @@ -123,10 +104,9 @@ * Class: org.lwjgl.opengl.NVFence * Method: glFinishFenceNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_glFinishFenceNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_glFinishFenceNV (JNIEnv * env, jclass clazz, jint fence) { - CHECK_EXISTS(glFinishFenceNV) glFinishFenceNV(fence); CHECK_GL_ERROR } @@ -135,10 +115,9 @@ * Class: org.lwjgl.opengl.NVFence * Method: glIsFenceNV */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glIsFenceNV +static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glIsFenceNV (JNIEnv * env, jclass clazz, jint fence) { - CHECK_EXISTS(glIsFenceNV) GLboolean result = glIsFenceNV(fence); CHECK_GL_ERROR return result; @@ -148,11 +127,27 @@ * Class: org.lwjgl.opengl.NVFence * Method: nglGetFenceivNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglGetFenceivNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFence_nglGetFenceivNV (JNIEnv * env, jclass clazz, jint fence, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glGetFenceivNV) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetFenceivNV(fence, pname, piParams_ptr); CHECK_GL_ERROR } + +void extgl_InitNVFence(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglGenFencesNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFence_nglGenFencesNV, "glGenFencesNV", (void**)&glGenFencesNV}, + {"nglDeleteFencesNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFence_nglDeleteFencesNV, "glDeleteFencesNV", (void**)&glDeleteFencesNV}, + {"glSetFenceNV", "(II)V", (void*)&Java_org_lwjgl_opengl_NVFence_glSetFenceNV, "glSetFenceNV", (void**)&glSetFenceNV}, + {"glTestFenceNV", "(I)Z", (void*)&Java_org_lwjgl_opengl_NVFence_glTestFenceNV, "glTestFenceNV", (void**)&glTestFenceNV}, + {"glFinishFenceNV", "(I)V", (void*)&Java_org_lwjgl_opengl_NVFence_glFinishFenceNV, "glFinishFenceNV", (void**)&glFinishFenceNV}, + {"glIsFenceNV", "(I)Z", (void*)&Java_org_lwjgl_opengl_NVFence_glIsFenceNV, "glIsFenceNV", (void**)&glIsFenceNV}, + {"nglGetFenceivNV", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFence_nglGetFenceivNV, "glGetFenceivNV", (void**)&glGetFenceivNV} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVFence"); + if (extgl_Extensions.GL_NV_fence) + extgl_InitializeClass(env, clazz, ext_set, "GL_NV_fence", num_functions, functions); +} Index: org_lwjgl_opengl_NVFragmentProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_NVFragmentProgram.cpp 8 Feb 2004 20:28:48 -0000 1.1 +++ org_lwjgl_opengl_NVFragmentProgram.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,45 +34,26 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.NVFragmentProgram // ---------------------------------- -#include "org_lwjgl_opengl_NVFragmentProgram.h" #include "extgl.h" #include "checkGLerror.h" typedef void (APIENTRY * glProgramNamedParameter4fNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRY * glProgramNamedParameter4fvNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat v[]); typedef void (APIENTRY * glProgramLocalParameter4fARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRY * glProgramLocalParameter4fvARBPROC) (GLenum target, GLuint index, const GLfloat *params); typedef void (APIENTRY * glGetProgramNamedParameterfvNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); typedef void (APIENTRY * glGetProgramLocalParameterfvARBPROC) (GLenum target, GLuint index, GLfloat *params); static glProgramNamedParameter4fNVPROC glProgramNamedParameter4fNV; -static glProgramNamedParameter4fvNVPROC glProgramNamedParameter4fvNV; static glProgramLocalParameter4fARBPROC glProgramLocalParameter4fARB; -static glProgramLocalParameter4fvARBPROC glProgramLocalParameter4fvARB; static glGetProgramNamedParameterfvNVPROC glGetProgramNamedParameterfvNV; static glGetProgramLocalParameterfvARBPROC glGetProgramLocalParameterfvARB; -void extgl_InitNVFragmentProgram(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_fragment_program) - return; - glProgramNamedParameter4fNV = (glProgramNamedParameter4fNVPROC) extgl_GetProcAddress("glProgramNamedParameter4fNV"); - glProgramNamedParameter4fvNV = (glProgramNamedParameter4fvNVPROC) extgl_GetProcAddress("glProgramNamedParameter4fvNV"); - glGetProgramNamedParameterfvNV = (glGetProgramNamedParameterfvNVPROC) extgl_GetProcAddress("glGetProgramNamedParameterfvNV"); - glProgramLocalParameter4fARB = (glProgramLocalParameter4fARBPROC) extgl_GetProcAddress("glProgramLocalParameter4fARB"); - glProgramLocalParameter4fvARB = (glProgramLocalParameter4fvARBPROC) extgl_GetProcAddress("glProgramLocalParameter4fvARB"); - glGetProgramLocalParameterfvARB = (glGetProgramLocalParameterfvARBPROC) extgl_GetProcAddress("glGetProgramLocalParameterfvARB"); - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_fragment_program) -} - /* * Class: org.lwjgl.opengl.NVFragmentProgram * Method: nglProgramNamedParameter4fNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglProgramNamedParameter4fNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglProgramNamedParameter4fNV (JNIEnv * env, jclass clazz, jint id, jint length, jobject name, jint nameOffset, jfloat x, jfloat y, jfloat z, jfloat w) { - CHECK_EXISTS(glProgramNamedParameter4fNV) GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; glProgramNamedParameter4fNV(id, length, name_ptr, x, y, z, w); CHECK_GL_ERROR @@ -82,10 +63,9 @@ * Class: org.lwjgl.opengl.NVFragmentProgram * Method: nglGetProgramNamedParameterfvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramNamedParameterfvNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramNamedParameterfvNV (JNIEnv * env, jclass clazz, jint id, jint length, jobject name, jint nameOffset, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetProgramNamedParameterfvNV) GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramNamedParameterfvNV(id, length, name_ptr, params_ptr); @@ -96,10 +76,9 @@ * Class: org.lwjgl.opengl.NVFragmentProgram * Method: glProgramLocalParameter4fNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_glProgramLocalParameter4fARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_glProgramLocalParameter4fARB (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { - CHECK_EXISTS(glProgramLocalParameter4fARB) glProgramLocalParameter4fARB(target, index, x, y, z, w); CHECK_GL_ERROR } @@ -108,11 +87,24 @@ * Class: org.lwjgl.opengl.NVFragmentProgram * Method: nglGetProgramLocalParameterfvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramLocalParameterfvARB +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramLocalParameterfvARB (JNIEnv * env, jclass clazz, jint target, jint index, jobject params, jint params_offset) { - CHECK_EXISTS(glGetProgramLocalParameterfvARB) GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + params_offset; glGetProgramLocalParameterfvARB(target, index, params_ptr); CHECK_GL_ERROR } + +void extgl_InitNVFragmentProgram(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglProgramNamedParameter4fNV", "(IILjava/nio/ByteBuffer;IFFFF)V", (void*)&Java_org_lwjgl_opengl_NVFragmentProgram_nglProgramNamedParameter4fNV, "glProgramNamedParameter4fNV", (void**)&glProgramNamedParameter4fNV}, + {"nglGetProgramNamedParameterfvNV", "(IILjava/nio/ByteBuffer;ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramNamedParameterfvNV, "glGetProgramNamedParameterfvNV", (void**)&glGetProgramNamedParameterfvNV}, + {"glProgramLocalParameter4fARB", "(IIFFFF)V", (void*)&Java_org_lwjgl_opengl_NVFragmentProgram_glProgramLocalParameter4fARB, "glProgramLocalParameter4fARB", (void**)&glProgramLocalParameter4fARB}, + {"nglGetProgramLocalParameterfvARB", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramLocalParameterfvARB, "glGetProgramLocalParameterfvARB", (void**)&glGetProgramLocalParameterfvARB} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVFragmentProgram"); + if (extgl_Extensions.GL_NV_fragment_program) + extgl_InitializeClass(env, clazz, ext_set, "GL_NV_fragment_program", num_functions, functions); +} Index: org_lwjgl_opengl_NVHalfFloat.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVHalfFloat.cpp 29 Feb 2004 23:27:13 -0000 1.2 +++ org_lwjgl_opengl_NVHalfFloat.cpp 7 Mar 2004 15:18:46 -0000 1.3 @@ -34,163 +34,68 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.NVHalfFloat // ---------------------------------- -#include "org_lwjgl_opengl_NVHalfFloat.h" #include "extgl.h" #include "checkGLerror.h" typedef unsigned short GLhalf; typedef void (APIENTRY * glVertex2hNVPROC) (GLhalf x, GLhalf y); -typedef void (APIENTRY * glVertex2hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glVertex3hNVPROC) (GLhalf x, GLhalf y, GLhalf z); -typedef void (APIENTRY * glVertex3hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glVertex4hNVPROC) (GLhalf x, GLhalf y, GLhalf z, GLhalf w); -typedef void (APIENTRY * glVertex4hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glNormal3hNVPROC) (GLhalf nx, GLhalf ny, GLhalf nz); -typedef void (APIENTRY * glNormal3hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glColor3hNVPROC) (GLhalf red, GLhalf green, GLhalf blue); -typedef void (APIENTRY * glColor3hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glColor4hNVPROC) (GLhalf red, GLhalf green, GLhalf blue, GLhalf alpha); -typedef void (APIENTRY * glColor4hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glTexCoord1hNVPROC) (GLhalf s); -typedef void (APIENTRY * glTexCoord1hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glTexCoord2hNVPROC) (GLhalf s, GLhalf t); -typedef void (APIENTRY * glTexCoord2hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glTexCoord3hNVPROC) (GLhalf s, GLhalf t, GLhalf r); -typedef void (APIENTRY * glTexCoord3hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glTexCoord4hNVPROC) (GLhalf s, GLhalf t, GLhalf r, GLhalf q); -typedef void (APIENTRY * glTexCoord4hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glMultiTexCoord1hNVPROC) (GLenum target, GLhalf s); -typedef void (APIENTRY * glMultiTexCoord1hvNVPROC) (GLenum target, const GLhalf *v); typedef void (APIENTRY * glMultiTexCoord2hNVPROC) (GLenum target, GLhalf s, GLhalf t); -typedef void (APIENTRY * glMultiTexCoord2hvNVPROC) (GLenum target, const GLhalf *v); typedef void (APIENTRY * glMultiTexCoord3hNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r); -typedef void (APIENTRY * glMultiTexCoord3hvNVPROC) (GLenum target, const GLhalf *v); typedef void (APIENTRY * glMultiTexCoord4hNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r, GLhalf q); -typedef void (APIENTRY * glMultiTexCoord4hvNVPROC) (GLenum target, const GLhalf *v); typedef void (APIENTRY * glFogCoordhNVPROC) (GLhalf fog); -typedef void (APIENTRY * glFogCoordhvNVPROC) (const GLhalf *fog); typedef void (APIENTRY * glSecondaryColor3hNVPROC) (GLhalf red, GLhalf green, GLhalf blue); -typedef void (APIENTRY * glSecondaryColor3hvNVPROC) (const GLhalf *v); typedef void (APIENTRY * glVertexAttrib1hNVPROC) (GLuint index, GLhalf x); -typedef void (APIENTRY * glVertexAttrib1hvNVPROC) (GLuint index, const GLhalf *v); typedef void (APIENTRY * glVertexAttrib2hNVPROC) (GLuint index, GLhalf x, GLhalf y); -typedef void (APIENTRY * glVertexAttrib2hvNVPROC) (GLuint index, const GLhalf *v); typedef void (APIENTRY * glVertexAttrib3hNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z); -typedef void (APIENTRY * glVertexAttrib3hvNVPROC) (GLuint index, const GLhalf *v); typedef void (APIENTRY * glVertexAttrib4hNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z, GLhalf w); -typedef void (APIENTRY * glVertexAttrib4hvNVPROC) (GLuint index, const GLhalf *v); typedef void (APIENTRY * glVertexAttribs1hvNVPROC) (GLuint index, GLsizei n, const GLhalf *v); typedef void (APIENTRY * glVertexAttribs2hvNVPROC) (GLuint index, GLsizei n, const GLhalf *v); typedef void (APIENTRY * glVertexAttribs3hvNVPROC) (GLuint index, GLsizei n, const GLhalf *v); typedef void (APIENTRY * glVertexAttribs4hvNVPROC) (GLuint index, GLsizei n, const GLhalf *v); static glVertex2hNVPROC glVertex2hNV; -static glVertex2hvNVPROC glVertex2hvNV; static glVertex3hNVPROC glVertex3hNV; -static glVertex3hvNVPROC glVertex3hvNV; static glVertex4hNVPROC glVertex4hNV; -static glVertex4hvNVPROC glVertex4hvNV; static glNormal3hNVPROC glNormal3hNV; -static glNormal3hvNVPROC glNormal3hvNV; static glColor3hNVPROC glColor3hNV; -static glColor3hvNVPROC glColor3hvNV; static glColor4hNVPROC glColor4hNV; -static glColor4hvNVPROC glColor4hvNV; static glTexCoord1hNVPROC glTexCoord1hNV; -static glTexCoord1hvNVPROC glTexCoord1hvNV; static glTexCoord2hNVPROC glTexCoord2hNV; -static glTexCoord2hvNVPROC glTexCoord2hvNV; static glTexCoord3hNVPROC glTexCoord3hNV; -static glTexCoord3hvNVPROC glTexCoord3hvNV; static glTexCoord4hNVPROC glTexCoord4hNV; -static glTexCoord4hvNVPROC glTexCoord4hvNV; static glMultiTexCoord1hNVPROC glMultiTexCoord1hNV; -static glMultiTexCoord1hvNVPROC glMultiTexCoord1hvNV; static glMultiTexCoord2hNVPROC glMultiTexCoord2hNV; -static glMultiTexCoord2hvNVPROC glMultiTexCoord2hvNV; static glMultiTexCoord3hNVPROC glMultiTexCoord3hNV; -static glMultiTexCoord3hvNVPROC glMultiTexCoord3hvNV; static glMultiTexCoord4hNVPROC glMultiTexCoord4hNV; -static glMultiTexCoord4hvNVPROC glMultiTexCoord4hvNV; static glFogCoordhNVPROC glFogCoordhNV; -static glFogCoordhvNVPROC glFogCoordhvNV; static glSecondaryColor3hNVPROC glSecondaryColor3hNV; -static glSecondaryColor3hvNVPROC glSecondaryColor3hvNV; static glVertexAttrib1hNVPROC glVertexAttrib1hNV; -static glVertexAttrib1hvNVPROC glVertexAttrib1hvNV; static glVertexAttrib2hNVPROC glVertexAttrib2hNV; -static glVertexAttrib2hvNVPROC glVertexAttrib2hvNV; static glVertexAttrib3hNVPROC glVertexAttrib3hNV; -static glVertexAttrib3hvNVPROC glVertexAttrib3hvNV; static glVertexAttrib4hNVPROC glVertexAttrib4hNV; -static glVertexAttrib4hvNVPROC glVertexAttrib4hvNV; static glVertexAttribs1hvNVPROC glVertexAttribs1hvNV; static glVertexAttribs2hvNVPROC glVertexAttribs2hvNV; static glVertexAttribs3hvNVPROC glVertexAttribs3hvNV; static glVertexAttribs4hvNVPROC glVertexAttribs4hvNV; -void extgl_InitNVHalfFloat(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_half_float) - return; - - glVertex2hNV = (glVertex2hNVPROC) extgl_GetProcAddress("glVertex2hNV"); - glVertex2hvNV = (glVertex2hvNVPROC) extgl_GetProcAddress("glVertex2hvNV"); - glVertex3hNV = (glVertex3hNVPROC) extgl_GetProcAddress("glVertex3hNV"); - glVertex3hvNV = (glVertex3hvNVPROC) extgl_GetProcAddress("glVertex3hvNV"); - glVertex4hNV = (glVertex4hNVPROC) extgl_GetProcAddress("glVertex4hNV"); - glVertex4hvNV = (glVertex4hvNVPROC) extgl_GetProcAddress("glVertex4hvNV"); - glNormal3hNV = (glNormal3hNVPROC) extgl_GetProcAddress("glNormal3hNV"); - glNormal3hvNV = (glNormal3hvNVPROC) extgl_GetProcAddress("glNormal3hvNV"); - glColor3hNV = (glColor3hNVPROC) extgl_GetProcAddress("glColor3hNV"); - glColor3hvNV = (glColor3hvNVPROC) extgl_GetProcAddress("glColor3hvNV"); - glColor4hNV = (glColor4hNVPROC) extgl_GetProcAddress("glColor4hNV"); - glColor4hvNV = (glColor4hvNVPROC) extgl_GetProcAddress("glColor4hvNV"); - glTexCoord1hNV = (glTexCoord1hNVPROC) extgl_GetProcAddress("glTexCoord1hNV"); - glTexCoord1hvNV = (glTexCoord1hvNVPROC) extgl_GetProcAddress("glTexCoord1hvNV"); - glTexCoord2hNV = (glTexCoord2hNVPROC) extgl_GetProcAddress("glTexCoord2hNV"); - glTexCoord2hvNV = (glTexCoord2hvNVPROC) extgl_GetProcAddress("glTexCoord2hvNV"); - glTexCoord3hNV = (glTexCoord3hNVPROC) extgl_GetProcAddress("glTexCoord3hNV"); - glTexCoord3hvNV = (glTexCoord3hvNVPROC) extgl_GetProcAddress("glTexCoord3hvNV"); - glTexCoord4hNV = (glTexCoord4hNVPROC) extgl_GetProcAddress("glTexCoord4hNV"); - glTexCoord4hvNV = (glTexCoord4hvNVPROC) extgl_GetProcAddress("glTexCoord4hvNV"); - glMultiTexCoord1hNV = (glMultiTexCoord1hNVPROC) extgl_GetProcAddress("glMultiTexCoord1hNV"); - glMultiTexCoord1hvNV = (glMultiTexCoord1hvNVPROC) extgl_GetProcAddress("glMultiTexCoord1hvNV"); - glMultiTexCoord2hNV = (glMultiTexCoord2hNVPROC) extgl_GetProcAddress("glMultiTexCoord2hNV"); - glMultiTexCoord2hvNV = (glMultiTexCoord2hvNVPROC) extgl_GetProcAddress("glMultiTexCoord2hvNV"); - glMultiTexCoord3hNV = (glMultiTexCoord3hNVPROC) extgl_GetProcAddress("glMultiTexCoord3hNV"); - glMultiTexCoord3hvNV = (glMultiTexCoord3hvNVPROC) extgl_GetProcAddress("glMultiTexCoord3hvNV"); - glMultiTexCoord4hNV = (glMultiTexCoord4hNVPROC) extgl_GetProcAddress("glMultiTexCoord4hNV"); - glMultiTexCoord4hvNV = (glMultiTexCoord4hvNVPROC) extgl_GetProcAddress("glMultiTexCoord4hvNV"); - glFogCoordhNV = (glFogCoordhNVPROC) extgl_GetProcAddress("glFogCoordhNV"); - glFogCoordhvNV = (glFogCoordhvNVPROC) extgl_GetProcAddress("glFogCoordhvNV"); - glSecondaryColor3hNV = (glSecondaryColor3hNVPROC) extgl_GetProcAddress("glSecondaryColor3hNV"); - glSecondaryColor3hvNV = (glSecondaryColor3hvNVPROC) extgl_GetProcAddress("glSecondaryColor3hvNV"); - glVertexAttrib1hNV = (glVertexAttrib1hNVPROC) extgl_GetProcAddress("glVertexAttrib1hNV"); - glVertexAttrib1hvNV = (glVertexAttrib1hvNVPROC) extgl_GetProcAddress("glVertexAttrib1hvNV"); - glVertexAttrib2hNV = (glVertexAttrib2hNVPROC) extgl_GetProcAddress("glVertexAttrib2hNV"); - glVertexAttrib2hvNV = (glVertexAttrib2hvNVPROC) extgl_GetProcAddress("glVertexAttrib2hvNV"); - glVertexAttrib3hNV = (glVertexAttrib3hNVPROC) extgl_GetProcAddress("glVertexAttrib3hNV"); - glVertexAttrib3hvNV = (glVertexAttrib3hvNVPROC) extgl_GetProcAddress("glVertexAttrib3hvNV"); - glVertexAttrib4hNV = (glVertexAttrib4hNVPROC) extgl_GetProcAddress("glVertexAttrib4hNV"); - glVertexAttrib4hvNV = (glVertexAttrib4hvNVPROC) extgl_GetProcAddress("glVertexAttrib4hvNV"); - glVertexAttribs1hvNV = (glVertexAttribs1hvNVPROC) extgl_GetProcAddress("glVertexAttribs1hvNV"); - glVertexAttribs2hvNV = (glVertexAttribs2hvNVPROC) extgl_GetProcAddress("glVertexAttribs2hvNV"); - glVertexAttribs3hvNV = (glVertexAttribs3hvNVPROC) extgl_GetProcAddress("glVertexAttribs3hvNV"); - glVertexAttribs4hvNV = (glVertexAttribs4hvNVPROC) extgl_GetProcAddress("glVertexAttribs4hvNV"); - - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_half_float) -} - /* * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertex2hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex2hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex2hNV (JNIEnv * env, jclass clazz, jshort x, jshort y) { - CHECK_EXISTS(glVertex2hNV) glVertex2hNV(x, y); CHECK_GL_ERROR } @@ -199,10 +104,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertex3hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex3hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex3hNV (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z) { - CHECK_EXISTS(glVertex3hNV) glVertex3hNV(x, y, z); CHECK_GL_ERROR } @@ -211,10 +115,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertex4hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex4hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex4hNV (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z, jshort w) { - CHECK_EXISTS(glVertex4hNV) glVertex4hNV(x, y, z, w); CHECK_GL_ERROR } @@ -223,10 +126,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glNormal3hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glNormal3hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glNormal3hNV (JNIEnv * env, jclass clazz, jshort nx, jshort ny, jshort nz) { - CHECK_EXISTS(glNormal3hNV) glNormal3hNV(nx, ny, nz); CHECK_GL_ERROR } @@ -235,10 +137,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glColor3hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor3hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor3hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue) { - CHECK_EXISTS(glColor3hNV) glColor3hNV(red, green, blue); CHECK_GL_ERROR } @@ -247,10 +148,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glColor4hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor4hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor4hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue, jshort alpha) { - CHECK_EXISTS(glColor4hNV) glColor4hNV(red, green, blue, alpha); CHECK_GL_ERROR } @@ -259,10 +159,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glTexCoord1hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord1hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord1hNV (JNIEnv * env, jclass clazz, jshort s) { - CHECK_EXISTS(glTexCoord1hNV) glTexCoord1hNV(s); CHECK_GL_ERROR } @@ -271,10 +170,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glTexCoord2hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord2hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord2hNV (JNIEnv * env, jclass clazz, jshort s, jshort t) { - CHECK_EXISTS(glTexCoord2hNV) glTexCoord2hNV(s, t); CHECK_GL_ERROR } @@ -283,10 +181,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glTexCoord3hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord3hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord3hNV (JNIEnv * env, jclass clazz, jshort s, jshort t, jshort r) { - CHECK_EXISTS(glTexCoord3hNV) glTexCoord3hNV(s, t, r); CHECK_GL_ERROR } @@ -295,10 +192,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glTexCoord4hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord4hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord4hNV (JNIEnv * env, jclass clazz, jshort s, jshort t, jshort r, jshort q) { - CHECK_EXISTS(glTexCoord4hNV) glTexCoord4hNV(s, t, r, q); CHECK_GL_ERROR } @@ -307,10 +203,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glMultiTexCoord1hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord1hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord1hNV (JNIEnv * env, jclass clazz, jint target, jshort s) { - CHECK_EXISTS(glMultiTexCoord1hNV) glMultiTexCoord1hNV(target, s); CHECK_GL_ERROR } @@ -319,10 +214,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glMultiTexCoord2hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord2hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord2hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { - CHECK_EXISTS(glMultiTexCoord2hNV) glMultiTexCoord2hNV(target, s, t); CHECK_GL_ERROR } @@ -331,10 +225,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glMultiTexCoord3hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord3hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord3hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { - CHECK_EXISTS(glMultiTexCoord3hNV) glMultiTexCoord3hNV(target, s, t, r); CHECK_GL_ERROR } @@ -343,10 +236,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glMultiTexCoord4hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord4hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord4hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { - CHECK_EXISTS(glMultiTexCoord4hNV) glMultiTexCoord4hNV(target, s, t, r, q); CHECK_GL_ERROR } @@ -355,10 +247,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glFogCoordhNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glFogCoordhNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glFogCoordhNV (JNIEnv * env, jclass clazz, jshort fog) { - CHECK_EXISTS(glFogCoordhNV) glFogCoordhNV(fog); CHECK_GL_ERROR } @@ -367,10 +258,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glSecondaryColor3hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glSecondaryColor3hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glSecondaryColor3hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue) { - CHECK_EXISTS(glSecondaryColor3hNV) glSecondaryColor3hNV(red, green, blue); CHECK_GL_ERROR } @@ -379,10 +269,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertexAttrib1hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib1hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib1hNV (JNIEnv * env, jclass clazz, jint index, jshort x) { - CHECK_EXISTS(glVertexAttrib1hNV) glVertexAttrib1hNV(index, x); CHECK_GL_ERROR } @@ -391,10 +280,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertexAttrib2hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib2hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib2hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { - CHECK_EXISTS(glVertexAttrib2hNV) glVertexAttrib2hNV(index, x, y); CHECK_GL_ERROR } @@ -403,10 +291,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertexAttrib3hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib3hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib3hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { - CHECK_EXISTS(glVertexAttrib3hNV) glVertexAttrib3hNV(index, x, y, z); CHECK_GL_ERROR } @@ -415,10 +302,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: glVertexAttrib4hNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib4hNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib4hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { - CHECK_EXISTS(glVertexAttrib4hNV) glVertexAttrib4hNV(index, x, y, z, w); CHECK_GL_ERROR } @@ -427,10 +313,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: nglVertexAttribs1hvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs1hvNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs1hvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject attribs, jint attribsOffset) { - CHECK_EXISTS(glVertexAttribs1hvNV) GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs1hvNV(index, n, attribs_ptr); CHECK_GL_ERROR @@ -440,10 +325,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: nglVertexAttribs2hvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs2hvNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs2hvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject attribs, jint attribsOffset) { - CHECK_EXISTS(glVertexAttribs2hvNV) GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs2hvNV(index, n, attribs_ptr); CHECK_GL_ERROR @@ -453,10 +337,9 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: nglVertexAttribs3hvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs3hvNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs3hvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject attribs, jint attribsOffset) { - CHECK_EXISTS(glVertexAttribs3hvNV) GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs3hvNV(index, n, attribs_ptr); CHECK_GL_ERROR @@ -466,11 +349,44 @@ * Class: org.lwjgl.opengl.NVHalfFloat * Method: nglVertexAttribs4hvNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs4hvNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs4hvNV (JNIEnv * env, jclass clazz, jint index, jint n, jobject attribs, jint attribsOffset) { - CHECK_EXISTS(glVertexAttribs4hvNV) GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs4hvNV(index, n, attribs_ptr); CHECK_GL_ERROR } + +void extgl_InitNVHalfFloat(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glVertex2hNV", "(SS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertex2hNV, "glVertex2hNV", (void**)&glVertex2hNV}, + {"glVertex3hNV", "(SSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertex3hNV, "glVertex3hNV", (void**)&glVertex3hNV}, + {"glVertex4hNV", "(SSSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertex4hNV, "glVertex4hNV", (void**)&glVertex4hNV}, + {"glNormal3hNV", "(SSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glNormal3hNV, "glNormal3hNV", (void**)&glNormal3hNV}, + {"glColor3hNV", "(SSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glColor3hNV, "glColor3hNV", (void**)&glColor3hNV}, + {"glColor4hNV", "(SSSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glColor4hNV, "glColor4hNV", (void**)&glColor4hNV}, + {"glTexCoord1hNV", "(S)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord1hNV, "glTexCoord1hNV", (void**)&glTexCoord1hNV}, + {"glTexCoord2hNV", "(SS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord2hNV, "glTexCoord2hNV", (void**)&glTexCoord2hNV}, + {"glTexCoord3hNV", "(SSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord3hNV, "glTexCoord3hNV", (void**)&glTexCoord3hNV}, + {"glTexCoord4hNV", "(SSSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord4hNV, "glTexCoord4hNV", (void**)&glTexCoord4hNV}, + {"glMultiTexCoord1hNV", "(IS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord1hNV, "glMultiTexCoord1hNV", (void**)&glMultiTexCoord1hNV}, + {"glMultiTexCoord2hNV", "(ISS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord2hNV, "glMultiTexCoord2hNV", (void**)&glMultiTexCoord2hNV}, + {"glMultiTexCoord3hNV", "(ISSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord3hNV, "glMultiTexCoord3hNV", (void**)&glMultiTexCoord3hNV}, + {"glMultiTexCoord4hNV", "(ISSSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord4hNV, "glMultiTexCoord4hNV", (void**)&glMultiTexCoord4hNV}, + {"glFogCoordhNV", "(S)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glFogCoordhNV, "glFogCoordhNV", (void**)&glFogCoordhNV}, + {"glSecondaryColor3hNV", "(SSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glSecondaryColor3hNV, "glSecondaryColor3hNV", (void**)&glSecondaryColor3hNV}, + {"glVertexAttrib1hNV", "(IS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib1hNV, "glVertexAttrib1hNV", (void**)&glVertexAttrib1hNV}, + {"glVertexAttrib2hNV", "(ISS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib2hNV, "glVertexAttrib2hNV", (void**)&glVertexAttrib2hNV}, + {"glVertexAttrib3hNV", "(ISSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib3hNV, "glVertexAttrib3hNV", (void**)&glVertexAttrib3hNV}, + {"glVertexAttrib4hNV", "(ISSSS)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib4hNV, "glVertexAttrib4hNV", (void**)&glVertexAttrib4hNV}, + {"nglVertexAttribs1hvNV", "(IILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs1hvNV, "glVertexAttribs1hvNV", (void**)&glVertexAttribs1hvNV}, + {"nglVertexAttribs2hvNV", "(IILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs2hvNV, "glVertexAttribs2hvNV", (void**)&glVertexAttribs2hvNV}, + {"nglVertexAttribs3hvNV", "(IILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs3hvNV, "glVertexAttribs3hvNV", (void**)&glVertexAttribs3hvNV}, + {"nglVertexAttribs4hvNV", "(IILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs4hvNV, "glVertexAttribs4hvNV", (void**)&glVertexAttribs4hvNV} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVHalfFloat"); + if (extgl_Extensions.GL_NV_half_float) + extgl_InitializeClass(env, clazz, ext_set, "GL_NV_half_float", num_functions, functions); +} Index: org_lwjgl_opengl_NVOcclusionQuery.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_NVOcclusionQuery.cpp 8 Feb 2004 20:28:48 -0000 1.1 +++ org_lwjgl_opengl_NVOcclusionQuery.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.NVOcclusionQuery // ---------------------------------- -#include "org_lwjgl_opengl_NVOcclusionQuery.h" #include "extgl.h" #include "checkGLerror.h" @@ -54,28 +53,13 @@ static glGetOcclusionQueryivNVPROC glGetOcclusionQueryivNV; static glGetOcclusionQueryuivNVPROC glGetOcclusionQueryuivNV; -void extgl_InitNVOcclusionQuery(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_occlusion_query) - return; - glGenOcclusionQueriesNV = (glGenOcclusionQueriesNVPROC) extgl_GetProcAddress("glGenOcclusionQueriesNV"); - glDeleteOcclusionQueriesNV = (glDeleteOcclusionQueriesNVPROC) extgl_GetProcAddress("glDeleteOcclusionQueriesNV"); - glIsOcclusionQueryNV = (glIsOcclusionQueryNVPROC) extgl_GetProcAddress("glIsOcclusionQueryNV"); - glBeginOcclusionQueryNV = (glBeginOcclusionQueryNVPROC) extgl_GetProcAddress("glBeginOcclusionQueryNV"); - glEndOcclusionQueryNV = (glEndOcclusionQueryNVPROC) extgl_GetProcAddress("glEndOcclusionQueryNV"); - glGetOcclusionQueryivNV = (glGetOcclusionQueryivNVPROC) extgl_GetProcAddress("glGetOcclusionQueryivNV"); - glGetOcclusionQueryuivNV = (glGetOcclusionQueryuivNVPROC) extgl_GetProcAddress("glGetOcclusionQueryuivNV"); - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_occlusion_query) -} - /* * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: nglGenOcclusionQueriesNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGenOcclusionQueriesNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGenOcclusionQueriesNV (JNIEnv * env, jclass clazz, jint n, jobject piIDs, jint piIDs_offset) { - CHECK_EXISTS(glGenOcclusionQueriesNV) GLuint *piIDs_ptr = (GLuint *)env->GetDirectBufferAddress(piIDs) + piIDs_offset; glGenOcclusionQueriesNV(n, piIDs_ptr); CHECK_GL_ERROR @@ -85,10 +69,9 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: nglDeleteOcclusionQueriesNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglDeleteOcclusionQueriesNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglDeleteOcclusionQueriesNV (JNIEnv * env, jclass clazz, jint n, jobject piIDs, jint piIDs_offset) { - CHECK_EXISTS(glDeleteOcclusionQueriesNV) GLuint *piIDs_ptr = (GLuint *)env->GetDirectBufferAddress(piIDs) + piIDs_offset; glDeleteOcclusionQueriesNV(n, piIDs_ptr); CHECK_GL_ERROR @@ -98,10 +81,9 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: glIsOcclusionQueryNV */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glIsOcclusionQueryNV +static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glIsOcclusionQueryNV (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glIsOcclusionQueryNV) GLboolean result = glIsOcclusionQueryNV(id); CHECK_GL_ERROR return result; @@ -111,10 +93,9 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: glBeginOcclusionQueryNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glBeginOcclusionQueryNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glBeginOcclusionQueryNV (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glBeginOcclusionQueryNV) glBeginOcclusionQueryNV(id); CHECK_GL_ERROR } @@ -123,10 +104,9 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: glEndOcclusionQueryNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glEndOcclusionQueryNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glEndOcclusionQueryNV (JNIEnv * env, jclass clazz) { - CHECK_EXISTS(glEndOcclusionQueryNV) glEndOcclusionQueryNV(); CHECK_GL_ERROR } @@ -135,10 +115,9 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: nglGetOcclusionQueryivNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryivNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryivNV (JNIEnv * env, jclass clazz, jint id, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glGetOcclusionQueryivNV) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetOcclusionQueryivNV(id, pname, piParams_ptr); CHECK_GL_ERROR @@ -148,11 +127,27 @@ * Class: org.lwjgl.opengl.NVOcclusionQuery * Method: nglGetOcclusionQueryuivNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryuivNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryuivNV (JNIEnv * env, jclass clazz, jint id, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glGetOcclusionQueryuivNV) GLuint *piParams_ptr = (GLuint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetOcclusionQueryuivNV(id, pname, piParams_ptr); CHECK_GL_ERROR } + +void extgl_InitNVOcclusionQuery(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglGenOcclusionQueriesNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_nglGenOcclusionQueriesNV, "glGenOcclusionQueriesNV", (void**)&glGenOcclusionQueriesNV}, + {"nglDeleteOcclusionQueriesNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_nglDeleteOcclusionQueriesNV, "glDeleteOcclusionQueriesNV", (void**)&glDeleteOcclusionQueriesNV}, + {"glIsOcclusionQueryNV", "(I)Z", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_glIsOcclusionQueryNV, "glIsOcclusionQueryNV", (void**)&glIsOcclusionQueryNV}, + {"glBeginOcclusionQueryNV", "(I)V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_glBeginOcclusionQueryNV, "glBeginOcclusionQueryNV", (void**)&glBeginOcclusionQueryNV}, + {"glEndOcclusionQueryNV", "()V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_glEndOcclusionQueryNV, "glEndOcclusionQueryNV", (void**)&glEndOcclusionQueryNV}, + {"nglGetOcclusionQueryivNV", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryivNV, "glGetOcclusionQueryivNV", (void**)&glGetOcclusionQueryivNV}, + {"nglGetOcclusionQueryuivNV", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryuivNV, "glGetOcclusionQueryuivNV", (void**)&glGetOcclusionQueryuivNV} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVOcclusionQuery"); + if (extgl_Extensions.GL_NV_occlusion_query) + extgl_InitializeClass(env, clazz, ext_set, "GL_NV_occlusion_query", num_functions, functions); +} Index: org_lwjgl_opengl_NVPixelDataRange.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_NVPixelDataRange.cpp 8 Feb 2004 20:28:49 -0000 1.1 +++ org_lwjgl_opengl_NVPixelDataRange.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.NVPixelDataRange // ---------------------------------- -#include "org_lwjgl_opengl_NVPixelDataRange.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,25 +43,13 @@ static glPixelDataRangeNVPROC glPixelDataRangeNV; static glFlushPixelDataRangeNVPROC glFlushPixelDataRangeNV; -void extgl_InitNVPixelDataRange(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_pixel_data_range) - return; - - glPixelDataRangeNV = (glPixelDataRangeNVPROC) extgl_GetProcAddress("glPixelDataRangeNV"); - glFlushPixelDataRangeNV = (glFlushPixelDataRangeNVPROC) extgl_GetProcAddress("glFlushPixelDataRangeNV"); - - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_pixel_data_range) -} - /* * Class: org.lwjgl.opengl.NVPixelDataRange * Method: nglPixelDataRangeNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_nglPixelDataRangeNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_nglPixelDataRangeNV (JNIEnv * env, jclass clazz, jint target, jint length, jobject data, jint dataOffset) { - CHECK_EXISTS(glPixelDataRangeNV) GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + dataOffset); glPixelDataRangeNV(target, length, data_ptr); CHECK_GL_ERROR @@ -72,10 +59,21 @@ * Class: org.lwjgl.opengl.NVPixelDataRange * Method: glFlushPixelDataRangeNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_glFlushPixelDataRangeNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_glFlushPixelDataRangeNV (JNIEnv * env, jclass clazz, jint target) { - CHECK_EXISTS(glFlushPixelDataRangeNV) glFlushPixelDataRangeNV(target); CHECK_GL_ERROR } + +void extgl_InitNVPixelDataRange(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglPixelDataRangeNV", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_NVPixelDataRange_nglPixelDataRangeNV, "glPixelDataRangeNV", (void**)&glPixelDataRangeNV}, + {"glFlushPixelDataRangeNV", "(I)V", (void*)&Java_org_lwjgl_opengl_NVPixelDataRange_glFlushPixelDataRangeNV, "glFlushPixelDataRangeNV", (void**)&glFlushPixelDataRangeNV} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVPixelDataRange"); + if (extgl_Extensions.GL_NV_pixel_data_range) + extgl_InitializeClass(env, clazz, ext_set, "GL_NV_pixel_data_range", num_functions, functions); +} Index: org_lwjgl_opengl_NVPointSprite.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_NVPointSprite.cpp 8 Feb 2004 20:28:48 -0000 1.1 +++ org_lwjgl_opengl_NVPointSprite.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.NVPointSprite // ---------------------------------- -#include "org_lwjgl_opengl_NVPointSprite.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,23 +43,13 @@ static glPointParameteriNVPROC glPointParameteriNV; static glPointParameterivNVPROC glPointParameterivNV; -void extgl_InitNVPointSprite(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_point_sprite) - return; - glPointParameteriNV = (glPointParameteriNVPROC) extgl_GetProcAddress("glPointParameteriNV"); - glPointParameterivNV = (glPointParameterivNVPROC) extgl_GetProcAddress("glPointParameterivNV"); - EXTGL_SANITY_CHECK(env, ext_set, GL_NV_point_sprite) -} - /* * Class: org.lwjgl.opengl.NVPointSprite * Method: glPointParameteriNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPointSprite_glPointParameteriNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPointSprite_glPointParameteriNV (JNIEnv * env, jclass clazz, jint pname, jint param) { - CHECK_EXISTS(glPointParameteriNV) glPointParameteriNV(pname, param); CHECK_GL_ERROR } @@ -69,11 +58,22 @@ * Class: org.lwjgl.opengl.NVPointSprite * Method: nglPointParameterivNV */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPointSprite_nglPointParameterivNV +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVPointSprite_nglPointParameterivNV (JNIEnv * env, jclass clazz, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glPointParameterivNV) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glPointParameterivNV(pname, piParams_ptr); CHECK_GL_ERROR } + +void extgl_InitNVPointSprite(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glPointParameteriNV", "(II)V", (void*)&Java_org_lwjgl_opengl_NVPointSprite_glPointParameteriNV, "glPointParameteriNV", (void**)&glPointParameteriNV}, + {"nglPointParameterivNV", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_NVPointSprite_nglPointParameterivNV, "glPointParameterivNV", (void**)&glPointParameterivNV} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/NVPointSprite"); + if (extgl_Extensions.GL_NV_point_sprite) + extgl_InitializeClass(env, clazz, ext_set, "GL_NV_point_sprite", num_functions, functions); +} Index: org_lwjgl_opengl_NVPrimitiveRestart.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_NVPrimitiveRestart.cpp 8 Feb 2004 20:28:48 -0000 1.1 +++ org_lwjgl_opengl_NVPrimitiveRestart.cpp 7 Mar 2004 15:18:47 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.NVPrimitiveRestart // ---------------------------------- -#include "org_lwjgl_opengl_NVPrimitiveRestart.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,25 +43,13 @@ static glPrimitiveRestartNVPROC glPrimitiveRestartNV; static glPrimitiveRestartIndexNVPROC glPrimitiveRestartIndexNV; -void extgl_InitNVPrimitiveRestart(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_NV_primitive_restart) - return; - - glPrimitiveRestartNV = (glPrimitiveRestartNVPR... [truncated message content] |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31365/src/native/common/ext Modified Files: org_lwjgl_opengl_EXTBlendFuncSeparate.cpp org_lwjgl_opengl_EXTCompiledVertexArray.cpp org_lwjgl_opengl_EXTDrawRangeElements.cpp org_lwjgl_opengl_EXTFogCoord.cpp org_lwjgl_opengl_EXTMultiDrawArrays.cpp org_lwjgl_opengl_EXTPointParameters.cpp org_lwjgl_opengl_EXTSecondaryColor.cpp org_lwjgl_opengl_EXTStencilTwoSide.cpp org_lwjgl_opengl_EXTVertexShader.cpp org_lwjgl_opengl_EXTVertexWeighting.cpp Removed Files: org_lwjgl_opengl_EXTBlendFuncSeparate.h org_lwjgl_opengl_EXTCompiledVertexArray.h org_lwjgl_opengl_EXTDrawRangeElements.h org_lwjgl_opengl_EXTFogCoord.h org_lwjgl_opengl_EXTMultiDrawArrays.h org_lwjgl_opengl_EXTPointParameters.h org_lwjgl_opengl_EXTSecondaryColor.h org_lwjgl_opengl_EXTStencilTwoSide.h org_lwjgl_opengl_EXTVertexShader.h org_lwjgl_opengl_EXTVertexWeighting.h Log Message: Replaced CHECK_EXISTS with one time check at symbol load time Index: org_lwjgl_opengl_EXTBlendFuncSeparate.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTBlendFuncSeparate.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTBlendFuncSeparate.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTBlendFuncSeparate // ---------------------------------- -#include "org_lwjgl_opengl_EXTBlendFuncSeparate.h" #include "extgl.h" #include "checkGLerror.h" @@ -42,22 +41,25 @@ static glBlendFuncSeparateEXTPROC glBlendFuncSeparateEXT; -void extgl_InitEXTBlendFuncSeparate(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_blend_func_separate) - return; - glBlendFuncSeparateEXT = (glBlendFuncSeparateEXTPROC) extgl_GetProcAddress("glBlendFuncSeparateEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_blend_func_separate) -} - /* * Class: org.lwjgl.opengl.EXTBlendFuncSeparate * Method: glBlendFuncSeparateEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTBlendFuncSeparate_glBlendFuncSeparateEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTBlendFuncSeparate_glBlendFuncSeparateEXT (JNIEnv * env, jclass clazz, jint sfactorRGB, jint dfactorRGB, jint sfactorAlpha, jint dfactorAlpha) { - CHECK_EXISTS(glBlendFuncSeparateEXT) glBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); CHECK_GL_ERROR } + +void extgl_InitEXTBlendFuncSeparate(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glBlendFuncSeparateEXT", "(IIII)V", (void*)&Java_org_lwjgl_opengl_EXTBlendFuncSeparate_glBlendFuncSeparateEXT, "glBlendFuncSeparateEXT", (void**)&glBlendFuncSeparateEXT} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTBlendFuncSeparate"); + if (extgl_Extensions.GL_EXT_blend_func_separate) + extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_blend_func_separate", num_functions, functions); +} + Index: org_lwjgl_opengl_EXTCompiledVertexArray.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTCompiledVertexArray.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTCompiledVertexArray.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTCompiledVertexArray // ---------------------------------- -#include "org_lwjgl_opengl_EXTCompiledVertexArray.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,23 +43,13 @@ static glLockArraysEXTPROC glLockArraysEXT; static glUnlockArraysEXTPROC glUnlockArraysEXT; -void extgl_InitEXTCompiledVertexArray(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_compiled_vertex_array) - return; - glLockArraysEXT = (glLockArraysEXTPROC) extgl_GetProcAddress("glLockArraysEXT"); - glUnlockArraysEXT = (glUnlockArraysEXTPROC) extgl_GetProcAddress("glUnlockArraysEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_compiled_vertex_array) -} - /* * Class: org.lwjgl.opengl.EXTCompiledVertexArray * Method: glLockArraysEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glLockArraysEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glLockArraysEXT (JNIEnv * env, jclass clazz, jint first, jint count) { - CHECK_EXISTS(glLockArraysEXT) glLockArraysEXT(first, count); CHECK_GL_ERROR } @@ -69,10 +58,22 @@ * Class: org.lwjgl.opengl.EXTCompiledVertexArray * Method: glUnlockArraysEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glUnlockArraysEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glUnlockArraysEXT (JNIEnv * env, jclass clazz) { - CHECK_EXISTS(glUnlockArraysEXT) glUnlockArraysEXT(); CHECK_GL_ERROR } + +void extgl_InitEXTCompiledVertexArray(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glLockArraysEXT", "(II)V", (void*)&Java_org_lwjgl_opengl_EXTCompiledVertexArray_glLockArraysEXT, "glLockArraysEXT", (void**)&glLockArraysEXT}, + {"glUnlockArraysEXT", "()V", (void*)&Java_org_lwjgl_opengl_EXTCompiledVertexArray_glUnlockArraysEXT, "glUnlockArraysEXT", (void**)&glUnlockArraysEXT} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTCompiledVertexArray"); + if (extgl_Extensions.GL_EXT_compiled_vertex_array) + extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_compiled_vertex_array", num_functions, functions); +} + Index: org_lwjgl_opengl_EXTDrawRangeElements.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTDrawRangeElements.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTDrawRangeElements.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTDrawRangeElements // ---------------------------------- -#include "org_lwjgl_opengl_EXTDrawRangeElements.h" #include "extgl.h" #include "checkGLerror.h" @@ -42,22 +41,13 @@ static glDrawRangeElementsEXTPROC glDrawRangeElementsEXT; -void extgl_InitEXTDrawRangeElements(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_draw_range_elements) - return; - glDrawRangeElementsEXT = (glDrawRangeElementsEXTPROC) extgl_GetProcAddress("glDrawRangeElementsEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_draw_range_elements) -} - /* * Class: org.lwjgl.opengl.EXTDrawRangeElements * Method: nglDrawRangeElementsEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXT (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jobject pIndices, jint pIndices_offset) { - CHECK_EXISTS(glDrawRangeElementsEXT) GLvoid *pIndices_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset); glDrawRangeElementsEXT(mode, start, end, count, type, pIndices_ptr); CHECK_GL_ERROR @@ -67,10 +57,22 @@ * Class: org.lwjgl.opengl.EXTDrawRangeElements * Method: nglDrawRangeElementsEXTVBO */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTVBO (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint buffer_offset) { - CHECK_EXISTS(glDrawRangeElementsEXT) glDrawRangeElementsEXT(mode, start, end, count, type, (GLvoid *)buffer_offset); CHECK_GL_ERROR } + +void extgl_InitEXTDrawRangeElements(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglDrawRangeElementsEXT", "(IIIIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXT, "glDrawRangeElementsEXT", (void**)&glDrawRangeElementsEXT}, + {"nglDrawRangeElementsEXTVBO", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTVBO, NULL, NULL} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTDrawRangeElements"); + if (extgl_Extensions.GL_EXT_draw_range_elements) + extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_draw_range_elements", num_functions, functions); +} + Index: org_lwjgl_opengl_EXTFogCoord.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTFogCoord.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTFogCoord.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,36 +34,22 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTFogCoord // ---------------------------------- -#include "org_lwjgl_opengl_EXTFogCoord.h" #include "extgl.h" #include "checkGLerror.h" typedef void (APIENTRY * glFogCoordfEXTPROC) (GLfloat coord); -typedef void (APIENTRY * glFogCoordfvEXTPROC) (const GLfloat *coord); typedef void (APIENTRY * glFogCoordPointerEXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); static glFogCoordfEXTPROC glFogCoordfEXT; -static glFogCoordfvEXTPROC glFogCoordfvEXT; static glFogCoordPointerEXTPROC glFogCoordPointerEXT; -void extgl_InitEXTFogCoord(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_fog_coord) - return; - glFogCoordfEXT = (glFogCoordfEXTPROC) extgl_GetProcAddress("glFogCoordfEXT"); - glFogCoordfvEXT = (glFogCoordfvEXTPROC) extgl_GetProcAddress("glFogCoordfvEXT"); - glFogCoordPointerEXT = (glFogCoordPointerEXTPROC) extgl_GetProcAddress("glFogCoordPointerEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_fog_coord) -} - /* * Class: org.lwjgl.opengl.EXTFogCoord * Method: glFogCoordfEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_glFogCoordfEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_glFogCoordfEXT (JNIEnv * env, jclass clazz, jfloat coord) { - CHECK_EXISTS(glFogCoordfEXT) glFogCoordfEXT(coord); CHECK_GL_ERROR } @@ -72,10 +58,9 @@ * Class: org.lwjgl.opengl.EXTFogCoord * Method: nglFogCoordPointerEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT (JNIEnv * env, jclass clazz, jint type, jint stride, jobject data, jint data_offset) { - CHECK_EXISTS(glFogCoordPointerEXT) GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glFogCoordPointerEXT(type, stride, data_ptr); CHECK_GL_ERROR @@ -85,10 +70,23 @@ * Class: org.lwjgl.opengl.EXTFogCoord * Method: nglFogCoordPointerEXTVBO */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTVBO (JNIEnv * env, jclass clazz, jint type, jint stride, jint buffer_offset) { - CHECK_EXISTS(glFogCoordPointerEXT) glFogCoordPointerEXT(type, stride, (GLvoid *)buffer_offset); CHECK_GL_ERROR } + +void extgl_InitEXTFogCoord(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glFogCoordfEXT", "(F)V", (void*)&Java_org_lwjgl_opengl_EXTFogCoord_glFogCoordfEXT, "glFogCoordfEXT", (void**)&glFogCoordfEXT}, + {"nglFogCoordPointerEXT", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT, "glFogCoordPointerEXT", (void**)&glFogCoordPointerEXT}, + {"nglFogCoordPointerEXTVBO", "(III)V", (void*)&Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTVBO, NULL, NULL} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTFogCoord"); + if (extgl_Extensions.GL_EXT_fog_coord) + extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_fog_coord", num_functions, functions); +} + Index: org_lwjgl_opengl_EXTMultiDrawArrays.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTMultiDrawArrays.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTMultiDrawArrays.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,35 +34,34 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTMultiDrawArrays // ---------------------------------- -#include "org_lwjgl_opengl_EXTMultiDrawArrays.h" #include "extgl.h" #include "checkGLerror.h" typedef void (APIENTRY * glMultiDrawArraysEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (APIENTRY * glMultiDrawElementsEXTPROC) (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount); static glMultiDrawArraysEXTPROC glMultiDrawArraysEXT; -static glMultiDrawElementsEXTPROC glMultiDrawElementsEXT; - -void extgl_InitEXTMultiDrawArrays(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_multi_draw_arrays) - return; - glMultiDrawArraysEXT = (glMultiDrawArraysEXTPROC) extgl_GetProcAddress("glMultiDrawArraysEXT"); - glMultiDrawElementsEXT = (glMultiDrawElementsEXTPROC) extgl_GetProcAddress("glMultiDrawElementsEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_multi_draw_arrays) -} /* * Class: org.lwjgl.opengl.EXTMultiDrawArrays * Method: nglMultiDrawArraysEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTMultiDrawArrays_nglMultiDrawArraysEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTMultiDrawArrays_nglMultiDrawArraysEXT (JNIEnv * env, jclass clazz, jint mode, jobject piFirst, jint piFirst_offset, jobject piCount, jint piCount_offset, jint primcount) { - CHECK_EXISTS(glMultiDrawArraysEXT) GLint *piFirst_ptr = (GLint *)env->GetDirectBufferAddress(piFirst) + piFirst_offset; GLint *piCount_ptr = (GLint *)env->GetDirectBufferAddress(piCount) + piCount_offset; glMultiDrawArraysEXT(mode, piFirst_ptr, piCount_ptr, primcount); CHECK_GL_ERROR } + +void extgl_InitEXTMultiDrawArrays(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglMultiDrawArraysEXT", "(ILjava/nio/IntBuffer;ILjava/nio/IntBuffer;II)V", (void*)&Java_org_lwjgl_opengl_EXTMultiDrawArrays_nglMultiDrawArraysEXT, "glMultiDrawArraysEXT", (void**)&glMultiDrawArraysEXT} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTMultiDrawArrays"); + if (extgl_Extensions.GL_EXT_multi_draw_arrays) + extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_multi_draw_arrays", num_functions, functions); +} + Index: org_lwjgl_opengl_EXTPointParameters.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTPointParameters.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTPointParameters.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTPointParameters // ---------------------------------- -#include "org_lwjgl_opengl_EXTPointParameters.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,23 +43,13 @@ static glPointParameterfEXTPROC glPointParameterfEXT; static glPointParameterfvEXTPROC glPointParameterfvEXT; -void extgl_InitEXTPointParameters(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_point_parameters) - return; - glPointParameterfEXT = (glPointParameterfEXTPROC) extgl_GetProcAddress("glPointParameterfEXT"); - glPointParameterfvEXT = (glPointParameterfvEXTPROC) extgl_GetProcAddress("glPointParameterfvEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_point_parameters) -} - /* * Class: org.lwjgl.opengl.EXTPointParameters * Method: glPointParameterfEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_glPointParameterfEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_glPointParameterfEXT (JNIEnv * env, jclass clazz, jint pname, jfloat param) { - CHECK_EXISTS(glPointParameterfEXT) glPointParameterfEXT(pname, param); CHECK_GL_ERROR } @@ -69,11 +58,23 @@ * Class: org.lwjgl.opengl.EXTPointParameters * Method: nglPointParameterfvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_nglPointParameterfvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_nglPointParameterfvEXT (JNIEnv * env, jclass clazz, jint pname, jobject pfParams, jint pfParams_offset) { - CHECK_EXISTS(glPointParameterfvEXT) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glPointParameterfvEXT(pname, pfParams_ptr); CHECK_GL_ERROR } + +void extgl_InitEXTPointParameters(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glPointParameterfEXT", "(IF)V", (void*)&Java_org_lwjgl_opengl_EXTPointParameters_glPointParameterfEXT, "glPointParameterfEXT", (void**)&glPointParameterfEXT}, + {"nglPointParameterfvEXT", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTPointParameters_nglPointParameterfvEXT, "glPointParameterfvEXT", (void**)&glPointParameterfvEXT} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTPointParameters"); + if (extgl_Extensions.GL_EXT_point_parameters) + extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_point_parameters", num_functions, functions); +} + Index: org_lwjgl_opengl_EXTSecondaryColor.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTSecondaryColor.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTSecondaryColor.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,51 +34,26 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTSecondaryColor // ---------------------------------- -#include "org_lwjgl_opengl_EXTSecondaryColor.h" #include "extgl.h" #include "checkGLerror.h" typedef void (APIENTRY * glSecondaryColor3bEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); typedef void (APIENTRY * glSecondaryColor3fEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRY * glSecondaryColor3iEXTPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRY * glSecondaryColor3sEXTPROC) (GLshort red, GLshort green, GLshort blue); typedef void (APIENTRY * glSecondaryColor3ubEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRY * glSecondaryColor3uiEXTPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRY * glSecondaryColor3usEXTPROC) (GLushort red, GLushort green, GLushort blue); typedef void (APIENTRY * glSecondaryColorPointerEXTPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); static glSecondaryColor3bEXTPROC glSecondaryColor3bEXT; static glSecondaryColor3fEXTPROC glSecondaryColor3fEXT; -static glSecondaryColor3iEXTPROC glSecondaryColor3iEXT; -static glSecondaryColor3sEXTPROC glSecondaryColor3sEXT; static glSecondaryColor3ubEXTPROC glSecondaryColor3ubEXT; -static glSecondaryColor3uiEXTPROC glSecondaryColor3uiEXT; -static glSecondaryColor3usEXTPROC glSecondaryColor3usEXT; static glSecondaryColorPointerEXTPROC glSecondaryColorPointerEXT; -void extgl_InitEXTSecondaryColor(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_secondary_color) - return; - glSecondaryColor3bEXT = (glSecondaryColor3bEXTPROC) extgl_GetProcAddress("glSecondaryColor3bEXT"); - glSecondaryColor3fEXT = (glSecondaryColor3fEXTPROC) extgl_GetProcAddress("glSecondaryColor3fEXT"); - glSecondaryColor3iEXT = (glSecondaryColor3iEXTPROC) extgl_GetProcAddress("glSecondaryColor3iEXT"); - glSecondaryColor3sEXT = (glSecondaryColor3sEXTPROC) extgl_GetProcAddress("glSecondaryColor3sEXT"); - glSecondaryColor3ubEXT = (glSecondaryColor3ubEXTPROC) extgl_GetProcAddress("glSecondaryColor3ubEXT"); - glSecondaryColor3uiEXT = (glSecondaryColor3uiEXTPROC) extgl_GetProcAddress("glSecondaryColor3uiEXT"); - glSecondaryColor3usEXT = (glSecondaryColor3usEXTPROC) extgl_GetProcAddress("glSecondaryColor3usEXT"); - glSecondaryColorPointerEXT = (glSecondaryColorPointerEXTPROC) extgl_GetProcAddress("glSecondaryColorPointerEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_secondary_color) -} - /* * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: glSecondaryColor3bEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3bEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3bEXT (JNIEnv * env, jclass clazz, jbyte red, jbyte green, jbyte blue) { - CHECK_EXISTS(glSecondaryColor3bEXT) glSecondaryColor3bEXT(red, green, blue); CHECK_GL_ERROR } @@ -87,10 +62,9 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: glSecondaryColor3fEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3fEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3fEXT (JNIEnv * env, jclass clazz, jfloat red, jfloat green, jfloat blue) { - CHECK_EXISTS(glSecondaryColor3fEXT) glSecondaryColor3fEXT(red, green, blue); CHECK_GL_ERROR } @@ -99,10 +73,9 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: glSecondaryColor3ubEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3ubEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3ubEXT (JNIEnv * env, jclass clazz, jbyte red, jbyte green, jbyte blue) { - CHECK_EXISTS(glSecondaryColor3ubEXT) glSecondaryColor3ubEXT(red, green, blue); CHECK_GL_ERROR } @@ -111,10 +84,9 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: nglSecondaryColorPointerEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXT (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jobject pPointer, jint pPointer_offset) { - CHECK_EXISTS(glSecondaryColorPointerEXT) GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glSecondaryColorPointerEXT(size, type, stride, pPointer_ptr); CHECK_GL_ERROR @@ -124,10 +96,24 @@ * Class: org.lwjgl.opengl.EXTSecondaryColor * Method: nglSecondaryColorPointerEXTVBO */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTVBO (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { - CHECK_EXISTS(glSecondaryColorPointerEXT) glSecondaryColorPointerEXT(size, type, stride, (GLvoid *)buffer_offset); CHECK_GL_ERROR } + +void extgl_InitEXTSecondaryColor(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glSecondaryColor3bEXT", "(BBB)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3bEXT, "glSecondaryColor3bEXT", (void**)&glSecondaryColor3bEXT}, + {"glSecondaryColor3fEXT", "(FFF)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3fEXT, "glSecondaryColor3fEXT", (void**)&glSecondaryColor3fEXT}, + {"glSecondaryColor3ubEXT", "(BBB)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3ubEXT, "glSecondaryColor3ubEXT", (void**)&glSecondaryColor3ubEXT}, + {"nglSecondaryColorPointerEXT", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXT, "glSecondaryColorPointerEXT", (void**)&glSecondaryColorPointerEXT}, + {"nglSecondaryColorPointerEXTVBO", "(IIII)V", (void*)&Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTVBO, NULL, NULL} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTSecondaryColor"); + if (extgl_Extensions.GL_EXT_secondary_color) + extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_secondary_color", num_functions, functions); +} Index: org_lwjgl_opengl_EXTStencilTwoSide.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTStencilTwoSide.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTStencilTwoSide.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTStencilTwoSide // ---------------------------------- -#include "org_lwjgl_opengl_EXTStencilTwoSide.h" #include "extgl.h" #include "checkGLerror.h" @@ -42,22 +41,24 @@ static glActiveStencilFaceEXTPROC glActiveStencilFaceEXT; -void extgl_InitEXTStencilTwoSide(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_stencil_two_side) - return; - glActiveStencilFaceEXT = (glActiveStencilFaceEXTPROC) extgl_GetProcAddress("glActiveStencilFaceEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_stencil_two_side) -} - /* * Class: org.lwjgl.opengl.EXTStencilTwoSide * Method: glActiveStencilFaceEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTStencilTwoSide_glActiveStencilFaceEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTStencilTwoSide_glActiveStencilFaceEXT (JNIEnv * env, jclass clazz, jint face) { - CHECK_EXISTS(glActiveStencilFaceEXT) glActiveStencilFaceEXT(face); CHECK_GL_ERROR } + +void extgl_InitEXTStencilTwoSide(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glActiveStencilFaceEXT", "(I)V", (void*)&Java_org_lwjgl_opengl_EXTStencilTwoSide_glActiveStencilFaceEXT, "glActiveStencilFaceEXT", (void**)&glActiveStencilFaceEXT} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/EXTStencilTwoSide"); + if (extgl_Extensions.GL_EXT_stencil_two_side) + extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_stencil_two_side", num_functions, functions); +} Index: org_lwjgl_opengl_EXTVertexShader.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTVertexShader.cpp 8 Feb 2004 20:30:29 -0000 1.1 +++ org_lwjgl_opengl_EXTVertexShader.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.EXTVertexShader // ---------------------------------- -#include "org_lwjgl_opengl_EXTVertexShader.h" #include "extgl.h" #include "checkGLerror.h" @@ -57,7 +56,6 @@ typedef void (APIENTRY * glVariantsvEXTPROC) (GLuint id, GLshort *addr); typedef void (APIENTRY * glVariantivEXTPROC) (GLuint id, GLint *addr); typedef void (APIENTRY * glVariantfvEXTPROC) (GLuint id, GLfloat *addr); -typedef void (APIENTRY * glVariantdvEXTPROC) (GLuint id, GLdouble *addr); typedef void (APIENTRY * glVariantubvEXTPROC) (GLuint id, GLubyte *addr); typedef void (APIENTRY * glVariantusvEXTPROC) (GLuint id, GLushort *addr); typedef void (APIENTRY * glVariantuivEXTPROC) (GLuint id, GLuint *addr); @@ -100,7 +98,6 @@ static glVariantsvEXTPROC glVariantsvEXT; static glVariantivEXTPROC glVariantivEXT; static glVariantfvEXTPROC glVariantfvEXT; -static glVariantdvEXTPROC glVariantdvEXT; static glVariantubvEXTPROC glVariantubvEXT; static glVariantusvEXTPROC glVariantusvEXT; static glVariantuivEXTPROC glVariantuivEXT; @@ -124,63 +121,13 @@ static glGetLocalConstantIntegervEXTPROC glGetLocalConstantIntegervEXT; static glGetLocalConstantFloatvEXTPROC glGetLocalConstantFloatvEXT; -void extgl_InitEXTVertexShader(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_EXT_vertex_shader) - return; - glBeginVertexShaderEXT = (glBeginVertexShaderEXTPROC) extgl_GetProcAddress("glBeginVertexShaderEXT"); - glEndVertexShaderEXT = (glEndVertexShaderEXTPROC) extgl_GetProcAddress("glEndVertexShaderEXT"); - glBindVertexShaderEXT = (glBindVertexShaderEXTPROC) extgl_GetProcAddress("glBindVertexShaderEXT"); - glGenVertexShadersEXT = (glGenVertexShadersEXTPROC) extgl_GetProcAddress("glGenVertexShadersEXT"); - glDeleteVertexShaderEXT = (glDeleteVertexShaderEXTPROC) extgl_GetProcAddress("glDeleteVertexShaderEXT"); - glShaderOp1EXT = (glShaderOp1EXTPROC) extgl_GetProcAddress("glShaderOp1EXT"); - glShaderOp2EXT = (glShaderOp2EXTPROC) extgl_GetProcAddress("glShaderOp2EXT"); - glShaderOp3EXT = (glShaderOp3EXTPROC) extgl_GetProcAddress("glShaderOp3EXT"); - glSwizzleEXT = (glSwizzleEXTPROC) extgl_GetProcAddress("glSwizzleEXT"); - glWriteMaskEXT = (glWriteMaskEXTPROC) extgl_GetProcAddress("glWriteMaskEXT"); - glInsertComponentEXT = (glInsertComponentEXTPROC) extgl_GetProcAddress("glInsertComponentEXT"); - glExtractComponentEXT = (glExtractComponentEXTPROC) extgl_GetProcAddress("glExtractComponentEXT"); - glGenSymbolsEXT = (glGenSymbolsEXTPROC) extgl_GetProcAddress("glGenSymbolsEXT"); - glSetInvariantEXT = (glSetInvariantEXTPROC) extgl_GetProcAddress("glSetInvarianceEXT"); - glSetLocalConstantEXT = (glSetLocalConstantEXTPROC) extgl_GetProcAddress("glSetLocalConstantEXT"); - glVariantbvEXT = (glVariantbvEXTPROC) extgl_GetProcAddress("glVariantbvEXT"); - glVariantsvEXT = (glVariantsvEXTPROC) extgl_GetProcAddress("glVariantsvEXT"); - glVariantivEXT = (glVariantivEXTPROC) extgl_GetProcAddress("glVariantivEXT"); - glVariantfvEXT = (glVariantfvEXTPROC) extgl_GetProcAddress("glVariantfvEXT"); - glVariantdvEXT = (glVariantdvEXTPROC) extgl_GetProcAddress("glVariantdvEXT"); - glVariantubvEXT = (glVariantubvEXTPROC) extgl_GetProcAddress("glVariantubvEXT"); - glVariantusvEXT = (glVariantusvEXTPROC) extgl_GetProcAddress("glVariantusvEXT"); - glVariantuivEXT = (glVariantuivEXTPROC) extgl_GetProcAddress("glVariantuivEXT"); - glVariantPointerEXT = (glVariantPointerEXTPROC) extgl_GetProcAddress("glVariantPointerEXT"); - glEnableVariantClientStateEXT = (glEnableVariantClientStateEXTPROC) extgl_GetProcAddress("glEnableVariantClientStateEXT"); - glDisableVariantClientStateEXT = (glDisableVariantClientStateEXTPROC) extgl_GetProcAddress("glDisableVariantClientStateEXT"); - glBindLightParameterEXT = (glBindLightParameterEXTPROC) extgl_GetProcAddress("glBindLightParameterEXT"); - glBindMaterialParameterEXT = (glBindMaterialParameterEXTPROC) extgl_GetProcAddress("glBindMaterialParameterEXT"); - glBindTexGenParameterEXT = (glBindTexGenParameterEXTPROC) extgl_GetProcAddress("glBindTexGenParameterEXT"); - glBindTextureUnitParameterEXT = (glBindTextureUnitParameterEXTPROC) extgl_GetProcAddress("glBindTextureUnitParameterEXT"); - glBindParameterEXT = (glBindParameterEXTPROC) extgl_GetProcAddress("glBindParameterEXT"); - glIsVariantEnabledEXT = (glIsVariantEnabledEXTPROC) extgl_GetProcAddress("glIsVariantEnabledEXT"); - glGetVariantBooleanvEXT = (glGetVariantBooleanvEXTPROC) extgl_GetProcAddress("glGetVariantBooleanvEXT"); - glGetVariantIntegervEXT = (glGetVariantIntegervEXTPROC) extgl_GetProcAddress("glGetVariantIntegervEXT"); - glGetVariantFloatvEXT = (glGetVariantFloatvEXTPROC) extgl_GetProcAddress("glGetVariantFloatvEXT"); - glGetVariantPointervEXT = (glGetVariantPointervEXTPROC) extgl_GetProcAddress("glGetVariantPointervEXT"); - glGetInvariantBooleanvEXT = (glGetInvariantBooleanvEXTPROC) extgl_GetProcAddress("glGetInvariantBooleanvEXT"); - glGetInvariantIntegervEXT = (glGetInvariantIntegervEXTPROC) extgl_GetProcAddress("glGetInvariantIntegervEXT"); - glGetInvariantFloatvEXT = (glGetInvariantFloatvEXTPROC) extgl_GetProcAddress("glGetInvariantFloatvEXT"); - glGetLocalConstantBooleanvEXT = (glGetLocalConstantBooleanvEXTPROC) extgl_GetProcAddress("glGetLocalConstantBooleanvEXT"); - glGetLocalConstantIntegervEXT = (glGetLocalConstantIntegervEXTPROC) extgl_GetProcAddress("glGetLocalConstantIntegervEXT"); - glGetLocalConstantFloatvEXT = (glGetLocalConstantFloatvEXTPROC) extgl_GetProcAddress("glGetLocalConstantFloatvEXT"); - EXTGL_SANITY_CHECK(env, ext_set, GL_EXT_vertex_shader) -} - /* * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBeginVertexShaderEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBeginVertexShaderEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBeginVertexShaderEXT (JNIEnv * env, jclass clazz) { - CHECK_EXISTS(glBeginVertexShaderEXT) glBeginVertexShaderEXT(); CHECK_GL_ERROR } @@ -189,10 +136,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glEndVertexShaderEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEndVertexShaderEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEndVertexShaderEXT (JNIEnv * env, jclass clazz) { - CHECK_EXISTS(glEndVertexShaderEXT) glEndVertexShaderEXT(); CHECK_GL_ERROR } @@ -201,10 +147,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindVertexShaderEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindVertexShaderEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindVertexShaderEXT (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glBindVertexShaderEXT) glBindVertexShaderEXT(id); CHECK_GL_ERROR } @@ -213,10 +158,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glGenVertexShadersEXT */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenVertexShadersEXT +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenVertexShadersEXT (JNIEnv * env, jclass clazz, jint range) { - CHECK_EXISTS(glGenVertexShadersEXT) GLuint result = glGenVertexShadersEXT(range); CHECK_GL_ERROR return result; @@ -226,10 +170,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glDeleteVertexShaderEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDeleteVertexShaderEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDeleteVertexShaderEXT (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glDeleteVertexShaderEXT) glDeleteVertexShaderEXT(id); CHECK_GL_ERROR } @@ -238,10 +181,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glShaderOp1EXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp1EXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp1EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1) { - CHECK_EXISTS(glShaderOp1EXT) glShaderOp1EXT(op, res, arg1); CHECK_GL_ERROR } @@ -250,10 +192,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glShaderOp2EXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp2EXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp2EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1, jint arg2) { - CHECK_EXISTS(glShaderOp2EXT) glShaderOp2EXT(op, res, arg1, arg2); CHECK_GL_ERROR } @@ -262,10 +203,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glShaderOp3EXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp3EXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp3EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1, jint arg2, jint arg3) { - CHECK_EXISTS(glShaderOp3EXT) glShaderOp3EXT(op, res, arg1, arg2, arg3); CHECK_GL_ERROR } @@ -274,10 +214,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glSwizzleEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glSwizzleEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glSwizzleEXT (JNIEnv * env, jclass clazz, jint res, jint in, jint outX, jint outY, jint outZ, jint outW) { - CHECK_EXISTS(glSwizzleEXT) glSwizzleEXT(res, in, outX, outY, outZ, outW); CHECK_GL_ERROR } @@ -286,10 +225,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glWriteMaskEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glWriteMaskEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glWriteMaskEXT (JNIEnv * env, jclass clazz, jint res, jint in, jint outX, jint outY, jint outZ, jint outW) { - CHECK_EXISTS(glWriteMaskEXT) glWriteMaskEXT(res, in, outX, outY, outZ, outW); CHECK_GL_ERROR } @@ -298,10 +236,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glInsertComponentEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glInsertComponentEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glInsertComponentEXT (JNIEnv * env, jclass clazz, jint res, jint src, jint num) { - CHECK_EXISTS(glInsertComponentEXT) glInsertComponentEXT(res, src, num); CHECK_GL_ERROR } @@ -310,10 +247,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glExtractComponentEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glExtractComponentEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glExtractComponentEXT (JNIEnv * env, jclass clazz, jint res, jint src, jint num) { - CHECK_EXISTS(glExtractComponentEXT) glExtractComponentEXT(res, src, num); CHECK_GL_ERROR } @@ -322,10 +258,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glGenSymbolsEXT */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenSymbolsEXT +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenSymbolsEXT (JNIEnv * env, jclass clazz, jint dataType, jint storageType, jint range, jint components) { - CHECK_EXISTS(glGenSymbolsEXT) GLuint result = glGenSymbolsEXT(dataType, storageType, range, components); CHECK_GL_ERROR return result; @@ -335,10 +270,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglSetInvariantEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetInvariantEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetInvariantEXT (JNIEnv * env, jclass clazz, jint id, jint type, jobject pAddr, jint pAddr_offset) { - CHECK_EXISTS(glSetInvariantEXT) GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glSetInvariantEXT(id, type, pAddr_ptr); CHECK_GL_ERROR @@ -348,10 +282,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglSetLocalConstantEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetLocalConstantEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetLocalConstantEXT (JNIEnv * env, jclass clazz, jint id, jint type, jobject pAddr, jint pAddr_offset) { - CHECK_EXISTS(glSetLocalConstantEXT) GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glSetLocalConstantEXT(id, type, pAddr_ptr); CHECK_GL_ERROR @@ -361,10 +294,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantbvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantbvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantbvEXT (JNIEnv * env, jclass clazz, jint id, jobject pAddr, jint pAddr_offset) { - CHECK_EXISTS(glVariantbvEXT) GLbyte *pAddr_ptr = (GLbyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset; glVariantbvEXT(id, pAddr_ptr); CHECK_GL_ERROR @@ -374,10 +306,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantsvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantsvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantsvEXT (JNIEnv * env, jclass clazz, jint id, jobject psAddr, jint psAddr_offset) { - CHECK_EXISTS(glVariantsvEXT) GLshort *psAddr_ptr = (GLshort *)env->GetDirectBufferAddress(psAddr) + psAddr_offset; glVariantsvEXT(id, psAddr_ptr); CHECK_GL_ERROR @@ -387,10 +318,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantfvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantfvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantfvEXT (JNIEnv * env, jclass clazz, jint id, jobject pfAddr, jint pfAddr_offset) { - CHECK_EXISTS(glVariantfvEXT) GLfloat *pfAddr_ptr = (GLfloat *)env->GetDirectBufferAddress(pfAddr) + pfAddr_offset; glVariantfvEXT(id, pfAddr_ptr); CHECK_GL_ERROR @@ -400,10 +330,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantivEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantivEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantivEXT (JNIEnv * env, jclass clazz, jint id, jobject piAddr, jint piAddr_offset) { - CHECK_EXISTS(glVariantivEXT) GLint *piAddr_ptr = (GLint *)env->GetDirectBufferAddress(piAddr) + piAddr_offset; glVariantivEXT(id, piAddr_ptr); CHECK_GL_ERROR @@ -413,10 +342,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantubvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantubvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantubvEXT (JNIEnv * env, jclass clazz, jint id, jobject pAddr, jint pAddr_offset) { - CHECK_EXISTS(glVariantubvEXT) GLubyte *pAddr_ptr = (GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset; glVariantubvEXT(id, pAddr_ptr); CHECK_GL_ERROR @@ -426,10 +354,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantusvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantusvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantusvEXT (JNIEnv * env, jclass clazz, jint id, jobject psAddr, jint psAddr_offset) { - CHECK_EXISTS(glVariantusvEXT) GLushort *psAddr_ptr = (GLushort *)env->GetDirectBufferAddress(psAddr) + psAddr_offset; glVariantusvEXT(id, psAddr_ptr); CHECK_GL_ERROR @@ -439,10 +366,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantuivEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantuivEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantuivEXT (JNIEnv * env, jclass clazz, jint id, jobject piAddr, jint piAddr_offset) { - CHECK_EXISTS(glVariantuivEXT) GLuint *piAddr_ptr = (GLuint *)env->GetDirectBufferAddress(piAddr) + piAddr_offset; glVariantuivEXT(id, piAddr_ptr); CHECK_GL_ERROR @@ -452,10 +378,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantPointerEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXT (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jobject pAddr, jint pAddr_offset) { - CHECK_EXISTS(glVariantPointerEXT) GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glVariantPointerEXT(id, type, stride, pAddr_ptr); CHECK_GL_ERROR @@ -465,10 +390,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglVariantPointerEXTVBO */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTVBO (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jint buffer_offset) { - CHECK_EXISTS(glVariantPointerEXT) glVariantPointerEXT(id, type, stride, (GLvoid *)buffer_offset); CHECK_GL_ERROR } @@ -477,10 +401,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glEnableVariantClientStateEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEnableVariantClientStateEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEnableVariantClientStateEXT (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glEnableVariantClientStateEXT) glEnableVariantClientStateEXT(id); CHECK_GL_ERROR } @@ -489,10 +412,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glDisableVariantClientStateEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDisableVariantClientStateEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDisableVariantClientStateEXT (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glDisableVariantClientStateEXT) glDisableVariantClientStateEXT(id); CHECK_GL_ERROR } @@ -501,10 +423,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindLightParameterEXT */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindLightParameterEXT +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindLightParameterEXT (JNIEnv * env, jclass clazz, jint light, jint value) { - CHECK_EXISTS(glBindLightParameterEXT) GLuint result = glBindLightParameterEXT(light, value); CHECK_GL_ERROR return result; @@ -514,10 +435,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindMaterialParameterEXT */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindMaterialParameterEXT +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindMaterialParameterEXT (JNIEnv * env, jclass clazz, jint face, jint value) { - CHECK_EXISTS(glBindMaterialParameterEXT) GLuint result = glBindMaterialParameterEXT(face, value); CHECK_GL_ERROR return result; @@ -527,10 +447,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindTexGenParameterEXT */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTexGenParameterEXT +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTexGenParameterEXT (JNIEnv * env, jclass clazz, jint unit, jint coord, jint value) { - CHECK_EXISTS(glBindTexGenParameterEXT) GLuint result = glBindTexGenParameterEXT(unit, coord, value); CHECK_GL_ERROR return result; @@ -540,10 +459,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindTextureUnitParameterEXT */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTextureUnitParameterEXT +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTextureUnitParameterEXT (JNIEnv * env, jclass clazz, jint unit, jint value) { - CHECK_EXISTS(glBindTextureUnitParameterEXT) GLuint result = glBindTextureUnitParameterEXT(unit, value); CHECK_GL_ERROR return result; @@ -553,10 +471,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glBindParameterEXT */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindParameterEXT +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindParameterEXT (JNIEnv * env, jclass clazz, jint value) { - CHECK_EXISTS(glBindParameterEXT) GLuint result = glBindParameterEXT(value); CHECK_GL_ERROR return result; @@ -566,10 +483,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glIsVariantEnabledEXT */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glIsVariantEnabledEXT +static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glIsVariantEnabledEXT (JNIEnv * env, jclass clazz, jint id, jint cap) { - CHECK_EXISTS(glIsVariantEnabledEXT) GLboolean result = glIsVariantEnabledEXT(id, cap); CHECK_GL_ERROR return result; @@ -579,10 +495,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetVariantBooleanvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantBooleanvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantBooleanvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pbData, jint pbData_offset) { - CHECK_EXISTS(glGetVariantBooleanvEXT) GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetVariantBooleanvEXT(id, value, pbData_ptr); CHECK_GL_ERROR @@ -592,10 +507,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetVariantIntegervEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantIntegervEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantIntegervEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject piData, jint piData_offset) { - CHECK_EXISTS(glGetVariantIntegervEXT) GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetVariantIntegervEXT(id, value, piData_ptr); CHECK_GL_ERROR @@ -605,10 +519,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetVariantFloatvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantFloatvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantFloatvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pfData, jint pfData_offset) { - CHECK_EXISTS(glGetVariantFloatvEXT) GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetVariantFloatvEXT(id, value, pfData_ptr); CHECK_GL_ERROR @@ -618,10 +531,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: glGetVariantPointerEXT */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGetVariantPointerEXT +static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGetVariantPointerEXT (JNIEnv * env, jclass clazz, jint id, jint value, jint size) { - CHECK_EXISTS(glGetVariantPointervEXT) void *address; glGetVariantPointervEXT((GLuint)id, (GLuint)value, &address); CHECK_GL_ERROR @@ -632,10 +544,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetInvariantBooleanvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantBooleanvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantBooleanvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pbData, jint pbData_offset) { - CHECK_EXISTS(glGetInvariantBooleanvEXT) GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetInvariantBooleanvEXT(id, value, pbData_ptr); CHECK_GL_ERROR @@ -645,10 +556,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetInvariantIntegervEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantIntegervEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantIntegervEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject piData, jint piData_offset) { - CHECK_EXISTS(glGetInvariantIntegervEXT) GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetInvariantIntegervEXT(id, value, piData_ptr); CHECK_GL_ERROR @@ -658,10 +568,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetInvariantFloatvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantFloatvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantFloatvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pfData, jint pfData_offset) { - CHECK_EXISTS(glGetInvariantFloatvEXT) GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetInvariantFloatvEXT(id, value, pfData_ptr); CHECK_GL_ERROR @@ -671,10 +580,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetLocalConstantBooleanvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantBooleanvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantBooleanvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pbData, jint pbData_offset) { - CHECK_EXISTS(glGetLocalConstantBooleanvEXT) GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetLocalConstantBooleanvEXT(id, value, pbData_ptr); CHECK_GL_ERROR @@ -684,10 +592,9 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetLocalConstantIntegervEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantIntegervEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantIntegervEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject piData, jint piData_offset) { - CHECK_EXISTS(glGetLocalConstantIntegervEXT) GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetLocalConstantIntegervEXT(id, value, piData_ptr); CHECK_GL_ERROR @@ -697,11 +604,62 @@ * Class: org.lwjgl.opengl.EXTVertexShader * Method: nglGetLocalConstantFloatvEXT */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantFloatvEXT +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantFloatvEXT (JNIEnv * env, jclass clazz, jint id, jint value, jobject pfData, jint pfData_offset) { - CHECK_EXISTS(glGetLocalConstantFloatvEXT) GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetLocalConstantFloatvEXT(id, value, pfData_ptr); CHECK_GL_ERROR } + +void extgl_InitEXTVertexShader(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glBeginVertexShaderEXT", "()V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBeginVertexShaderEXT, "glBeginVertexShaderEXT", (void**)&glBeginVertexShaderEXT}, + {"glEndVertexShaderEXT", "()V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glEndVertexShaderEXT, "glEndVertexShaderEXT", (void**)&glEndVertexShaderEXT}, + {"glBindVertexShaderEXT", "(I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBindVertexShaderEXT, "glBindVertexShaderEXT", (void**)&glBindVertexShaderEXT}, + {"glGenVertexShadersEXT", "(I)I", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glGenVertexShadersEXT, "glGenVertexShadersEXT", (void**)&glGenVertexShadersEXT}, + {"glDeleteVertexShaderEXT", "(I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glDeleteVertexShaderEXT, "glDeleteVertexShaderEXT", (void**)&glDeleteVertexShaderEXT}, + {"glShaderOp1EXT", "(III)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp1EXT, "glShaderOp1EXT", (void**)&glShaderOp1EXT}, + {"glShaderOp2EXT", "(IIII)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp2EXT, "glShaderOp2EXT", (void**)&glShaderOp2EXT}, + {"glShaderOp3EXT", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp3EXT, "glShaderOp3EXT", (void**)&glShaderOp3EXT}, + {"glSwizzleEXT", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glSwizzleEXT, "glSwizzleEXT", (void**)&glSwizzleEXT}, + {"glWriteMaskEXT", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glWriteMaskEXT, "glWriteMaskEXT", (void**)&glWriteMaskEXT}, + {"glInsertComponentEXT", "(III)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glInsertComponentEXT, "glInsertComponentEXT", (void**)&glInsertComponentEXT}, + {"glExtractComponentEXT", "(III)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glExtractComponentEXT, "glExtractComponentEXT", (void**)&glExtractComponentEXT}, + {"glGenSymbolsEXT", "(IIII)I", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glGenSymbolsEXT, "glGenSymbolsEXT", (void**)&glGenSymbolsEXT}, + {"nglSetInvariantEXT", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglSetInvariantEXT, "glSetInvariantEXT", (void**)&glSetInvariantEXT}, + {"nglSetLocalConstantEXT", "(IILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglSetLocalConstantEXT, "glSetLocalConstantEXT", (void**)&glSetLocalConstantEXT}, + {"nglVariantbvEXT", "(ILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantbvEXT, "glVariantbvEXT", (void**)&glVariantbvEXT}, + {"nglVariantsvEXT", "(ILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantsvEXT, "glVariantsvEXT", (void**)&glVariantsvEXT}, + {"nglVariantfvEXT", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantfvEXT, "glVariantfvEXT", (void**)&glVariantfvEXT}, + {"nglVariantivEXT", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantivEXT, "glVariantivEXT", (void**)&glVariantivEXT}, + {"nglVariantubvEXT", "(ILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantubvEXT, "glVariantubvEXT", (void**)&glVariantubvEXT}, + {"nglVariantusvEXT", "(ILjava/nio/ShortBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantusvEXT, "glVariantusvEXT", (void**)&glVariantusvEXT}, + {"nglVariantuivEXT", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantuivEXT, "glVariantuivEXT", (void**)&glVariantuivEXT}, + {"nglVariantPointerEXT", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXT, "glVariantPointerEXT", (void**)&glVariantPointerEXT}, + {"nglVariantPointerEXTVBO", "(IIII)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTVBO, NULL, NULL}, + {"glEnableVariantClientStateEXT", "(I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glEnableVariantClientStateEXT, "glEnableVariantClientStateEXT", (void**)&glEnableVariantClientStateEXT}, + {"glDisableVariantClientStateEXT", "(I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glDisableVariantClientStateEXT, "glDisableVariantClientStateEXT", (void**)&glDisableVariantClientStateEXT}, + {"glBindLightParameterEXT", "(II)I", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBindLightParameterEXT, "glBindLightParameterEXT", (void**)&glBindLightParameterEXT}, + {"glBindMaterialParameterEXT", "(II)I", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBindMaterialParameterEXT, "glBindMaterialParameterEXT", (void**)&glBindMaterialParameterEXT}, + {"glBindTexGenParameterEXT", "(III)I", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBindTexGenParameterEXT, "glBindTexGenParameterEXT", (void**)&glBindTexGenParameterEXT}, + {"glBindTextureUnitParameterEXT", "(II)I", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBindTextureUnitParameterEXT, "glBindTextureUnitParameterEXT", (void**)&glBindTextureUnitParameterEXT}, + {"glBindParameterEXT", "(I)I", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glBindParameterEXT, "glBindParameterEXT", (void**)&glBindParameterEXT}, + {"glIsVariantEnabledEXT", "(II)Z", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glIsVariantEnabledEXT, "glIsVariantEnabledEXT", (void**)&glIsVariantEnabledEXT}, + {"nglGetVariantBooleanvEXT", "(IILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantBooleanvEXT, "glGetVariantBooleanvEXT", (void**)&glGetVariantBooleanvEXT}, + {"nglGetVariantIntegervEXT", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantIntegervEXT, "glGetVariantIntegervEXT", (void**)&glGetVariantIntegervEXT}, + {"nglGetVariantFloatvEXT", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantFloatvEXT, "glGetVariantFloatvEXT", (void**)&glGetVariantFloatvEXT}, + {"glGetVariantPointerEXT", "(III)Ljava/nio/ByteBuffer;", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_glGetVariantPointerEXT, "glGetVariantPointervEXT", (void**)&glGetVariantPointervEXT}, + {"nglGetInvariantBooleanvEXT", "(IILjava/nio/ByteBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantBooleanvEXT, "glGetInvariantBooleanvEXT", (void**)&glGetInvariantBooleanvEXT}, + {"nglGetInvariantIntegervEXT", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantIntegervEXT, "glGetInvariantIntegervEXT", (void**)&glGetInvariantIntegervEXT}, + {"nglGetInvariantFloatvEXT", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantFloatvEXT, "glGetInvariantFloatvEXT", (void**)&glGetInvaria... [truncated message content] |
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ati In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31365/src/native/common/ati Modified Files: org_lwjgl_opengl_ATIDrawBuffers.cpp org_lwjgl_opengl_ATIElementArray.cpp org_lwjgl_opengl_ATIEnvmapBumpmap.cpp org_lwjgl_opengl_ATIFragmentShader.cpp org_lwjgl_opengl_ATIMapObjectBuffer.cpp org_lwjgl_opengl_ATIPnTriangles.cpp org_lwjgl_opengl_ATISeparateStencil.cpp org_lwjgl_opengl_ATIVertexArrayObject.cpp org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp org_lwjgl_opengl_ATIVertexStreams.cpp Removed Files: org_lwjgl_opengl_ATIDrawBuffers.h org_lwjgl_opengl_ATIElementArray.h org_lwjgl_opengl_ATIEnvmapBumpmap.h org_lwjgl_opengl_ATIFragmentShader.h org_lwjgl_opengl_ATIMapObjectBuffer.h org_lwjgl_opengl_ATIPnTriangles.h org_lwjgl_opengl_ATISeparateStencil.h org_lwjgl_opengl_ATIVertexArrayObject.h org_lwjgl_opengl_ATIVertexAttribArrayObject.h org_lwjgl_opengl_ATIVertexStreams.h Log Message: Replaced CHECK_EXISTS with one time check at symbol load time Index: org_lwjgl_opengl_ATIDrawBuffers.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIDrawBuffers.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIDrawBuffers.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIDrawBuffers // ---------------------------------- -#include "org_lwjgl_opengl_ATIDrawBuffers.h" #include "extgl.h" #include "checkGLerror.h" @@ -42,25 +41,25 @@ static glDrawBuffersATIPROC glDrawBuffersATI; -void extgl_InitATIDrawBuffers(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_draw_buffers) - return; - - glDrawBuffersATI = (glDrawBuffersATIPROC) extgl_GetProcAddress("glDrawBuffersATI"); - - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_draw_buffers) -} - /* * Class: org.lwjgl.opengl.ATIDrawBuffers * Method: nglDrawBuffersATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIDrawBuffers_nglDrawBuffersATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIDrawBuffers_nglDrawBuffersATI (JNIEnv * env, jclass clazz, jint size, jobject buffers, jint buffersOffset) { - CHECK_EXISTS(glDrawBuffersATI) GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffersOffset; glDrawBuffersATI(size, buffers_ptr); CHECK_GL_ERROR } + +void extgl_InitATIDrawBuffers(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglDrawBuffersATI", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIDrawBuffers_nglDrawBuffersATI, "glDrawBuffersATI", (void**)&glDrawBuffersATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIDrawBuffers"); + if (extgl_Extensions.GL_ATI_draw_buffers) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_draw_buffers", num_functions, functions); +} Index: org_lwjgl_opengl_ATIElementArray.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIElementArray.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIElementArray.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIElementArray // ---------------------------------- -#include "org_lwjgl_opengl_ATIElementArray.h" #include "extgl.h" #include "checkGLerror.h" @@ -46,24 +45,13 @@ static glDrawElementArrayATIPROC glDrawElementArrayATI; static glDrawRangeElementArrayATIPROC glDrawRangeElementArrayATI; -void extgl_InitATIElementArray(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_element_array) - return; - glElementPointerATI = (glElementPointerATIPROC) extgl_GetProcAddress("glElementPointerATI"); - glDrawElementArrayATI = (glDrawElementArrayATIPROC) extgl_GetProcAddress("glDrawElementArrayATI"); - glDrawRangeElementArrayATI = (glDrawRangeElementArrayATIPROC) extgl_GetProcAddress("glDrawRangeElementArrayATI"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_element_array) -} - /* * Class: org.lwjgl.opengl.ATIElementArray * Method: nglElementPointerATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATI (JNIEnv * env, jclass clazz, jint type, jobject pPointer, jint pPointer_offset) { - CHECK_EXISTS(glElementPointerATI) GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glElementPointerATI(type, pPointer_ptr); CHECK_GL_ERROR @@ -73,10 +61,9 @@ * Class: org.lwjgl.opengl.ATIElementArray * Method: nglElementPointerATIVBO */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIVBO +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIVBO (JNIEnv * env, jclass clazz, jint type, jint buffer_offset) { - CHECK_EXISTS(glElementPointerATI) glElementPointerATI(type, (GLvoid *)buffer_offset); CHECK_GL_ERROR } @@ -85,10 +72,9 @@ * Class: org.lwjgl.opengl.ATIElementArray * Method: glDrawElementArrayATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawElementArrayATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawElementArrayATI (JNIEnv * env, jclass clazz, jint mode, jint count) { - CHECK_EXISTS(glDrawElementArrayATI) glDrawElementArrayATI(mode, count); CHECK_GL_ERROR } @@ -97,10 +83,23 @@ * Class: org.lwjgl.opengl.ATIElementArray * Method: glDrawRangeElementArrayATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawRangeElementArrayATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawRangeElementArrayATI (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count) { - CHECK_EXISTS(glDrawRangeElementArrayATI) glDrawRangeElementArrayATI(mode, start, end, count); CHECK_GL_ERROR } + +void extgl_InitATIElementArray(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglElementPointerATI", "(ILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATI, "glElementPointerATI", (void**)&glElementPointerATI}, + {"nglElementPointerATIVBO", "(II)V", (void*)&Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIVBO, NULL, NULL}, + {"glDrawElementArrayATI", "(II)V", (void*)&Java_org_lwjgl_opengl_ATIElementArray_glDrawElementArrayATI, "glDrawElementArrayATI", (void**)&glDrawElementArrayATI}, + {"glDrawRangeElementArrayATI", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ATIElementArray_glDrawRangeElementArrayATI, "glDrawRangeElementArrayATI", (void**)&glDrawRangeElementArrayATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIElementArray"); + if (extgl_Extensions.GL_ATI_element_array) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_element_array", num_functions, functions); +} Index: org_lwjgl_opengl_ATIEnvmapBumpmap.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIEnvmapBumpmap.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIEnvmapBumpmap.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIEnvmapBumpmap // ---------------------------------- -#include "org_lwjgl_opengl_ATIEnvmapBumpmap.h" #include "extgl.h" #include "checkGLerror.h" @@ -48,25 +47,13 @@ static glGetTexBumpParameterivATIPROC glGetTexBumpParameterivATI; static glGetTexBumpParameterfvATIPROC glGetTexBumpParameterfvATI; -void extgl_InitATIEnvmapBumpmap(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_envmap_bumpmap) - return; - glTexBumpParameterivATI = (glTexBumpParameterivATIPROC) extgl_GetProcAddress("glTexBumpParameterivATI"); - glTexBumpParameterfvATI = (glTexBumpParameterfvATIPROC) extgl_GetProcAddress("glTexBumpParameterfvATI"); - glGetTexBumpParameterivATI = (glGetTexBumpParameterivATIPROC) extgl_GetProcAddress("glGetTexBumpParameterivATI"); - glGetTexBumpParameterfvATI = (glGetTexBumpParameterfvATIPROC) extgl_GetProcAddress("glGetTexBumpParameterfvATI"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_envmap_bumpmap) -} - /* * Class: org.lwjgl.opengl.ATIEnvmapBumpmap * Method: nglTexBumpParameterfvATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterfvATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterfvATI (JNIEnv * env, jclass clazz, jint pname, jobject pfParam, jint pfParam_offset) { - CHECK_EXISTS(glTexBumpParameterfvATI) GLfloat *pfParam_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParam) + pfParam_offset; glTexBumpParameterfvATI(pname, pfParam_ptr); CHECK_GL_ERROR @@ -76,10 +63,9 @@ * Class: org.lwjgl.opengl.ATIEnvmapBumpmap * Method: nglTexBumpParameterivATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterivATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterivATI (JNIEnv * env, jclass clazz, jint pname, jobject piParam, jint piParam_offset) { - CHECK_EXISTS(glTexBumpParameterivATI) GLint *piParam_ptr = (GLint *)env->GetDirectBufferAddress(piParam) + piParam_offset; glTexBumpParameterivATI(pname, piParam_ptr); CHECK_GL_ERROR @@ -89,10 +75,9 @@ * Class: org.lwjgl.opengl.ATIEnvmapBumpmap * Method: nglGetTexBumpParameterfvATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterfvATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterfvATI (JNIEnv * env, jclass clazz, jint pname, jobject pfParam, jint pfParam_offset) { - CHECK_EXISTS(glGetTexBumpParameterfvATI) GLfloat *pfParam_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParam) + pfParam_offset; glGetTexBumpParameterfvATI(pname, pfParam_ptr); CHECK_GL_ERROR @@ -102,11 +87,24 @@ * Class: org.lwjgl.opengl.ATIEnvmapBumpmap * Method: nglGetTexBumpParameterivATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterivATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterivATI (JNIEnv * env, jclass clazz, jint pname, jobject piParam, jint piParam_offset) { - CHECK_EXISTS(glGetTexBumpParameterivATI) GLint *piParam_ptr = (GLint *)env->GetDirectBufferAddress(piParam) + piParam_offset; glGetTexBumpParameterivATI(pname, piParam_ptr); CHECK_GL_ERROR } + +void extgl_InitATIEnvmapBumpmap(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglTexBumpParameterfvATI", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterfvATI, "glTexBumpParameterfvATI", (void**)&glTexBumpParameterfvATI}, + {"nglTexBumpParameterivATI", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterivATI, "glTexBumpParameterivATI", (void**)&glTexBumpParameterivATI}, + {"nglGetTexBumpParameterfvATI", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterfvATI, "glGetTexBumpParameterfvATI", (void**)&glGetTexBumpParameterfvATI}, + {"nglGetTexBumpParameterivATI", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParameterivATI, "glGetTexBumpParameterivATI", (void**)&glGetTexBumpParameterivATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIEnvmapBumpmap"); + if (extgl_Extensions.GL_ATI_envmap_bumpmap) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_envmap_bumpmap", num_functions, functions); +} Index: org_lwjgl_opengl_ATIFragmentShader.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIFragmentShader.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIFragmentShader.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIFragmentShader // ---------------------------------- -#include "org_lwjgl_opengl_ATIFragmentShader.h" #include "extgl.h" #include "checkGLerror.h" @@ -68,35 +67,13 @@ static glAlphaFragmentOp3ATIPROC glAlphaFragmentOp3ATI; static glSetFragmentShaderConstantATIPROC glSetFragmentShaderConstantATI; -void extgl_InitATIFragmentShader(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_fragment_shader) - return; - glGenFragmentShadersATI = (glGenFragmentShadersATIPROC) extgl_GetProcAddress("glGenFragmentShadersATI"); - glBindFragmentShaderATI = (glBindFragmentShaderATIPROC) extgl_GetProcAddress("glBindFragmentShaderATI"); - glDeleteFragmentShaderATI = (glDeleteFragmentShaderATIPROC) extgl_GetProcAddress("glDeleteFragmentShaderATI"); - glBeginFragmentShaderATI = (glBeginFragmentShaderATIPROC) extgl_GetProcAddress("glBeginFragmentShaderATI"); - glEndFragmentShaderATI = (glEndFragmentShaderATIPROC) extgl_GetProcAddress("glEndFragmentShaderATI"); - glPassTexCoordATI = (glPassTexCoordATIPROC) extgl_GetProcAddress("glPassTexCoordATI"); - glSampleMapATI = (glSampleMapATIPROC) extgl_GetProcAddress("glSampleMapATI"); - glColorFragmentOp1ATI = (glColorFragmentOp1ATIPROC) extgl_GetProcAddress("glColorFragmentOp1ATI"); - glColorFragmentOp2ATI = (glColorFragmentOp2ATIPROC) extgl_GetProcAddress("glColorFragmentOp2ATI"); - glColorFragmentOp3ATI = (glColorFragmentOp3ATIPROC) extgl_GetProcAddress("glColorFragmentOp3ATI"); - glAlphaFragmentOp1ATI = (glAlphaFragmentOp1ATIPROC) extgl_GetProcAddress("glAlphaFragmentOp1ATI"); - glAlphaFragmentOp2ATI = (glAlphaFragmentOp2ATIPROC) extgl_GetProcAddress("glAlphaFragmentOp2ATI"); - glAlphaFragmentOp3ATI = (glAlphaFragmentOp3ATIPROC) extgl_GetProcAddress("glAlphaFragmentOp3ATI"); - glSetFragmentShaderConstantATI = (glSetFragmentShaderConstantATIPROC) extgl_GetProcAddress("glSetFragmentShaderConstantATI"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_fragment_shader) -} - /* * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glGenFragmentShadersATI */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glGenFragmentShadersATI +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glGenFragmentShadersATI (JNIEnv * env, jclass clazz, jint range) { - CHECK_EXISTS(glGenFragmentShadersATI) GLuint result = glGenFragmentShadersATI(range); CHECK_GL_ERROR return result; @@ -106,10 +83,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glBindFragmentShaderATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBindFragmentShaderATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBindFragmentShaderATI (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glBindFragmentShaderATI) glBindFragmentShaderATI(id); CHECK_GL_ERROR } @@ -118,10 +94,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glDeleteFragmentShaderATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glDeleteFragmentShaderATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glDeleteFragmentShaderATI (JNIEnv * env, jclass clazz, jint id) { - CHECK_EXISTS(glDeleteFragmentShaderATI) glDeleteFragmentShaderATI(id); CHECK_GL_ERROR } @@ -130,10 +105,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glBeginFragmentShaderATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBeginFragmentShaderATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBeginFragmentShaderATI (JNIEnv * env, jclass clazz) { - CHECK_EXISTS(glBeginFragmentShaderATI) glBeginFragmentShaderATI(); CHECK_GL_ERROR } @@ -142,10 +116,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glEndFragmentShaderATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glEndFragmentShaderATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glEndFragmentShaderATI (JNIEnv * env, jclass clazz) { - CHECK_EXISTS(glEndFragmentShaderATI) glEndFragmentShaderATI(); CHECK_GL_ERROR } @@ -154,10 +127,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glPassTexCoordATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glPassTexCoordATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glPassTexCoordATI (JNIEnv * env, jclass clazz, jint dst, jint coord, jint swizzle) { - CHECK_EXISTS(glPassTexCoordATI) glPassTexCoordATI(dst, coord, swizzle); CHECK_GL_ERROR } @@ -166,10 +138,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glSampleMapATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glSampleMapATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glSampleMapATI (JNIEnv * env, jclass clazz, jint dst, jint interp, jint swizzle) { - CHECK_EXISTS(glSampleMapATI) glSampleMapATI(dst, interp, swizzle); CHECK_GL_ERROR } @@ -178,10 +149,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glColorFragmentOp1ATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp1ATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp1ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod) { - CHECK_EXISTS(glColorFragmentOp1ATI) glColorFragmentOp1ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod); CHECK_GL_ERROR } @@ -190,10 +160,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glColorFragmentOp2ATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp2ATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp2ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod) { - CHECK_EXISTS(glColorFragmentOp2ATI) glColorFragmentOp2ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod); CHECK_GL_ERROR } @@ -202,10 +171,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glColorFragmentOp3ATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp3ATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp3ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod, jint arg3, jint arg3Rep, jint arg3Mod) { - CHECK_EXISTS(glColorFragmentOp3ATI) glColorFragmentOp3ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); CHECK_GL_ERROR } @@ -214,10 +182,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glAlphaFragmentOp1ATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp1ATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp1ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod) { - CHECK_EXISTS(glAlphaFragmentOp1ATI) glAlphaFragmentOp1ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod); CHECK_GL_ERROR } @@ -226,10 +193,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glAlphaFragmentOp2ATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp2ATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp2ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod) { - CHECK_EXISTS(glAlphaFragmentOp2ATI) glAlphaFragmentOp2ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod); CHECK_GL_ERROR } @@ -238,10 +204,9 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: glAlphaFragmentOp3ATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp3ATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp3ATI (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod, jint arg3, jint arg3Rep, jint arg3Mod) { - CHECK_EXISTS(glAlphaFragmentOp3ATI) glAlphaFragmentOp3ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); CHECK_GL_ERROR } @@ -250,11 +215,34 @@ * Class: org.lwjgl.opengl.ATIFragmentShader * Method: nglSetFragmentShaderConstantATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_nglSetFragmentShaderConstantATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_nglSetFragmentShaderConstantATI (JNIEnv * env, jclass clazz, jint dst, jobject pfValue, jint pfValue_offset) { - CHECK_EXISTS(glSetFragmentShaderConstantATI) GLfloat *pfValue_ptr = (GLfloat *)env->GetDirectBufferAddress(pfValue) + pfValue_offset; glSetFragmentShaderConstantATI(dst, pfValue_ptr); CHECK_GL_ERROR } + +void extgl_InitATIFragmentShader(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glGenFragmentShadersATI", "(I)I", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glGenFragmentShadersATI, "glGenFragmentShadersATI", (void**)&glGenFragmentShadersATI}, + {"glBindFragmentShaderATI", "(I)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glBindFragmentShaderATI, "glBindFragmentShaderATI", (void**)&glBindFragmentShaderATI}, + {"glDeleteFragmentShaderATI", "(I)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glDeleteFragmentShaderATI, "glDeleteFragmentShaderATI", (void**)&glDeleteFragmentShaderATI}, + {"glBeginFragmentShaderATI", "()V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glBeginFragmentShaderATI, "glBeginFragmentShaderATI", (void**)&glBeginFragmentShaderATI}, + {"glEndFragmentShaderATI", "()V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glEndFragmentShaderATI, "glEndFragmentShaderATI", (void**)&glEndFragmentShaderATI}, + {"glPassTexCoordATI", "(III)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glPassTexCoordATI, "glPassTexCoordATI", (void**)&glPassTexCoordATI}, + {"glSampleMapATI", "(III)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glSampleMapATI, "glSampleMapATI", (void**)&glSampleMapATI}, + {"glColorFragmentOp1ATI", "(IIIIIII)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp1ATI, "glColorFragmentOp1ATI", (void**)&glColorFragmentOp1ATI}, + {"glColorFragmentOp2ATI", "(IIIIIIIIII)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp2ATI, "glColorFragmentOp2ATI", (void**)&glColorFragmentOp2ATI}, + {"glColorFragmentOp3ATI", "(IIIIIIIIIIIII)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp3ATI, "glColorFragmentOp3ATI", (void**)&glColorFragmentOp3ATI}, + {"glAlphaFragmentOp1ATI", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp1ATI, "glAlphaFragmentOp1ATI", (void**)&glAlphaFragmentOp1ATI}, + {"glAlphaFragmentOp2ATI", "(IIIIIIIII)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp2ATI, "glAlphaFragmentOp2ATI", (void**)&glAlphaFragmentOp2ATI}, + {"glAlphaFragmentOp3ATI", "(IIIIIIIIIIII)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp3ATI, "glAlphaFragmentOp3ATI", (void**)&glAlphaFragmentOp3ATI}, + {"nglSetFragmentShaderConstantATI", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIFragmentShader_nglSetFragmentShaderConstantATI, "glSetFragmentShaderConstantATI", (void**)&glSetFragmentShaderConstantATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIFragmentShader"); + if (extgl_Extensions.GL_ATI_fragment_shader) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_fragment_shader", num_functions, functions); +} Index: org_lwjgl_opengl_ATIMapObjectBuffer.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIMapObjectBuffer.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIMapObjectBuffer.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIMapObjectBuffer // ---------------------------------- -#include "org_lwjgl_opengl_ATIMapObjectBuffer.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,25 +43,13 @@ static glMapObjectBufferATIPROC glMapObjectBufferATI; static glUnmapObjectBufferATIPROC glUnmapObjectBufferATI; -void extgl_InitATIMapObjectBuffer(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_map_object_buffer) - return; - - glMapObjectBufferATI = (glMapObjectBufferATIPROC) extgl_GetProcAddress("glMapObjectBufferATI"); - glUnmapObjectBufferATI = (glUnmapObjectBufferATIPROC) extgl_GetProcAddress("glUnmapObjectBufferATI"); - - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_map_object_buffer) -} - /* * Class: org.lwjgl.opengl.ATIMapObjectBuffer * Method: glMapObjectBufferATI */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glMapObjectBufferATI +static JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glMapObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer, jint size, jobject oldBuffer) { - CHECK_EXISTS(glMapObjectBufferATI) void *buffer_address = glMapObjectBufferATI((GLenum)buffer); CHECK_GL_ERROR if (oldBuffer != NULL) { @@ -78,10 +65,21 @@ * Class: org.lwjgl.opengl.ATIMapObjectBuffer * Method: glUnmapObjectBufferATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glUnmapObjectBufferATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glUnmapObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer) { - CHECK_EXISTS(glUnmapObjectBufferATI) glUnmapObjectBufferATI(buffer); CHECK_GL_ERROR } + +void extgl_InitATIMapObjectBuffer(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glMapObjectBufferATI", "(IILjava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;", (void*)&Java_org_lwjgl_opengl_ATIMapObjectBuffer_glMapObjectBufferATI, "glMapObjectBufferATI", (void**)&glMapObjectBufferATI}, + {"glUnmapObjectBufferATI", "(I)V", (void*)&Java_org_lwjgl_opengl_ATIMapObjectBuffer_glUnmapObjectBufferATI, "glUnmapObjectBufferATI", (void**)&glUnmapObjectBufferATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIMapObjectBuffer"); + if (extgl_Extensions.GL_ATI_map_object_buffer) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_map_object_buffer", num_functions, functions); +} Index: org_lwjgl_opengl_ATIPnTriangles.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIPnTriangles.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIPnTriangles.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIPnTriangles // ---------------------------------- -#include "org_lwjgl_opengl_ATIPnTriangles.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,23 +43,13 @@ static glPNTrianglesiATIPROC glPNTrianglesiATI; static glPNTrianglesfATIPROC glPNTrianglesfATI; -void extgl_InitATIPNTriangles(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_pn_triangles) - return; - glPNTrianglesiATI = (glPNTrianglesiATIPROC) extgl_GetProcAddress("glPNTrianglesiATI"); - glPNTrianglesfATI = (glPNTrianglesfATIPROC) extgl_GetProcAddress("glPNTrianglesfATI"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_pn_triangles) -} - /* * Class: org.lwjgl.opengl.ATIPnTriangles * Method: glPNTrianglesfATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesfATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesfATI (JNIEnv * env, jclass clazz, jint pname, jfloat param) { - CHECK_EXISTS(glPNTrianglesfATI) glPNTrianglesfATI(pname, param); CHECK_GL_ERROR } @@ -69,10 +58,21 @@ * Class: org.lwjgl.opengl.ATIPnTriangles * Method: glPNTrianglesiATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesiATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesiATI (JNIEnv * env, jclass clazz, jint pname, jint param) { - CHECK_EXISTS(glPNTrianglesiATI) glPNTrianglesiATI(pname, param); CHECK_GL_ERROR } + +void extgl_InitATIPNTriangles(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glPNTrianglesfATI", "(IF)V", (void*)&Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesfATI, "glPNTrianglesfATI", (void**)&glPNTrianglesfATI}, + {"glPNTrianglesiATI", "(II)V", (void*)&Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesiATI, "glPNTrianglesiATI", (void**)&glPNTrianglesiATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIPnTriangles"); + if (extgl_Extensions.GL_ATI_pn_triangles) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_pn_triangles", num_functions, functions); +} Index: org_lwjgl_opengl_ATISeparateStencil.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATISeparateStencil.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATISeparateStencil.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATISeparateStencil // ---------------------------------- -#include "org_lwjgl_opengl_ATISeparateStencil.h" #include "extgl.h" #include "checkGLerror.h" @@ -44,23 +43,13 @@ static glStencilOpSeparateATIPROC glStencilOpSeparateATI; static glStencilFuncSeparateATIPROC glStencilFuncSeparateATI; -void extgl_InitATISeparateStencil(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_separate_stencil) - return; - glStencilOpSeparateATI = (glStencilOpSeparateATIPROC)extgl_GetProcAddress("glStencilOpSeparateATI"); - glStencilFuncSeparateATI = (glStencilFuncSeparateATIPROC)extgl_GetProcAddress("glStencilFuncSeparateATI"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_separate_stencil) -} - /* * Class: org.lwjgl.opengl.ATISeparateStencil * Method: glStencilOpSeparateATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilOpSeparateATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilOpSeparateATI (JNIEnv * env, jclass clazz, jint face, jint sfail, jint dpfail, jint dppass) { - CHECK_EXISTS(glStencilOpSeparateATI) glStencilOpSeparateATI(face, sfail, dpfail, dppass); CHECK_GL_ERROR } @@ -69,10 +58,21 @@ * Class: org.lwjgl.opengl.ATISeparateStencil * Method: glStencilFuncSeparateATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilFuncSeparateATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilFuncSeparateATI (JNIEnv * env, jclass clazz, jint frontfunc, jint backfunc, jint ref, jint mask) { - CHECK_EXISTS(glStencilFuncSeparateATI) glStencilFuncSeparateATI(frontfunc, backfunc, ref, mask); CHECK_GL_ERROR } + +void extgl_InitATISeparateStencil(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glStencilOpSeparateATI", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ATISeparateStencil_glStencilOpSeparateATI, "glStencilOpSeparateATI", (void**)&glStencilOpSeparateATI}, + {"glStencilFuncSeparateATI", "(IIII)V", (void*)&Java_org_lwjgl_opengl_ATISeparateStencil_glStencilFuncSeparateATI, "glStencilFuncSeparateATI", (void**)&glStencilFuncSeparateATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATISeparateStencil"); + if (extgl_Extensions.GL_ATI_separate_stencil) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_separate_stencil", num_functions, functions); +} Index: org_lwjgl_opengl_ATIVertexArrayObject.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIVertexArrayObject.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIVertexArrayObject.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIVertexArrayObject // ---------------------------------- -#include "org_lwjgl_opengl_ATIVertexArrayObject.h" #include "extgl.h" #include "checkGLerror.h" @@ -64,33 +63,13 @@ static glGetVariantArrayObjectfvATIPROC glGetVariantArrayObjectfvATI; static glGetVariantArrayObjectivATIPROC glGetVariantArrayObjectivATI; -void extgl_InitATIVertexArrayObject(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_vertex_array_object) - return; - glNewObjectBufferATI = (glNewObjectBufferATIPROC) extgl_GetProcAddress("glNewObjectBufferATI"); - glIsObjectBufferATI = (glIsObjectBufferATIPROC) extgl_GetProcAddress("glIsObjectBufferATI"); - glUpdateObjectBufferATI = (glUpdateObjectBufferATIPROC) extgl_GetProcAddress("glUpdateObjectBufferATI"); - glGetObjectBufferfvATI = (glGetObjectBufferfvATIPROC) extgl_GetProcAddress("glGetObjectBufferfvATI"); - glGetObjectBufferivATI = (glGetObjectBufferivATIPROC) extgl_GetProcAddress("glGetObjectBufferivATI"); - glFreeObjectBufferATI = (glFreeObjectBufferATIPROC) extgl_GetProcAddress("glFreeObjectBufferATI"); - glArrayObjectATI = (glArrayObjectATIPROC) extgl_GetProcAddress("glArrayObjectATI"); - glGetArrayObjectfvATI = (glGetArrayObjectfvATIPROC) extgl_GetProcAddress("glGetArrayObjectfvATI"); - glGetArrayObjectivATI = (glGetArrayObjectivATIPROC) extgl_GetProcAddress("glGetArrayObjectivATI"); - glVariantArrayObjectATI = (glVariantArrayObjectATIPROC) extgl_GetProcAddress("glVariantArrayObjectATI"); - glGetVariantArrayObjectfvATI = (glGetVariantArrayObjectfvATIPROC) extgl_GetProcAddress("glGetVariantArrayObjectfvATI"); - glGetVariantArrayObjectivATI = (glGetVariantArrayObjectivATIPROC) extgl_GetProcAddress("glGetVariantArrayObjectivATI"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_vertex_array_object) -} - /* * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglNewObjectBufferATI */ -JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBufferATI +static JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBufferATI (JNIEnv * env, jclass clazz, jint size, jobject pPointer, jint pPointer_offset, jint usage) { - CHECK_EXISTS(glNewObjectBufferATI) GLvoid *pPointer_ptr = safeGetBufferAddress(env, pPointer, pPointer_offset); GLuint result = glNewObjectBufferATI(size, pPointer_ptr, usage); CHECK_GL_ERROR @@ -101,10 +80,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: glIsObjectBufferATI */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glIsObjectBufferATI +static JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glIsObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer) { - CHECK_EXISTS(glIsObjectBufferATI) GLboolean result = glIsObjectBufferATI(buffer); CHECK_GL_ERROR return result; @@ -114,10 +92,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglUpdateObjectBufferATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglUpdateObjectBufferATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglUpdateObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer, jint offset, jint size, jobject pPointer, jint pPointer_offset, jint preserve) { - CHECK_EXISTS(glUpdateObjectBufferATI) GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glUpdateObjectBufferATI(buffer, offset, size, pPointer_ptr, preserve); CHECK_GL_ERROR @@ -127,10 +104,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetObjectBufferfvATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferfvATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferfvATI (JNIEnv * env, jclass clazz, jint buffer, jint pname, jobject pfParams, jint pfParams_offset) { - CHECK_EXISTS(glGetObjectBufferfvATI) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetObjectBufferfvATI(buffer, pname, pfParams_ptr); CHECK_GL_ERROR @@ -140,10 +116,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetObjectBufferivATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferivATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferivATI (JNIEnv * env, jclass clazz, jint buffer, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glGetObjectBufferivATI) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetObjectBufferivATI(buffer, pname, piParams_ptr); CHECK_GL_ERROR @@ -153,10 +128,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: glFreeObjectBufferATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glFreeObjectBufferATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glFreeObjectBufferATI (JNIEnv * env, jclass clazz, jint buffer) { - CHECK_EXISTS(glFreeObjectBufferATI) glFreeObjectBufferATI(buffer); CHECK_GL_ERROR } @@ -165,10 +139,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: glArrayObjectATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glArrayObjectATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glArrayObjectATI (JNIEnv * env, jclass clazz, jint array, jint size, jint type, jint stride, jint buffer, jint offset) { - CHECK_EXISTS(glArrayObjectATI) glArrayObjectATI(array, size, type, stride, buffer, offset); CHECK_GL_ERROR } @@ -177,10 +150,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetArrayObjectfvATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectfvATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectfvATI (JNIEnv * env, jclass clazz, jint array, jint pname, jobject pfParams, jint pfParams_offset) { - CHECK_EXISTS(glGetArrayObjectfvATI) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetArrayObjectfvATI(array, pname, pfParams_ptr); CHECK_GL_ERROR @@ -190,10 +162,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetArrayObjectivATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectivATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectivATI (JNIEnv * env, jclass clazz, jint array, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glGetArrayObjectivATI) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetArrayObjectivATI(array, pname, piParams_ptr); CHECK_GL_ERROR @@ -203,10 +174,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: glVariantArrayObjectATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glVariantArrayObjectATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glVariantArrayObjectATI (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jint buffer, jint offset) { - CHECK_EXISTS(glVariantArrayObjectATI) glVariantArrayObjectATI(id, type, stride, buffer, offset); CHECK_GL_ERROR } @@ -215,10 +185,9 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetVariantArrayObjectfvATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectfvATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectfvATI (JNIEnv * env, jclass clazz, jint id, jint pname, jobject pfParams, jint pfParams_offset_offset) { - CHECK_EXISTS(glGetVariantArrayObjectfvATI) GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset_offset; glGetVariantArrayObjectfvATI(id, pname, pfParams_ptr); CHECK_GL_ERROR @@ -228,11 +197,32 @@ * Class: org.lwjgl.opengl.ATIVertexArrayObject * Method: nglGetVariantArrayObjectivATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectivATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectivATI (JNIEnv * env, jclass clazz, jint id, jint pname, jobject piParams, jint piParams_offset) { - CHECK_EXISTS(glGetVariantArrayObjectivATI) GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetVariantArrayObjectivATI(id, pname, piParams_ptr); CHECK_GL_ERROR } + +void extgl_InitATIVertexArrayObject(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"nglNewObjectBufferATI", "(ILjava/nio/Buffer;II)I", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBufferATI, "glNewObjectBufferATI", (void**)&glNewObjectBufferATI}, + {"glIsObjectBufferATI", "(I)Z", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_glIsObjectBufferATI, "glIsObjectBufferATI", (void**)&glIsObjectBufferATI}, + {"nglUpdateObjectBufferATI", "(IIILjava/nio/Buffer;II)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglUpdateObjectBufferATI, "glUpdateObjectBufferATI", (void**)&glUpdateObjectBufferATI}, + {"nglGetObjectBufferfvATI", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferfvATI, "glGetObjectBufferfvATI", (void**)&glGetObjectBufferfvATI}, + {"nglGetObjectBufferivATI", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBufferivATI, "glGetObjectBufferivATI", (void**)&glGetObjectBufferivATI}, + {"glFreeObjectBufferATI", "(I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_glFreeObjectBufferATI, "glFreeObjectBufferATI", (void**)&glFreeObjectBufferATI}, + {"glArrayObjectATI", "(IIIIII)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_glArrayObjectATI, "glArrayObjectATI", (void**)&glArrayObjectATI}, + {"nglGetArrayObjectfvATI", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectfvATI, "glGetArrayObjectfvATI", (void**)&glGetArrayObjectfvATI}, + {"nglGetArrayObjectivATI", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObjectivATI, "glGetArrayObjectivATI", (void**)&glGetArrayObjectivATI}, + {"glVariantArrayObjectATI", "(IIIII)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_glVariantArrayObjectATI, "glVariantArrayObjectATI", (void**)&glVariantArrayObjectATI}, + {"nglGetVariantArrayObjectfvATI", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectfvATI, "glGetVariantArrayObjectfvATI", (void**)&glGetVariantArrayObjectfvATI}, + {"nglGetVariantArrayObjectivATI", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArrayObjectivATI, "glGetVariantArrayObjectivATI", (void**)&glGetVariantArrayObjectivATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIVertexArrayObject"); + if (extgl_Extensions.GL_ATI_vertex_array_object) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_vertex_array_object", num_functions, functions); +} Index: org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIVertexAttribArrayObject // ---------------------------------- -#include "org_lwjgl_opengl_ATIVertexAttribArrayObject.h" #include "extgl.h" #include "checkGLerror.h" @@ -46,26 +45,13 @@ static glGetVertexAttribArrayObjectfvATIPROC glGetVertexAttribArrayObjectfvATI; static glGetVertexAttribArrayObjectivATIPROC glGetVertexAttribArrayObjectivATI; -void extgl_InitATIVertexAttribArrayObject(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_vertex_attrib_array_object) - return; - - glVertexAttribArrayObjectATI = (glVertexAttribArrayObjectATIPROC) extgl_GetProcAddress("glVertexAttribArrayObjectATI"); - glGetVertexAttribArrayObjectfvATI = (glGetVertexAttribArrayObjectfvATIPROC) extgl_GetProcAddress("glGetVertexAttribArrayObjectfvATI"); - glGetVertexAttribArrayObjectivATI = (glGetVertexAttribArrayObjectivATIPROC) extgl_GetProcAddress("glGetVertexAttribArrayObjectivATI"); - - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_vertex_attrib_array_object) -} - /* * Class: org.lwjgl.opengl.ATIVertexAttribArrayObject * Method: glVertexAttribArrayObjectATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_glVertexAttribArrayObjectATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_glVertexAttribArrayObjectATI (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer, jint offset) { - CHECK_EXISTS(glVertexAttribArrayObjectATI) glVertexAttribArrayObjectATI(index, size, type, normalized, stride, buffer, offset); CHECK_GL_ERROR } @@ -74,10 +60,9 @@ * Class: org.lwjgl.opengl.ATIVertexAttribArrayObject * Method: nglGetVertexAttribArrayObjectfvATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectfvATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectfvATI (JNIEnv * env, jclass clazz, jint index, jint pname, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetVertexAttribArrayObjectfvATI) GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribArrayObjectfvATI(index, pname, params_ptr); CHECK_GL_ERROR @@ -87,11 +72,23 @@ * Class: org.lwjgl.opengl.ATIVertexAttribArrayObject * Method: nglGetVertexAttribArrayObjectivATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectivATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectivATI (JNIEnv * env, jclass clazz, jint index, jint pname, jobject params, jint paramsOffset) { - CHECK_EXISTS(glGetVertexAttribArrayObjectivATI) GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribArrayObjectivATI(index, pname, params_ptr); CHECK_GL_ERROR } + +void extgl_InitATIVertexAttribArrayObject(JNIEnv *env, jobject ext_set) +{ + JavaMethodAndGLFunction functions[] = { + {"glVertexAttribArrayObjectATI", "(IIIZIII)V", (void*)&Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_glVertexAttribArrayObjectATI, "glVertexAttribArrayObjectATI", (void**)&glVertexAttribArrayObjectATI}, + {"nglGetVertexAttribArrayObjectfvATI", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectfvATI, "glGetVertexAttribArrayObjectfvATI", (void**)&glGetVertexAttribArrayObjectfvATI}, + {"nglGetVertexAttribArrayObjectivATI", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVertexAttribArrayObjectivATI, "glGetVertexAttribArrayObjectivATI", (void**)&glGetVertexAttribArrayObjectivATI} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = extgl_ResetClass(env, "org/lwjgl/opengl/ATIVertexAttribArrayObject"); + if (extgl_Extensions.GL_ATI_vertex_attrib_array_object) + extgl_InitializeClass(env, clazz, ext_set, "GL_ATI_vertex_attrib_array_object", num_functions, functions); +} Index: org_lwjgl_opengl_ATIVertexStreams.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIVertexStreams.cpp 8 Feb 2004 20:31:01 -0000 1.1 +++ org_lwjgl_opengl_ATIVertexStreams.cpp 7 Mar 2004 15:18:46 -0000 1.2 @@ -34,7 +34,6 @@ // IMPLEMENTATION OF NATIVE METHODS FOR CLASS: org.lwjgl.opengl.ATIVertexStreams // ---------------------------------- -#include "org_lwjgl_opengl_ATIVertexStreams.h" #include "extgl.h" #include "checkGLerror.h" @@ -78,40 +77,13 @@ static glNormalStream3iATIPROC glNormalStream3iATI; static glNormalStream3fATIPROC glNormalStream3fATI; -void extgl_InitATIVertexStreams(JNIEnv *env, jobject ext_set) -{ - if (!extgl_Extensions.GL_ATI_vertex_streams) - return; - glClientActiveVertexStreamATI = (glClientActiveVertexStreamATIPROC) extgl_GetProcAddress("glClientActiveVertexStreamATI"); - glVertexBlendEnviATI = (glVertexBlendEnviATIPROC) extgl_GetProcAddress("glVertexBlendEnviATI"); - glVertexBlendEnvfATI = (glVertexBlendEnvfATIPROC) extgl_GetProcAddress("glVertexBlendEnvfATI"); - glVertexStream1sATI = (glVertexStream1sATIPROC) extgl_GetProcAddress("glVertexStream1sATI"); - glVertexStream1iATI = (glVertexStream1iATIPROC) extgl_GetProcAddress("glVertexStream1iATI"); - glVertexStream1fATI = (glVertexStream1fATIPROC) extgl_GetProcAddress("glVertexStream1fATI"); - glVertexStream2sATI = (glVertexStream2sATIPROC) extgl_GetProcAddress("glVertexStream2sATI"); - glVertexStream2iATI = (glVertexStream2iATIPROC) extgl_GetProcAddress("glVertexStream2iATI"); - glVertexStream2fATI = (glVertexStream2fATIPROC) extgl_GetProcAddress("glVertexStream2fATI"); - glVertexStream3sATI = (glVertexStream3sATIPROC) extgl_GetProcAddress("glVertexStream3sATI"); - glVertexStream3iATI = (glVertexStream3iATIPROC) extgl_GetProcAddress("glVertexStream3iATI"); - glVertexStream3fATI = (glVertexStream3fATIPROC) extgl_GetProcAddress("glVertexStream3fATI"); - glVertexStream4sATI = (glVertexStream4sATIPROC) extgl_GetProcAddress("glVertexStream4sATI"); - glVertexStream4iATI = (glVertexStream4iATIPROC) extgl_GetProcAddress("glVertexStream4iATI"); - glVertexStream4fATI = (glVertexStream4fATIPROC) extgl_GetProcAddress("glVertexStream4fATI"); - glNormalStream3bATI = (glNormalStream3bATIPROC) extgl_GetProcAddress("glNormalStream3bATI"); - glNormalStream3sATI = (glNormalStream3sATIPROC) extgl_GetProcAddress("glNormalStream3sATI"); - glNormalStream3iATI = (glNormalStream3iATIPROC) extgl_GetProcAddress("glNormalStream3iATI"); - glNormalStream3fATI = (glNormalStream3fATIPROC) extgl_GetProcAddress("glNormalStream3fATI"); - EXTGL_SANITY_CHECK(env, ext_set, GL_ATI_vertex_streams) -} - /* * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream1fATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1fATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x) { - CHECK_EXISTS(glVertexStream1fATI) glVertexStream1fATI(stream, x); CHECK_GL_ERROR } @@ -120,10 +92,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream1iATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1iATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1iATI (JNIEnv * env, jclass clazz, jint stream, jint x) { - CHECK_EXISTS(glVertexStream1iATI) glVertexStream1iATI(stream, x); CHECK_GL_ERROR } @@ -132,10 +103,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream1sATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1sATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1sATI (JNIEnv * env, jclass clazz, jint stream, jshort x) { - CHECK_EXISTS(glVertexStream1sATI) glVertexStream1sATI(stream, x); CHECK_GL_ERROR } @@ -144,10 +114,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream2fATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2fATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y) { - CHECK_EXISTS(glVertexStream2fATI) glVertexStream2fATI(stream, x, y); CHECK_GL_ERROR } @@ -156,10 +125,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream2iATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2iATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y) { - CHECK_EXISTS(glVertexStream2iATI) glVertexStream2iATI(stream, x, y); CHECK_GL_ERROR } @@ -168,10 +136,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream2sATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2sATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y) { - CHECK_EXISTS(glVertexStream2sATI) glVertexStream2sATI(stream, x, y); CHECK_GL_ERROR } @@ -180,10 +147,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream3fATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3fATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z) { - CHECK_EXISTS(glVertexStream3fATI) glVertexStream3fATI(stream, x, y, z); CHECK_GL_ERROR } @@ -192,10 +158,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream3iATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3iATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z) { - CHECK_EXISTS(glVertexStream3iATI) glVertexStream3iATI(stream, x, y, z); CHECK_GL_ERROR } @@ -204,10 +169,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream3sATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3sATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z) { - CHECK_EXISTS(glVertexStream3sATI) glVertexStream3sATI(stream, x, y, z); CHECK_GL_ERROR } @@ -216,10 +180,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream4fATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4fATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z, jfloat w) { - CHECK_EXISTS(glVertexStream4fATI) glVertexStream4fATI(stream, x, y, z, w); CHECK_GL_ERROR } @@ -228,10 +191,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream4iATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4iATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z, jint w) { - CHECK_EXISTS(glVertexStream4iATI) glVertexStream4iATI(stream, x, y, z, w); CHECK_GL_ERROR } @@ -240,10 +202,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexStream4sATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4sATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z, jshort w) { - CHECK_EXISTS(glVertexStream4sATI) glVertexStream4sATI(stream, x, y, z, w); CHECK_GL_ERROR } @@ -252,10 +213,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glNormalStream3bATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3bATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3bATI (JNIEnv * env, jclass clazz, jint stream, jbyte x, jbyte y, jbyte z) { - CHECK_EXISTS(glNormalStream3bATI) glNormalStream3bATI(stream, x, y, z); CHECK_GL_ERROR } @@ -264,10 +224,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glNormalStream3fATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3fATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z) { - CHECK_EXISTS(glNormalStream3fATI) glNormalStream3fATI(stream, x, y, z); CHECK_GL_ERROR } @@ -276,10 +235,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glNormalStream3iATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3iATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z) { - CHECK_EXISTS(glNormalStream3iATI) glNormalStream3iATI(stream, x, y, z); CHECK_GL_ERROR } @@ -288,10 +246,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glNormalStream3sATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3sATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z) { - CHECK_EXISTS(glNormalStream3sATI) glNormalStream3sATI(stream, x, y, z); CHECK_GL_ERROR } @@ -300,10 +257,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glClientActiveVertexStreamATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glClientActiveVertexStreamATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glClientActiveVertexStreamATI (JNIEnv * env, jclass clazz, jint stream) { - CHECK_EXISTS(glClientActiveVertexStreamATI) glClientActiveVertexStreamATI(stream); CHECK_GL_ERROR } @@ -312,10 +268,9 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexBlendEnvfATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnvfATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnvfATI (JNIEnv * env, jclass clazz, jint pname, jfloat param) { - CHECK_EXISTS(glVertexBlendEnvfATI) glVertexBlendEnvfATI(pname, param); CHECK_GL_ERROR } @@ -324,10 +279,38 @@ * Class: org.lwjgl.opengl.ATIVertexStreams * Method: glVertexBlendEnviATI */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnviATI +static JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnviATI (JNIEnv * env, jclass clazz, jint pname, jint param) { - CHECK_EXISTS(glV... [truncated message content] |
|
From: <eli...@us...> - 2004-03-07 15:42:23
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31365/src/native/linux Modified Files: org_lwjgl_opengl_Pbuffer.cpp Log Message: Replaced CHECK_EXISTS with one time check at symbol load time Index: org_lwjgl_opengl_Pbuffer.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Pbuffer.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- org_lwjgl_opengl_Pbuffer.cpp 2 Mar 2004 01:58:29 -0000 1.10 +++ org_lwjgl_opengl_Pbuffer.cpp 7 Mar 2004 15:18:47 -0000 1.11 @@ -198,4 +198,4 @@ (JNIEnv *env, jclass clazz, jint handle, jint buffer) { throwException(env, "The render-to-texture extension is not supported."); -} \ No newline at end of file +} |
