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
|
2
(3) |
3
|
4
|
|
5
|
6
(2) |
7
|
8
|
9
|
10
|
11
|
|
12
|
13
|
14
|
15
|
16
|
17
|
18
|
|
19
|
20
|
21
(2) |
22
(4) |
23
(2) |
24
|
25
|
|
26
(5) |
27
|
28
(1) |
|
|
|
|
|
From: Elias N. <eli...@us...> - 2006-02-28 12:39:21
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5978/src/java/org/lwjgl Modified Files: MacOSXSysImplementation.java Log Message: Fixed typo Index: MacOSXSysImplementation.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MacOSXSysImplementation.java 16 Jan 2006 21:04:49 -0000 1.5 +++ MacOSXSysImplementation.java 28 Feb 2006 12:39:15 -0000 1.6 @@ -63,7 +63,7 @@ * using webstart, one can supply two nativelib references, one for Mac OS X 10.4 * (the default library), and one for earlier Mac OS X (the legacy library). This is the * preferred way to deploy the libraries. The legacy naming is for the users that don't want to - * mess around with libraries and classloaders. They can simply supply make sure that lwjgl.jar + * mess around with libraries and classloaders. They can simply make sure that lwjgl.jar * is in the classpath and that both the default library and the legacy library is in the native * library path (java.library.path). */ |
Update of /cvsroot/java-game-lib/LWJGL/src/native/generated In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13117/src/native/generated Modified Files: org_lwjgl_opengl_ARBBufferObject.c org_lwjgl_opengl_ARBImaging.c org_lwjgl_opengl_ARBMatrixPalette.c org_lwjgl_opengl_ARBTextureCompression.c org_lwjgl_opengl_ARBVertexBlend.c org_lwjgl_opengl_ARBVertexProgram.c org_lwjgl_opengl_ARBVertexShader.c org_lwjgl_opengl_ATIElementArray.c org_lwjgl_opengl_EXTDrawRangeElements.c org_lwjgl_opengl_EXTFogCoord.c org_lwjgl_opengl_EXTSecondaryColor.c org_lwjgl_opengl_EXTVertexShader.c org_lwjgl_opengl_EXTVertexWeighting.c org_lwjgl_opengl_GL11.c org_lwjgl_opengl_GL12.c org_lwjgl_opengl_GL13.c org_lwjgl_opengl_GL14.c org_lwjgl_opengl_GL15.c org_lwjgl_opengl_GL20.c org_lwjgl_opengl_NVVertexProgram.c Log Message: Widened VBO/PBO buffer offsets and sizes to long to better match the GLsizeiptr and GLintptr native types Index: org_lwjgl_opengl_ATIElementArray.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ATIElementArray.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ATIElementArray.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ATIElementArray.c 26 Feb 2006 11:44:34 -0000 1.2 @@ -13,7 +13,7 @@ glElementPointerATI(type, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIBO(JNIEnv *env, jclass clazz, jint type, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIBO(JNIEnv *env, jclass clazz, jint type, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glElementPointerATIPROC glElementPointerATI = (glElementPointerATIPROC)((intptr_t)function_pointer); glElementPointerATI(type, pPointer_address); Index: org_lwjgl_opengl_ARBVertexProgram.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBVertexProgram.c 2 Nov 2005 09:28:11 -0000 1.2 +++ org_lwjgl_opengl_ARBVertexProgram.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -95,7 +95,7 @@ glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jlong buffer_buffer_offset, jlong function_pointer) { const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); glVertexAttribPointerARBPROC glVertexAttribPointerARB = (glVertexAttribPointerARBPROC)((intptr_t)function_pointer); glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); Index: org_lwjgl_opengl_EXTVertexShader.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTVertexShader.c 2 Nov 2005 09:28:11 -0000 1.3 +++ org_lwjgl_opengl_EXTVertexShader.c 26 Feb 2006 11:44:34 -0000 1.4 @@ -179,7 +179,7 @@ glVariantPointerEXT(id, type, stride, pAddr_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTBO(JNIEnv *env, jclass clazz, jint id, jint type, jint stride, jint pAddr_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTBO(JNIEnv *env, jclass clazz, jint id, jint type, jint stride, jlong pAddr_buffer_offset, jlong function_pointer) { const GLvoid *pAddr_address = ((const GLvoid *)offsetToPointer(pAddr_buffer_offset)); glVariantPointerEXTPROC glVariantPointerEXT = (glVariantPointerEXTPROC)((intptr_t)function_pointer); glVariantPointerEXT(id, type, stride, pAddr_address); Index: org_lwjgl_opengl_ARBVertexBlend.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexBlend.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBVertexBlend.c 2 Nov 2005 09:28:11 -0000 1.2 +++ org_lwjgl_opengl_ARBVertexBlend.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -68,7 +68,7 @@ glWeightPointerARB(size, type, stride, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightPointerARBBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightPointerARBBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glWeightPointerARBPROC glWeightPointerARB = (glWeightPointerARBPROC)((intptr_t)function_pointer); glWeightPointerARB(size, type, stride, pPointer_address); Index: org_lwjgl_opengl_ARBVertexShader.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBVertexShader.c 5 Nov 2005 18:56:55 -0000 1.2 +++ org_lwjgl_opengl_ARBVertexShader.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -98,7 +98,7 @@ glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jlong buffer_buffer_offset, jlong function_pointer) { const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); glVertexAttribPointerARBPROC glVertexAttribPointerARB = (glVertexAttribPointerARBPROC)((intptr_t)function_pointer); glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); Index: org_lwjgl_opengl_EXTSecondaryColor.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_EXTSecondaryColor.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_EXTSecondaryColor.c 2 Nov 2005 09:28:11 -0000 1.3 +++ org_lwjgl_opengl_EXTSecondaryColor.c 26 Feb 2006 11:44:34 -0000 1.4 @@ -35,7 +35,7 @@ glSecondaryColorPointerEXT(size, type, stride, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glSecondaryColorPointerEXTPROC glSecondaryColorPointerEXT = (glSecondaryColorPointerEXTPROC)((intptr_t)function_pointer); glSecondaryColorPointerEXT(size, type, stride, pPointer_address); Index: org_lwjgl_opengl_EXTFogCoord.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_EXTFogCoord.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_EXTFogCoord.c 2 Nov 2005 09:28:11 -0000 1.2 +++ org_lwjgl_opengl_EXTFogCoord.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -23,7 +23,7 @@ glFogCoordPointerEXT(type, stride, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTBO(JNIEnv *env, jclass clazz, jint type, jint stride, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTBO(JNIEnv *env, jclass clazz, jint type, jint stride, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glFogCoordPointerEXTPROC glFogCoordPointerEXT = (glFogCoordPointerEXTPROC)((intptr_t)function_pointer); glFogCoordPointerEXT(type, stride, data_address); Index: org_lwjgl_opengl_GL14.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL14.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_GL14.c 2 Nov 2005 09:28:11 -0000 1.3 +++ org_lwjgl_opengl_GL14.c 26 Feb 2006 11:44:34 -0000 1.4 @@ -52,7 +52,7 @@ glFogCoordPointer(type, stride, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerBO(JNIEnv *env, jclass clazz, jint type, jint stride, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerBO(JNIEnv *env, jclass clazz, jint type, jint stride, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glFogCoordPointerPROC glFogCoordPointer = (glFogCoordPointerPROC)((intptr_t)function_pointer); glFogCoordPointer(type, stride, data_address); @@ -113,7 +113,7 @@ glSecondaryColorPointer(size, type, stride, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glSecondaryColorPointerPROC glSecondaryColorPointer = (glSecondaryColorPointerPROC)((intptr_t)function_pointer); glSecondaryColorPointer(size, type, stride, data_address); Index: org_lwjgl_opengl_ARBTextureCompression.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBTextureCompression.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBTextureCompression.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ARBTextureCompression.c 26 Feb 2006 11:44:34 -0000 1.2 @@ -17,7 +17,7 @@ glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage1DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage1DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexImage1DARBPROC glCompressedTexImage1DARB = (glCompressedTexImage1DARBPROC)((intptr_t)function_pointer); glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData_address); @@ -29,7 +29,7 @@ glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage2DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage2DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexImage2DARBPROC glCompressedTexImage2DARB = (glCompressedTexImage2DARBPROC)((intptr_t)function_pointer); glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData_address); @@ -41,7 +41,7 @@ glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage3DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage3DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexImage3DARBPROC glCompressedTexImage3DARB = (glCompressedTexImage3DARBPROC)((intptr_t)function_pointer); glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData_address); @@ -53,7 +53,7 @@ glCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage1DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage1DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexSubImage1DARBPROC glCompressedTexSubImage1DARB = (glCompressedTexSubImage1DARBPROC)((intptr_t)function_pointer); glCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData_address); @@ -65,7 +65,7 @@ glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage2DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage2DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexSubImage2DARBPROC glCompressedTexSubImage2DARB = (glCompressedTexSubImage2DARBPROC)((intptr_t)function_pointer); glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData_address); @@ -77,7 +77,7 @@ glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage3DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage3DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexSubImage3DARBPROC glCompressedTexSubImage3DARB = (glCompressedTexSubImage3DARBPROC)((intptr_t)function_pointer); glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData_address); @@ -89,7 +89,7 @@ glGetCompressedTexImageARB(target, lod, pImg_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompressedTexImageARBBO(JNIEnv *env, jclass clazz, jint target, jint lod, jint pImg_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompressedTexImageARBBO(JNIEnv *env, jclass clazz, jint target, jint lod, jlong pImg_buffer_offset, jlong function_pointer) { GLvoid *pImg_address = ((GLvoid *)offsetToPointer(pImg_buffer_offset)); glGetCompressedTexImageARBPROC glGetCompressedTexImageARB = (glGetCompressedTexImageARBPROC)((intptr_t)function_pointer); glGetCompressedTexImageARB(target, lod, pImg_address); Index: org_lwjgl_opengl_GL15.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_GL15.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_GL15.c 26 Feb 2006 11:44:34 -0000 1.2 @@ -46,19 +46,19 @@ return __result; } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData(JNIEnv *env, jclass clazz, jint target, jint size, jobject data, jint data_position, jint usage, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData(JNIEnv *env, jclass clazz, jint target, jlong size, jobject data, jint data_position, jint usage, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)safeGetBufferAddress(env, data)) + data_position)); glBufferDataPROC glBufferData = (glBufferDataPROC)((intptr_t)function_pointer); glBufferData(target, size, data_address, usage); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferSubData(JNIEnv *env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_position, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferSubData(JNIEnv *env, jclass clazz, jint target, jlong offset, jlong size, jobject data, jint data_position, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glBufferSubDataPROC glBufferSubData = (glBufferSubDataPROC)((intptr_t)function_pointer); glBufferSubData(target, offset, size, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferSubData(JNIEnv *env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_position, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferSubData(JNIEnv *env, jclass clazz, jint target, jlong offset, jlong size, jobject data, jint data_position, jlong function_pointer) { GLvoid *data_address = ((GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glGetBufferSubDataPROC glGetBufferSubData = (glGetBufferSubDataPROC)((intptr_t)function_pointer); glGetBufferSubData(target, offset, size, data_address); Index: org_lwjgl_opengl_EXTDrawRangeElements.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_EXTDrawRangeElements.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTDrawRangeElements.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_EXTDrawRangeElements.c 26 Feb 2006 11:44:34 -0000 1.2 @@ -11,7 +11,7 @@ glDrawRangeElementsEXT(mode, start, end, count, type, pIndices_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTBO(JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint pIndices_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTBO(JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jlong pIndices_buffer_offset, jlong function_pointer) { const GLvoid *pIndices_address = ((const GLvoid *)offsetToPointer(pIndices_buffer_offset)); glDrawRangeElementsEXTPROC glDrawRangeElementsEXT = (glDrawRangeElementsEXTPROC)((intptr_t)function_pointer); glDrawRangeElementsEXT(mode, start, end, count, type, pIndices_address); Index: org_lwjgl_opengl_EXTVertexWeighting.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexWeighting.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_EXTVertexWeighting.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_EXTVertexWeighting.c 26 Feb 2006 11:44:34 -0000 1.2 @@ -17,7 +17,7 @@ glVertexWeightPointerEXT(size, type, stride, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXTBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXTBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glVertexWeightPointerEXTPROC glVertexWeightPointerEXT = (glVertexWeightPointerEXTPROC)((intptr_t)function_pointer); glVertexWeightPointerEXT(size, type, stride, pPointer_address); Index: org_lwjgl_opengl_ARBImaging.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBImaging.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBImaging.c 28 Oct 2005 15:43:50 -0000 1.2 +++ org_lwjgl_opengl_ARBImaging.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -44,7 +44,7 @@ glColorTable(target, internalFormat, width, format, type, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableBO(JNIEnv *env, jclass clazz, jint target, jint internalFormat, jint width, jint format, jint type, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableBO(JNIEnv *env, jclass clazz, jint target, jint internalFormat, jint width, jint format, jint type, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glColorTablePROC glColorTable = (glColorTablePROC)((intptr_t)function_pointer); glColorTable(target, internalFormat, width, format, type, data_address); @@ -56,7 +56,7 @@ glColorSubTable(target, start, count, format, type, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTableBO(JNIEnv *env, jclass clazz, jint target, jint start, jint count, jint format, jint type, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTableBO(JNIEnv *env, jclass clazz, jint target, jint start, jint count, jint format, jint type, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glColorSubTablePROC glColorSubTable = (glColorSubTablePROC)((intptr_t)function_pointer); glColorSubTable(target, start, count, format, type, data_address); @@ -128,7 +128,7 @@ glGetHistogram(target, reset, format, type, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramBO(JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint type, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramBO(JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint type, jlong values_buffer_offset, jlong function_pointer) { GLvoid *values_address = ((GLvoid *)offsetToPointer(values_buffer_offset)); glGetHistogramPROC glGetHistogram = (glGetHistogramPROC)((intptr_t)function_pointer); glGetHistogram(target, reset, format, type, values_address); @@ -162,7 +162,7 @@ glGetMinmax(target, reset, format, types, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxBO(JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint types, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxBO(JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint types, jlong values_buffer_offset, jlong function_pointer) { GLvoid *values_address = ((GLvoid *)offsetToPointer(values_buffer_offset)); glGetMinmaxPROC glGetMinmax = (glGetMinmaxPROC)((intptr_t)function_pointer); glGetMinmax(target, reset, format, types, values_address); @@ -186,7 +186,7 @@ glConvolutionFilter1D(target, internalformat, width, format, type, image_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint format, jint type, jint image_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint format, jint type, jlong image_buffer_offset, jlong function_pointer) { const GLvoid *image_address = ((const GLvoid *)offsetToPointer(image_buffer_offset)); glConvolutionFilter1DPROC glConvolutionFilter1D = (glConvolutionFilter1DPROC)((intptr_t)function_pointer); glConvolutionFilter1D(target, internalformat, width, format, type, image_address); @@ -198,7 +198,7 @@ glConvolutionFilter2D(target, internalformat, width, height, format, type, image_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jint image_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jlong image_buffer_offset, jlong function_pointer) { const GLvoid *image_address = ((const GLvoid *)offsetToPointer(image_buffer_offset)); glConvolutionFilter2DPROC glConvolutionFilter2D = (glConvolutionFilter2DPROC)((intptr_t)function_pointer); glConvolutionFilter2D(target, internalformat, width, height, format, type, image_address); @@ -242,7 +242,7 @@ glGetConvolutionFilter(target, format, type, image_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilterBO(JNIEnv *env, jclass clazz, jint target, jint format, jint type, jint image_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilterBO(JNIEnv *env, jclass clazz, jint target, jint format, jint type, jlong image_buffer_offset, jlong function_pointer) { GLvoid *image_address = ((GLvoid *)offsetToPointer(image_buffer_offset)); glGetConvolutionFilterPROC glGetConvolutionFilter = (glGetConvolutionFilterPROC)((intptr_t)function_pointer); glGetConvolutionFilter(target, format, type, image_address); @@ -267,7 +267,7 @@ glSeparableFilter2D(target, internalformat, width, height, format, type, row_address, column_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jint row_buffer_offset, jint column_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jlong row_buffer_offset, jlong column_buffer_offset, jlong function_pointer) { const GLvoid *row_address = ((const GLvoid *)offsetToPointer(row_buffer_offset)); const GLvoid *column_address = ((const GLvoid *)offsetToPointer(column_buffer_offset)); glSeparableFilter2DPROC glSeparableFilter2D = (glSeparableFilter2DPROC)((intptr_t)function_pointer); @@ -282,7 +282,7 @@ glGetSeparableFilter(target, format, type, row_address, column_address, span_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilterBO(JNIEnv *env, jclass clazz, jint target, jint format, jint type, jint row_buffer_offset, jint column_buffer_offset, jint span_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilterBO(JNIEnv *env, jclass clazz, jint target, jint format, jint type, jlong row_buffer_offset, jlong column_buffer_offset, jlong span_buffer_offset, jlong function_pointer) { GLvoid *row_address = ((GLvoid *)offsetToPointer(row_buffer_offset)); GLvoid *column_address = ((GLvoid *)offsetToPointer(column_buffer_offset)); GLvoid *span_address = ((GLvoid *)offsetToPointer(span_buffer_offset)); Index: org_lwjgl_opengl_ARBBufferObject.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_ARBBufferObject.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_ARBBufferObject.c 26 Feb 2006 11:44:34 -0000 1.2 @@ -38,19 +38,19 @@ return __result; } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferDataARB(JNIEnv *env, jclass clazz, jint target, jint size, jobject data, jint data_position, jint usage, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferDataARB(JNIEnv *env, jclass clazz, jint target, jlong size, jobject data, jint data_position, jint usage, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)safeGetBufferAddress(env, data)) + data_position)); glBufferDataARBPROC glBufferDataARB = (glBufferDataARBPROC)((intptr_t)function_pointer); glBufferDataARB(target, size, data_address, usage); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferSubDataARB(JNIEnv *env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_position, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferSubDataARB(JNIEnv *env, jclass clazz, jint target, jlong offset, jlong size, jobject data, jint data_position, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glBufferSubDataARBPROC glBufferSubDataARB = (glBufferSubDataARBPROC)((intptr_t)function_pointer); glBufferSubDataARB(target, offset, size, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglGetBufferSubDataARB(JNIEnv *env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_position, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglGetBufferSubDataARB(JNIEnv *env, jclass clazz, jint target, jlong offset, jlong size, jobject data, jint data_position, jlong function_pointer) { GLvoid *data_address = ((GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glGetBufferSubDataARBPROC glGetBufferSubDataARB = (glGetBufferSubDataARBPROC)((intptr_t)function_pointer); glGetBufferSubDataARB(target, offset, size, data_address); Index: org_lwjgl_opengl_ARBMatrixPalette.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_ARBMatrixPalette.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_ARBMatrixPalette.c 28 Oct 2005 15:43:50 -0000 1.2 +++ org_lwjgl_opengl_ARBMatrixPalette.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -20,7 +20,7 @@ glMatrixIndexPointerARB(size, type, stride, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glMatrixIndexPointerARBPROC glMatrixIndexPointerARB = (glMatrixIndexPointerARBPROC)((intptr_t)function_pointer); glMatrixIndexPointerARB(size, type, stride, pPointer_address); Index: org_lwjgl_opengl_GL20.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_GL20.c 2 Nov 2005 09:28:11 -0000 1.2 +++ org_lwjgl_opengl_GL20.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -389,7 +389,7 @@ glVertexAttribPointer(index, size, type, normalized, stride, buffer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttribPointerBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttribPointerBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jlong buffer_buffer_offset, jlong function_pointer) { const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); glVertexAttribPointerPROC glVertexAttribPointer = (glVertexAttribPointerPROC)((intptr_t)function_pointer); glVertexAttribPointer(index, size, type, normalized, stride, buffer_address); Index: org_lwjgl_opengl_NVVertexProgram.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_NVVertexProgram.c 2 Nov 2005 09:28:11 -0000 1.2 +++ org_lwjgl_opengl_NVVertexProgram.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -125,7 +125,7 @@ glVertexAttribPointerNV(index, size, type, stride, buffer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointerNVBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jint stride, jint buffer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointerNVBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jint stride, jlong buffer_buffer_offset, jlong function_pointer) { const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); glVertexAttribPointerNVPROC glVertexAttribPointerNV = (glVertexAttribPointerNVPROC)((intptr_t)function_pointer); glVertexAttribPointerNV(index, size, type, stride, buffer_address); Index: org_lwjgl_opengl_GL13.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL13.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_GL13.c 2 Nov 2005 09:28:11 -0000 1.2 +++ org_lwjgl_opengl_GL13.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -42,7 +42,7 @@ glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexImage1DPROC glCompressedTexImage1D = (glCompressedTexImage1DPROC)((intptr_t)function_pointer); glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data_address); @@ -54,7 +54,7 @@ glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexImage2DPROC glCompressedTexImage2D = (glCompressedTexImage2DPROC)((intptr_t)function_pointer); glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data_address); @@ -66,7 +66,7 @@ glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexImage3DPROC glCompressedTexImage3D = (glCompressedTexImage3DPROC)((intptr_t)function_pointer); glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data_address); @@ -78,7 +78,7 @@ glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexSubImage1DPROC glCompressedTexSubImage1D = (glCompressedTexSubImage1DPROC)((intptr_t)function_pointer); glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data_address); @@ -90,7 +90,7 @@ glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexSubImage2DPROC glCompressedTexSubImage2D = (glCompressedTexSubImage2DPROC)((intptr_t)function_pointer); glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data_address); @@ -102,7 +102,7 @@ glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexSubImage3DPROC glCompressedTexSubImage3D = (glCompressedTexSubImage3DPROC)((intptr_t)function_pointer); glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data_address); @@ -114,7 +114,7 @@ glGetCompressedTexImage(target, lod, img_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImageBO(JNIEnv *env, jclass clazz, jint target, jint lod, jint img_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImageBO(JNIEnv *env, jclass clazz, jint target, jint lod, jlong img_buffer_offset, jlong function_pointer) { GLvoid *img_address = ((GLvoid *)offsetToPointer(img_buffer_offset)); glGetCompressedTexImagePROC glGetCompressedTexImage = (glGetCompressedTexImagePROC)((intptr_t)function_pointer); glGetCompressedTexImage(target, lod, img_address); Index: org_lwjgl_opengl_GL12.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL12.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_GL12.c 29 Sep 2005 17:13:37 -0000 1.1 +++ org_lwjgl_opengl_GL12.c 26 Feb 2006 11:44:34 -0000 1.2 @@ -14,7 +14,7 @@ glDrawRangeElements(mode, start, end, count, type, indices_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsBO(JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint indices_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsBO(JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jlong indices_buffer_offset, jlong function_pointer) { const GLvoid *indices_address = ((const GLvoid *)offsetToPointer(indices_buffer_offset)); glDrawRangeElementsPROC glDrawRangeElements = (glDrawRangeElementsPROC)((intptr_t)function_pointer); glDrawRangeElements(mode, start, end, count, type, indices_address); @@ -26,7 +26,7 @@ glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalFormat, jint width, jint height, jint depth, jint border, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalFormat, jint width, jint height, jint depth, jint border, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexImage3DPROC glTexImage3D = (glTexImage3DPROC)((intptr_t)function_pointer); glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels_address); @@ -38,7 +38,7 @@ glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexSubImage3DPROC glTexSubImage3D = (glTexSubImage3DPROC)((intptr_t)function_pointer); glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels_address); Index: org_lwjgl_opengl_GL11.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_GL11.c 2 Nov 2005 09:28:11 -0000 1.2 +++ org_lwjgl_opengl_GL11.c 26 Feb 2006 11:44:34 -0000 1.3 @@ -277,7 +277,7 @@ glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglBitmapBO(JNIEnv *env, jclass clazz, jint width, jint height, jfloat xorig, jfloat yorig, jfloat xmove, jfloat ymove, jint bitmap_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglBitmapBO(JNIEnv *env, jclass clazz, jint width, jint height, jfloat xorig, jfloat yorig, jfloat xmove, jfloat ymove, jlong bitmap_buffer_offset, jlong function_pointer) { const GLubyte *bitmap_address = ((const GLubyte *)offsetToPointer(bitmap_buffer_offset)); glBitmapPROC glBitmap = (glBitmapPROC)((intptr_t)function_pointer); glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap_address); @@ -355,7 +355,7 @@ glColorPointer(size, type, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glColorPointerPROC glColorPointer = (glColorPointerPROC)((intptr_t)function_pointer); glColorPointer(size, type, stride, pointer_address); @@ -488,7 +488,7 @@ glEdgeFlagPointer(stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglEdgeFlagPointerBO(JNIEnv *env, jclass clazz, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglEdgeFlagPointerBO(JNIEnv *env, jclass clazz, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glEdgeFlagPointerPROC glEdgeFlagPointer = (glEdgeFlagPointerPROC)((intptr_t)function_pointer); glEdgeFlagPointer(stride, pointer_address); @@ -505,7 +505,7 @@ glDrawPixels(width, height, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawPixelsBO(JNIEnv *env, jclass clazz, jint width, jint height, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawPixelsBO(JNIEnv *env, jclass clazz, jint width, jint height, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glDrawPixelsPROC glDrawPixels = (glDrawPixelsPROC)((intptr_t)function_pointer); glDrawPixels(width, height, format, type, pixels_address); @@ -517,7 +517,7 @@ glDrawElements(mode, count, type, indices_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElementsBO(JNIEnv *env, jclass clazz, jint mode, jint count, jint type, jint indices_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElementsBO(JNIEnv *env, jclass clazz, jint mode, jint count, jint type, jlong indices_buffer_offset, jlong function_pointer) { const GLvoid *indices_address = ((const GLvoid *)offsetToPointer(indices_buffer_offset)); glDrawElementsPROC glDrawElements = (glDrawElementsPROC)((intptr_t)function_pointer); glDrawElements(mode, count, type, indices_address); @@ -560,7 +560,7 @@ glGetPixelMapfv(map, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapfvBO(JNIEnv *env, jclass clazz, jint map, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapfvBO(JNIEnv *env, jclass clazz, jint map, jlong values_buffer_offset, jlong function_pointer) { GLfloat *values_address = ((GLfloat *)offsetToPointer(values_buffer_offset)); glGetPixelMapfvPROC glGetPixelMapfv = (glGetPixelMapfvPROC)((intptr_t)function_pointer); glGetPixelMapfv(map, values_address); @@ -572,7 +572,7 @@ glGetPixelMapuiv(map, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapuivBO(JNIEnv *env, jclass clazz, jint map, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapuivBO(JNIEnv *env, jclass clazz, jint map, jlong values_buffer_offset, jlong function_pointer) { GLuint *values_address = ((GLuint *)offsetToPointer(values_buffer_offset)); glGetPixelMapuivPROC glGetPixelMapuiv = (glGetPixelMapuivPROC)((intptr_t)function_pointer); glGetPixelMapuiv(map, values_address); @@ -584,7 +584,7 @@ glGetPixelMapusv(map, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapusvBO(JNIEnv *env, jclass clazz, jint map, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapusvBO(JNIEnv *env, jclass clazz, jint map, jlong values_buffer_offset, jlong function_pointer) { GLushort *values_address = ((GLushort *)offsetToPointer(values_buffer_offset)); glGetPixelMapusvPROC glGetPixelMapusv = (glGetPixelMapusvPROC)((intptr_t)function_pointer); glGetPixelMapusv(map, values_address); @@ -741,7 +741,7 @@ glInterleavedArrays(format, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArraysBO(JNIEnv *env, jclass clazz, jint format, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArraysBO(JNIEnv *env, jclass clazz, jint format, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glInterleavedArraysPROC glInterleavedArrays = (glInterleavedArraysPROC)((intptr_t)function_pointer); glInterleavedArrays(format, stride, pointer_address); @@ -787,7 +787,7 @@ glGetTexImage(target, level, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexImageBO(JNIEnv *env, jclass clazz, jint target, jint level, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexImageBO(JNIEnv *env, jclass clazz, jint target, jint level, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { GLvoid *pixels_address = ((GLvoid *)offsetToPointer(pixels_buffer_offset)); glGetTexImagePROC glGetTexImage = (glGetTexImagePROC)((intptr_t)function_pointer); glGetTexImage(target, level, format, type, pixels_address); @@ -835,7 +835,7 @@ glGetPolygonStipple(mask_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPolygonStippleBO(JNIEnv *env, jclass clazz, jint mask_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPolygonStippleBO(JNIEnv *env, jclass clazz, jlong mask_buffer_offset, jlong function_pointer) { GLubyte *mask_address = ((GLubyte *)offsetToPointer(mask_buffer_offset)); glGetPolygonStipplePROC glGetPolygonStipple = (glGetPolygonStipplePROC)((intptr_t)function_pointer); glGetPolygonStipple(mask_address); @@ -1016,7 +1016,7 @@ glPolygonStipple(mask_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPolygonStippleBO(JNIEnv *env, jclass clazz, jint mask_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPolygonStippleBO(JNIEnv *env, jclass clazz, jlong mask_buffer_offset, jlong function_pointer) { const GLubyte *mask_address = ((const GLubyte *)offsetToPointer(mask_buffer_offset)); glPolygonStipplePROC glPolygonStipple = (glPolygonStipplePROC)((intptr_t)function_pointer); glPolygonStipple(mask_address); @@ -1068,7 +1068,7 @@ glPixelMapfv(map, mapsize, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapfvBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapfvBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jlong values_buffer_offset, jlong function_pointer) { const GLfloat *values_address = ((const GLfloat *)offsetToPointer(values_buffer_offset)); glPixelMapfvPROC glPixelMapfv = (glPixelMapfvPROC)((intptr_t)function_pointer); glPixelMapfv(map, mapsize, values_address); @@ -1080,7 +1080,7 @@ glPixelMapuiv(map, mapsize, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapuivBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapuivBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jlong values_buffer_offset, jlong function_pointer) { const GLuint *values_address = ((const GLuint *)offsetToPointer(values_buffer_offset)); glPixelMapuivPROC glPixelMapuiv = (glPixelMapuivPROC)((intptr_t)function_pointer); glPixelMapuiv(map, mapsize, values_address); @@ -1092,7 +1092,7 @@ glPixelMapusv(map, mapsize, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapusvBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapusvBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jlong values_buffer_offset, jlong function_pointer) { const GLushort *values_address = ((const GLushort *)offsetToPointer(values_buffer_offset)); glPixelMapusvPROC glPixelMapusv = (glPixelMapusvPROC)((intptr_t)function_pointer); glPixelMapusv(map, mapsize, values_address); @@ -1114,7 +1114,7 @@ glNormalPointer(type, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglNormalPointerBO(JNIEnv *env, jclass clazz, jint type, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglNormalPointerBO(JNIEnv *env, jclass clazz, jint type, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glNormalPointerPROC glNormalPointer = (glNormalPointerPROC)((intptr_t)function_pointer); glNormalPointer(type, stride, pointer_address); @@ -1220,7 +1220,7 @@ glReadPixels(x, y, width, height, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglReadPixelsBO(JNIEnv *env, jclass clazz, jint x, jint y, jint width, jint height, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglReadPixelsBO(JNIEnv *env, jclass clazz, jint x, jint y, jint width, jint height, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { GLvoid *pixels_address = ((GLvoid *)offsetToPointer(pixels_buffer_offset)); glReadPixelsPROC glReadPixels = (glReadPixelsPROC)((intptr_t)function_pointer); glReadPixels(x, y, width, height, format, type, pixels_address); @@ -1327,7 +1327,7 @@ glVertexPointer(size, type, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglVertexPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglVertexPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glVertexPointerPROC glVertexPointer = (glVertexPointerPROC)((intptr_t)function_pointer); glVertexPointer(size, type, stride, pointer_address); @@ -1394,7 +1394,7 @@ glTexImage1D(target, level, internalformat, width, border, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexImage1DPROC glTexImage1D = (glTexImage1DPROC)((intptr_t)function_pointer); glTexImage1D(target, level, internalformat, width, border, format, type, pixels_address); @@ -1406,7 +1406,7 @@ glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pix... [truncated message content] |
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13117/src/generated/org/lwjgl/opengl Modified Files: ARBBufferObject.java ARBImaging.java ARBMatrixPalette.java ARBTextureCompression.java ARBVertexBlend.java ARBVertexProgram.java ARBVertexShader.java ATIElementArray.java EXTDrawRangeElements.java EXTFogCoord.java EXTSecondaryColor.java EXTVertexShader.java EXTVertexWeighting.java GL11.java GL12.java GL13.java GL14.java GL15.java GL20.java NVVertexProgram.java Log Message: Widened VBO/PBO buffer offsets and sizes to long to better match the GLsizeiptr and GLintptr native types Index: EXTVertexShader.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTVertexShader.java 2 Nov 2005 09:28:10 -0000 1.2 +++ EXTVertexShader.java 26 Feb 2006 11:44:33 -0000 1.3 @@ -384,13 +384,13 @@ nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pAddr, pAddr.position() << 1, function_pointer); } private static native void nglVariantPointerEXT(int id, int type, int stride, Buffer pAddr, int pAddr_position, long function_pointer); - public static void glVariantPointerEXT(int id, int type, int stride, int pAddr_buffer_offset) { + public static void glVariantPointerEXT(int id, int type, int stride, long pAddr_buffer_offset) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVariantPointerEXTBO(id, type, stride, pAddr_buffer_offset, function_pointer); } - private static native void nglVariantPointerEXTBO(int id, int type, int stride, int pAddr_buffer_offset, long function_pointer); + private static native void nglVariantPointerEXTBO(int id, int type, int stride, long pAddr_buffer_offset, long function_pointer); public static void glEnableVariantClientStateEXT(int id) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glEnableVariantClientStateEXT_pointer; Index: GL13.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL13.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GL13.java 2 Nov 2005 09:28:10 -0000 1.2 +++ GL13.java 26 Feb 2006 11:44:33 -0000 1.3 @@ -158,13 +158,13 @@ nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 1, function_pointer); } private static native void nglCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, Buffer data, int data_position, long function_pointer); - public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int data_buffer_offset) { + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage1DBO(target, level, internalformat, width, border, imageSize, data_buffer_offset, function_pointer); } - private static native void nglCompressedTexImage1DBO(int target, int level, int internalformat, int width, int border, int imageSize, int data_buffer_offset, long function_pointer); + private static native void nglCompressedTexImage1DBO(int target, int level, int internalformat, int width, int border, int imageSize, long data_buffer_offset, long function_pointer); public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; @@ -202,13 +202,13 @@ nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 1, function_pointer); } private static native void nglCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data, int data_position, long function_pointer); - public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, int data_buffer_offset) { + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage2DBO(target, level, internalformat, width, height, border, imageSize, data_buffer_offset, function_pointer); } - private static native void nglCompressedTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, int data_buffer_offset, long function_pointer); + private static native void nglCompressedTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, long data_buffer_offset, long function_pointer); public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; @@ -246,13 +246,13 @@ nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 1, function_pointer); } private static native void nglCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer data, int data_position, long function_pointer); - public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int data_buffer_offset) { + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage3DBO(target, level, internalformat, width, height, depth, border, imageSize, data_buffer_offset, function_pointer); } - private static native void nglCompressedTexImage3DBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int data_buffer_offset, long function_pointer); + private static native void nglCompressedTexImage3DBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long data_buffer_offset, long function_pointer); public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; @@ -290,13 +290,13 @@ nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 1, function_pointer); } private static native void nglCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, Buffer data, int data_position, long function_pointer); - public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, int data_buffer_offset) { + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage1DBO(target, level, xoffset, width, format, imageSize, data_buffer_offset, function_pointer); } - private static native void nglCompressedTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int imageSize, int data_buffer_offset, long function_pointer); + private static native void nglCompressedTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int imageSize, long data_buffer_offset, long function_pointer); public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; @@ -334,13 +334,13 @@ nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 1, function_pointer); } private static native void nglCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data, int data_position, long function_pointer); - public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int data_buffer_offset) { + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage2DBO(target, level, xoffset, yoffset, width, height, format, imageSize, data_buffer_offset, function_pointer); } - private static native void nglCompressedTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int data_buffer_offset, long function_pointer); + private static native void nglCompressedTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long data_buffer_offset, long function_pointer); public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; @@ -378,13 +378,13 @@ nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 1, function_pointer); } private static native void nglCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, Buffer data, int data_position, long function_pointer); - public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int data_buffer_offset) { + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage3DBO(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data_buffer_offset, function_pointer); } - private static native void nglCompressedTexSubImage3DBO(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int data_buffer_offset, long function_pointer); + private static native void nglCompressedTexSubImage3DBO(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, long data_buffer_offset, long function_pointer); public static void glGetCompressedTexImage(int target, int lod, ByteBuffer img) { long function_pointer = GLContext.getCapabilities().GL13_glGetCompressedTexImage_pointer; @@ -408,13 +408,13 @@ nglGetCompressedTexImage(target, lod, img, img.position() << 1, function_pointer); } private static native void nglGetCompressedTexImage(int target, int lod, Buffer img, int img_position, long function_pointer); - public static void glGetCompressedTexImage(int target, int lod, int img_buffer_offset) { + public static void glGetCompressedTexImage(int target, int lod, long img_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glGetCompressedTexImage_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetCompressedTexImageBO(target, lod, img_buffer_offset, function_pointer); } - private static native void nglGetCompressedTexImageBO(int target, int lod, int img_buffer_offset, long function_pointer); + private static native void nglGetCompressedTexImageBO(int target, int lod, long img_buffer_offset, long function_pointer); public static void glMultiTexCoord1f(int target, float s) { long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord1f_pointer; Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL15.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GL15.java 27 Dec 2005 14:46:42 -0000 1.4 +++ GL15.java 26 Feb 2006 11:44:33 -0000 1.5 @@ -90,7 +90,7 @@ } private static native boolean nglIsBuffer(int buffer, long function_pointer); - public static void glBufferData(int target, int size, int usage) { + public static void glBufferData(int target, long size, int usage) { long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglBufferData(target, size, null, 0, usage, function_pointer); @@ -125,71 +125,71 @@ BufferChecks.checkDirect(data); nglBufferData(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer); } - private static native void nglBufferData(int target, int size, Buffer data, int data_position, int usage, long function_pointer); + private static native void nglBufferData(int target, long size, Buffer data, int data_position, int usage, long function_pointer); - public static void glBufferSubData(int target, int offset, ByteBuffer data) { + public static void glBufferSubData(int target, long offset, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer); } - public static void glBufferSubData(int target, int offset, DoubleBuffer data) { + public static void glBufferSubData(int target, long offset, DoubleBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer); } - public static void glBufferSubData(int target, int offset, FloatBuffer data) { + public static void glBufferSubData(int target, long offset, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glBufferSubData(int target, int offset, IntBuffer data) { + public static void glBufferSubData(int target, long offset, IntBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glBufferSubData(int target, int offset, ShortBuffer data) { + public static void glBufferSubData(int target, long offset, ShortBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); } - private static native void nglBufferSubData(int target, int offset, int size, Buffer data, int data_position, long function_pointer); + private static native void nglBufferSubData(int target, long offset, long size, Buffer data, int data_position, long function_pointer); - public static void glGetBufferSubData(int target, int offset, ByteBuffer data) { + public static void glGetBufferSubData(int target, long offset, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer); } - public static void glGetBufferSubData(int target, int offset, DoubleBuffer data) { + public static void glGetBufferSubData(int target, long offset, DoubleBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer); } - public static void glGetBufferSubData(int target, int offset, FloatBuffer data) { + public static void glGetBufferSubData(int target, long offset, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glGetBufferSubData(int target, int offset, IntBuffer data) { + public static void glGetBufferSubData(int target, long offset, IntBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glGetBufferSubData(int target, int offset, ShortBuffer data) { + public static void glGetBufferSubData(int target, long offset, ShortBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); } - private static native void nglGetBufferSubData(int target, int offset, int size, Buffer data, int data_position, long function_pointer); + private static native void nglGetBufferSubData(int target, long offset, long size, Buffer data, int data_position, long function_pointer); /** * glMapBuffer maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, in which case a new Index: EXTSecondaryColor.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTSecondaryColor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EXTSecondaryColor.java 2 Nov 2005 09:28:10 -0000 1.2 +++ EXTSecondaryColor.java 26 Feb 2006 11:44:33 -0000 1.3 @@ -72,11 +72,11 @@ nglSecondaryColorPointerEXT(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pPointer, pPointer.position(), function_pointer); } private static native void nglSecondaryColorPointerEXT(int size, int type, int stride, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glSecondaryColorPointerEXT(int size, int type, int stride, int pPointer_buffer_offset) { + public static void glSecondaryColorPointerEXT(int size, int type, int stride, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().EXT_secondary_color_glSecondaryColorPointerEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglSecondaryColorPointerEXTBO(size, type, stride, pPointer_buffer_offset, function_pointer); } - private static native void nglSecondaryColorPointerEXTBO(int size, int type, int stride, int pPointer_buffer_offset, long function_pointer); + private static native void nglSecondaryColorPointerEXTBO(int size, int type, int stride, long pPointer_buffer_offset, long function_pointer); } Index: ARBVertexBlend.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexBlend.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ARBVertexBlend.java 2 Nov 2005 09:28:09 -0000 1.2 +++ ARBVertexBlend.java 26 Feb 2006 11:44:33 -0000 1.3 @@ -159,13 +159,13 @@ nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pPointer, pPointer.position() << 1, function_pointer); } private static native void nglWeightPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glWeightPointerARB(int size, int type, int stride, int pPointer_buffer_offset) { + public static void glWeightPointerARB(int size, int type, int stride, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightPointerARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglWeightPointerARBBO(size, type, stride, pPointer_buffer_offset, function_pointer); } - private static native void nglWeightPointerARBBO(int size, int type, int stride, int pPointer_buffer_offset, long function_pointer); + private static native void nglWeightPointerARBBO(int size, int type, int stride, long pPointer_buffer_offset, long function_pointer); public static void glVertexBlendARB(int count) { long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glVertexBlendARB_pointer; Index: GL14.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL14.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GL14.java 2 Nov 2005 09:28:10 -0000 1.2 +++ GL14.java 26 Feb 2006 11:44:33 -0000 1.3 @@ -96,13 +96,13 @@ nglFogCoordPointer(GL11.GL_FLOAT, stride, data, data.position() << 2, function_pointer); } private static native void nglFogCoordPointer(int type, int stride, Buffer data, int data_position, long function_pointer); - public static void glFogCoordPointer(int type, int stride, int data_buffer_offset) { + public static void glFogCoordPointer(int type, int stride, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL14_glFogCoordPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglFogCoordPointerBO(type, stride, data_buffer_offset, function_pointer); } - private static native void nglFogCoordPointerBO(int type, int stride, int data_buffer_offset, long function_pointer); + private static native void nglFogCoordPointerBO(int type, int stride, long data_buffer_offset, long function_pointer); public static void glMultiDrawArrays(int mode, IntBuffer piFirst, IntBuffer piCount) { if (piFirst.remaining() != piCount.remaining()) { @@ -196,13 +196,13 @@ nglSecondaryColorPointer(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, data, data.position(), function_pointer); } private static native void nglSecondaryColorPointer(int size, int type, int stride, Buffer data, int data_position, long function_pointer); - public static void glSecondaryColorPointer(int size, int type, int stride, int data_buffer_offset) { + public static void glSecondaryColorPointer(int size, int type, int stride, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL14_glSecondaryColorPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglSecondaryColorPointerBO(size, type, stride, data_buffer_offset, function_pointer); } - private static native void nglSecondaryColorPointerBO(int size, int type, int stride, int data_buffer_offset, long function_pointer); + private static native void nglSecondaryColorPointerBO(int size, int type, int stride, long data_buffer_offset, long function_pointer); public static void glBlendFuncSeparate(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) { long function_pointer = GLContext.getCapabilities().GL14_glBlendFuncSeparate_pointer; Index: ARBMatrixPalette.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBMatrixPalette.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ARBMatrixPalette.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ARBMatrixPalette.java 26 Feb 2006 11:44:33 -0000 1.2 @@ -54,13 +54,13 @@ nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_SHORT, stride, pPointer, pPointer.position() << 1, function_pointer); } private static native void nglMatrixIndexPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glMatrixIndexPointerARB(int size, int type, int stride, int pPointer_buffer_offset) { + public static void glMatrixIndexPointerARB(int size, int type, int stride, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexPointerARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglMatrixIndexPointerARBBO(size, type, stride, pPointer_buffer_offset, function_pointer); } - private static native void nglMatrixIndexPointerARBBO(int size, int type, int stride, int pPointer_buffer_offset, long function_pointer); + private static native void nglMatrixIndexPointerARBBO(int size, int type, int stride, long pPointer_buffer_offset, long function_pointer); public static void glMatrixIndexuARB(ByteBuffer pIndices) { long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexubvARB_pointer; Index: GL20.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL20.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GL20.java 24 Dec 2005 19:28:13 -0000 1.3 +++ GL20.java 26 Feb 2006 11:44:33 -0000 1.4 @@ -645,13 +645,13 @@ nglVertexAttribPointer(index, size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, normalized, stride, buffer, buffer.position() << 1, function_pointer); } private static native void nglVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, Buffer buffer, int buffer_position, long function_pointer); - public static void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset) { + public static void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexAttribPointerBO(index, size, type, normalized, stride, buffer_buffer_offset, function_pointer); } - private static native void nglVertexAttribPointerBO(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset, long function_pointer); + private static native void nglVertexAttribPointerBO(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset, long function_pointer); public static void glEnableVertexAttribArray(int index) { long function_pointer = GLContext.getCapabilities().GL20_glEnableVertexAttribArray_pointer; Index: GL11.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/GL11.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GL11.java 2 Nov 2005 09:28:10 -0000 1.4 +++ GL11.java 26 Feb 2006 11:44:33 -0000 1.5 @@ -621,13 +621,13 @@ nglBitmap(width, height, xorig, yorig, xmove, ymove, bitmap, bitmap.position(), function_pointer); } private static native void nglBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, ByteBuffer bitmap, int bitmap_position, long function_pointer); - public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, int bitmap_buffer_offset) { + public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, long bitmap_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glBitmap_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglBitmapBO(width, height, xorig, yorig, xmove, ymove, bitmap_buffer_offset, function_pointer); } - private static native void nglBitmapBO(int width, int height, float xorig, float yorig, float xmove, float ymove, int bitmap_buffer_offset, long function_pointer); + private static native void nglBitmapBO(int width, int height, float xorig, float yorig, float xmove, float ymove, long bitmap_buffer_offset, long function_pointer); public static void glBindTexture(int target, int texture) { long function_pointer = GLContext.getCapabilities().GL11_glBindTexture_pointer; @@ -746,13 +746,13 @@ nglColorPointer(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pointer, pointer.position(), function_pointer); } private static native void nglColorPointer(int size, int type, int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glColorPointer(int size, int type, int stride, int pointer_buffer_offset) { + public static void glColorPointer(int size, int type, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glColorPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglColorPointerBO(size, type, stride, pointer_buffer_offset, function_pointer); } - private static native void nglColorPointerBO(int size, int type, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglColorPointerBO(int size, int type, int stride, long pointer_buffer_offset, long function_pointer); public static void glColorMaterial(int face, int mode) { long function_pointer = GLContext.getCapabilities().GL11_glColorMaterial_pointer; @@ -932,13 +932,13 @@ nglEdgeFlagPointer(stride, pointer, pointer.position(), function_pointer); } private static native void nglEdgeFlagPointer(int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glEdgeFlagPointer(int stride, int pointer_buffer_offset) { + public static void glEdgeFlagPointer(int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glEdgeFlagPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglEdgeFlagPointerBO(stride, pointer_buffer_offset, function_pointer); } - private static native void nglEdgeFlagPointerBO(int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglEdgeFlagPointerBO(int stride, long pointer_buffer_offset, long function_pointer); public static void glEdgeFlag(boolean flag) { long function_pointer = GLContext.getCapabilities().GL11_glEdgeFlag_pointer; @@ -969,13 +969,13 @@ nglDrawPixels(width, height, format, type, pixels, pixels.position() << 1, function_pointer); } private static native void nglDrawPixels(int width, int height, int format, int type, Buffer pixels, int pixels_position, long function_pointer); - public static void glDrawPixels(int width, int height, int format, int type, int pixels_buffer_offset) { + public static void glDrawPixels(int width, int height, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glDrawPixels_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglDrawPixelsBO(width, height, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglDrawPixelsBO(int width, int height, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglDrawPixelsBO(int width, int height, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glDrawElements(int mode, ByteBuffer indices) { long function_pointer = GLContext.getCapabilities().GL11_glDrawElements_pointer; @@ -999,13 +999,13 @@ nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_SHORT, indices, indices.position() << 1, function_pointer); } private static native void nglDrawElements(int mode, int count, int type, Buffer indices, int indices_position, long function_pointer); - public static void glDrawElements(int mode, int count, int type, int indices_buffer_offset) { + public static void glDrawElements(int mode, int count, int type, long indices_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glDrawElements_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureElementVBOenabled(); nglDrawElementsBO(mode, count, type, indices_buffer_offset, function_pointer); } - private static native void nglDrawElementsBO(int mode, int count, int type, int indices_buffer_offset, long function_pointer); + private static native void nglDrawElementsBO(int mode, int count, int type, long indices_buffer_offset, long function_pointer); public static void glDrawBuffer(int mode) { long function_pointer = GLContext.getCapabilities().GL11_glDrawBuffer_pointer; @@ -1058,13 +1058,13 @@ nglGetPixelMapfv(map, values, values.position(), function_pointer); } private static native void nglGetPixelMapfv(int map, FloatBuffer values, int values_position, long function_pointer); - public static void glGetPixelMapfv(int map, int values_buffer_offset) { + public static void glGetPixelMapfv(int map, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapfv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetPixelMapfvBO(map, values_buffer_offset, function_pointer); } - private static native void nglGetPixelMapfvBO(int map, int values_buffer_offset, long function_pointer); + private static native void nglGetPixelMapfvBO(int map, long values_buffer_offset, long function_pointer); public static void glGetPixelMapu(int map, IntBuffer values) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapuiv_pointer; @@ -1074,13 +1074,13 @@ nglGetPixelMapuiv(map, values, values.position(), function_pointer); } private static native void nglGetPixelMapuiv(int map, IntBuffer values, int values_position, long function_pointer); - public static void glGetPixelMapuiv(int map, int values_buffer_offset) { + public static void glGetPixelMapuiv(int map, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapuiv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetPixelMapuivBO(map, values_buffer_offset, function_pointer); } - private static native void nglGetPixelMapuivBO(int map, int values_buffer_offset, long function_pointer); + private static native void nglGetPixelMapuivBO(int map, long values_buffer_offset, long function_pointer); public static void glGetPixelMapu(int map, ShortBuffer values) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapusv_pointer; @@ -1090,13 +1090,13 @@ nglGetPixelMapusv(map, values, values.position(), function_pointer); } private static native void nglGetPixelMapusv(int map, ShortBuffer values, int values_position, long function_pointer); - public static void glGetPixelMapusv(int map, int values_buffer_offset) { + public static void glGetPixelMapusv(int map, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapusv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetPixelMapusvBO(map, values_buffer_offset, function_pointer); } - private static native void nglGetPixelMapusvBO(int map, int values_buffer_offset, long function_pointer); + private static native void nglGetPixelMapusvBO(int map, long values_buffer_offset, long function_pointer); public static void glGetMaterial(int face, int pname, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().GL11_glGetMaterialfv_pointer; @@ -1328,13 +1328,13 @@ nglInterleavedArrays(format, stride, pointer, pointer.position() << 1, function_pointer); } private static native void nglInterleavedArrays(int format, int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glInterleavedArrays(int format, int stride, int pointer_buffer_offset) { + public static void glInterleavedArrays(int format, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglInterleavedArraysBO(format, stride, pointer_buffer_offset, function_pointer); } - private static native void nglInterleavedArraysBO(int format, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglInterleavedArraysBO(int format, int stride, long pointer_buffer_offset, long function_pointer); public static void glInitNames() { long function_pointer = GLContext.getCapabilities().GL11_glInitNames_pointer; @@ -1418,13 +1418,13 @@ nglGetTexImage(target, level, format, type, pixels, pixels.position() << 1, function_pointer); } private static native void nglGetTexImage(int target, int level, int format, int type, Buffer pixels, int pixels_position, long function_pointer); - public static void glGetTexImage(int target, int level, int format, int type, int pixels_buffer_offset) { + public static void glGetTexImage(int target, int level, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetTexImageBO(target, level, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglGetTexImageBO(int target, int level, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglGetTexImageBO(int target, int level, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glGetTexGen(int coord, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().GL11_glGetTexGeniv_pointer; @@ -1482,13 +1482,13 @@ nglGetPolygonStipple(mask, mask.position(), function_pointer); } private static native void nglGetPolygonStipple(ByteBuffer mask, int mask_position, long function_pointer); - public static void glGetPolygonStipple(int mask_buffer_offset) { + public static void glGetPolygonStipple(long mask_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetPolygonStipple_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetPolygonStippleBO(mask_buffer_offset, function_pointer); } - private static native void nglGetPolygonStippleBO(int mask_buffer_offset, long function_pointer); + private static native void nglGetPolygonStippleBO(long mask_buffer_offset, long function_pointer); public static boolean glIsList(int list) { long function_pointer = GLContext.getCapabilities().GL11_glIsList_pointer; @@ -1729,13 +1729,13 @@ nglPolygonStipple(mask, mask.position(), function_pointer); } private static native void nglPolygonStipple(ByteBuffer mask, int mask_position, long function_pointer); - public static void glPolygonStipple(int mask_buffer_offset) { + public static void glPolygonStipple(long mask_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glPolygonStipple_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglPolygonStippleBO(mask_buffer_offset, function_pointer); } - private static native void nglPolygonStippleBO(int mask_buffer_offset, long function_pointer); + private static native void nglPolygonStippleBO(long mask_buffer_offset, long function_pointer); public static void glPolygonOffset(float factor, float units) { long function_pointer = GLContext.getCapabilities().GL11_glPolygonOffset_pointer; @@ -1801,13 +1801,13 @@ nglPixelMapfv(map, (values.remaining()), values, values.position(), function_pointer); } private static native void nglPixelMapfv(int map, int mapsize, FloatBuffer values, int values_position, long function_pointer); - public static void glPixelMapfv(int map, int mapsize, int values_buffer_offset) { + public static void glPixelMapfv(int map, int mapsize, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapfv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglPixelMapfvBO(map, mapsize, values_buffer_offset, function_pointer); } - private static native void nglPixelMapfvBO(int map, int mapsize, int values_buffer_offset, long function_pointer); + private static native void nglPixelMapfvBO(int map, int mapsize, long values_buffer_offset, long function_pointer); public static void glPixelMapu(int map, IntBuffer values) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapuiv_pointer; @@ -1817,13 +1817,13 @@ nglPixelMapuiv(map, (values.remaining()), values, values.position(), function_pointer); } private static native void nglPixelMapuiv(int map, int mapsize, IntBuffer values, int values_position, long function_pointer); - public static void glPixelMapuiv(int map, int mapsize, int values_buffer_offset) { + public static void glPixelMapuiv(int map, int mapsize, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapuiv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglPixelMapuivBO(map, mapsize, values_buffer_offset, function_pointer); } - private static native void nglPixelMapuivBO(int map, int mapsize, int values_buffer_offset, long function_pointer); + private static native void nglPixelMapuivBO(int map, int mapsize, long values_buffer_offset, long function_pointer); public static void glPixelMapu(int map, ShortBuffer values) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapusv_pointer; @@ -1833,13 +1833,13 @@ nglPixelMapusv(map, (values.remaining()), values, values.position(), function_pointer); } private static native void nglPixelMapusv(int map, int mapsize, ShortBuffer values, int values_position, long function_pointer); - public static void glPixelMapusv(int map, int mapsize, int values_buffer_offset) { + public static void glPixelMapusv(int map, int mapsize, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapusv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglPixelMapusvBO(map, mapsize, values_buffer_offset, function_pointer); } - private static native void nglPixelMapusvBO(int map, int mapsize, int values_buffer_offset, long function_pointer); + private static native void nglPixelMapusvBO(int map, int mapsize, long values_buffer_offset, long function_pointer); public static void glPassThrough(float token) { long function_pointer = GLContext.getCapabilities().GL11_glPassThrough_pointer; @@ -1888,13 +1888,13 @@ nglNormalPointer(GL11.GL_INT, stride, pointer, pointer.position() << 2, function_pointer); } private static native void nglNormalPointer(int type, int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glNormalPointer(int type, int stride, int pointer_buffer_offset) { + public static void glNormalPointer(int type, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glNormalPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglNormalPointerBO(type, stride, pointer_buffer_offset, function_pointer); } - private static native void nglNormalPointerBO(int type, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglNormalPointerBO(int type, int stride, long pointer_buffer_offset, long function_pointer); public static void glNormal3b(byte nx, byte ny, byte nz) { long function_pointer = GLContext.getCapabilities().GL11_glNormal3b_pointer; @@ -2063,13 +2063,13 @@ nglReadPixels(x, y, width, height, format, type, pixels, pixels.position() << 1, function_pointer); } private static native void nglReadPixels(int x, int y, int width, int height, int format, int type, Buffer pixels, int pixels_position, long function_pointer); - public static void glReadPixels(int x, int y, int width, int height, int format, int type, int pixels_buffer_offset) { + public static void glReadPixels(int x, int y, int width, int height, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglReadPixelsBO(x, y, width, height, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglReadPixelsBO(int x, int y, int width, int height, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglReadPixelsBO(int x, int y, int width, int height, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glReadBuffer(int mode) { long function_pointer = GLContext.getCapabilities().GL11_glReadBuffer_pointer; @@ -2231,13 +2231,13 @@ nglVertexPointer(size, GL11.GL_INT, stride, pointer, pointer.position() << 2, function_pointer); } private static native void nglVertexPointer(int size, int type, int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glVertexPointer(int size, int type, int stride, int pointer_buffer_offset) { + public static void glVertexPointer(int size, int type, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glVertexPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexPointerBO(size, type, stride, pointer_buffer_offset, function_pointer); } - private static native void nglVertexPointerBO(int size, int type, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglVertexPointerBO(int size, int type, int stride, long pointer_buffer_offset, long function_pointer); public static void glVertex2f(float x, float y) { long function_pointer = GLContext.getCapabilities().GL11_glVertex2f_pointer; @@ -2357,13 +2357,13 @@ nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer); } private static native void nglTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, Buffer pixels, int pixels_position, long function_pointer); - public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, int pixels_buffer_offset) { + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexImage1DBO(target, level, internalformat, width, border, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglTexImage1DBO(int target, int level, int internalformat, int width, int border, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglTexImage1DBO(int target, int level, int internalformat, int width, int border, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ByteBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer; @@ -2406,13 +2406,13 @@ nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer); } private static native void nglTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, Buffer pixels, int pixels_position, long function_pointer); - public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, int pixels_buffer_offset) { + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexImage2DBO(target, level, internalformat, width, height, border, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ByteBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer; @@ -2450,13 +2450,13 @@ nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 1, function_pointer); } private static native void nglTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, Buffer pixels, int pixels_position, long function_pointer); - public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, int pixels_buffer_offset) { + public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexSubImage1DBO(target, level, xoffset, width, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer; @@ -2494,13 +2494,13 @@ nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 1, function_pointer); } private static native void nglTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels, int pixels_position, long function_pointer); - public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int pixels_buffer_offset) { + public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexSubImage2DBO(target, level, xoffset, yoffset, width, height, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glTexParameterf(int target, int pname, float param) { long function_pointer = GLContext.getCapabilities().GL11_glTexParameterf_pointer; @@ -2624,13 +2624,13 @@ nglTexCoordPointer(size, GL11.GL_FLOAT, stride, pointer, pointer.position() << 2, function_pointer); } private static native void nglTexCoordPointer(int size, int type, int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glTexCoordPointer(int size, int type, int stride, int pointer_buffer_offset) { + public static void glTexCoordPointer(int size, int type, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexCoordPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglTexCoordPointerBO(size, type, stride, pointer_buffer_offset, function_pointer); } - private static native void nglTexCoordPointerBO(int size, int type, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglTexCoordPointerBO(int size, int type, int stride, long pointer_buffer_offset, long function_pointer); public static void glTexCoord1f(float s) { long function_pointer = GLContext.getCapabilities().GL11_glTexCoord1f_pointer; Index: ARBVertexProgram.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ARBVertexProgram.java 24 Dec 2005 19:28:13 -0000 1.3 +++ ARBVertexProgram.java 26 Feb 2006 11:44:33 -0000 1.4 @@ -186,13 +186,13 @@ nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, normalized, stride, buffer, buffer.position() << 1, function_pointer); } private static native void nglVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, Buffer buffer, int buffer_position, long function_pointer); - public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset) { + public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glVertexAttribPointerARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexAttribPointerARBBO(index, size, type, normalized, stride, buffer_buffer_offset, function_pointer); } - private static native void nglVertexAttribPointerARBBO(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset, long function_pointer); + private static native void nglVertexAttribPointerARBBO(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset, long function_pointer); public static void glEnableVertexAttribArrayARB(int index) { long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glEnableVertexAttribArrayARB_pointer; Index: ATIElementArray.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ATIElementArray.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ATIElementArray.java 29 Sep 2005 17:13:36 -0000 1.1 +++ ATIElementArray.java 26 Feb 2006 11:44:33 -0000 1.2 @@ -40,13 +40,13 @@ nglElementPointerATI(GL11.GL_UNSIGNED_SHORT, pPointer, pPointer.position() << 1, function_pointer); } private static native void nglElementPointerATI(int type, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glElementPointerATI(int type, int pPointer_buffer_offset) { + public static void glElementPointerATI(int type, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ATI_element_array_glElementPointerATI_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglElementPointerATIBO(type, pPointer_buffer_offset, function_pointer); } - private static native void nglElementPointerATIBO(int type, int pPointer_buffer_offset, long function_pointer); + private static native void nglElementPointerATIBO(int type, long pPointer_buffer_offset, long function_pointer); public static void glDrawElementArrayATI(int mode, int count) { long function_pointer = GLContext.getCapabilities().ATI_element_array_glDrawElementArrayATI_pointer; Index: EXTVertexWeighting.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexWeighting.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EXTVertexWeighting.java 29 Sep 2005 17:13:36 -0000 1.1 +++ EXTVertexWeighting.java 26 Feb 2006 11:44:33 -0000 1.2 @@ -41,11 +41,11 @@ nglVertexWeightPointerEXT(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position() << 2, function_pointer); } private static native void nglVertexWeightPointerEXT(int size, int type, int stride, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glVertexWeightPointerEXT(int size, int type, int stride, int pPointer_buffer_offset) { + public static void glVertexWeightPointerEXT(int size, int ty... [truncated message content] |
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13117/src/java/org/lwjgl/util/generator Modified Files: GLTypeMap.java JNITypeTranslator.java JavaMethodsGenerator.java JavaTypeTranslator.java NativeMethodStubsGenerator.java TypeInfo.java Log Message: Widened VBO/PBO buffer offsets and sizes to long to better match the GLsizeiptr and GLintptr native types Index: JNITypeTranslator.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/JNITypeTranslator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- JNITypeTranslator.java 20 Feb 2005 19:28:31 -0000 1.1 +++ JNITypeTranslator.java 26 Feb 2006 11:44:33 -0000 1.2 @@ -78,6 +78,9 @@ public void visitPrimitiveType(PrimitiveType t) { String type; switch (t.getKind()) { + case LONG: + type = "jlong"; + break; case INT: type = "jint"; break; Index: GLTypeMap.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/GLTypeMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GLTypeMap.java 2 Nov 2005 09:28:11 -0000 1.2 +++ GLTypeMap.java 26 Feb 2006 11:44:33 -0000 1.3 @@ -59,21 +59,21 @@ native_types_to_primitive.put(GLfloat.class, PrimitiveType.Kind.FLOAT); native_types_to_primitive.put(GLint.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(GLshort.class, PrimitiveType.Kind.SHORT); - native_types_to_primitive.put(GLsizeiptr.class, PrimitiveType.Kind.INT); + native_types_to_primitive.put(GLsizeiptr.class, PrimitiveType.Kind.LONG); native_types_to_primitive.put(GLuint.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(GLboolean.class, PrimitiveType.Kind.BOOLEAN); native_types_to_primitive.put(GLchar.class, PrimitiveType.Kind.BYTE); native_types_to_primitive.put(GLdouble.class, PrimitiveType.Kind.DOUBLE); native_types_to_primitive.put(GLhalf.class, PrimitiveType.Kind.SHORT); - native_types_to_primitive.put(GLintptrARB.class, PrimitiveType.Kind.INT); + native_types_to_primitive.put(GLintptrARB.class, PrimitiveType.Kind.LONG); native_types_to_primitive.put(GLsizei.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(GLushort.class, PrimitiveType.Kind.SHORT); native_types_to_primitive.put(GLbyte.class, PrimitiveType.Kind.BYTE); native_types_to_primitive.put(GLclampd.class, PrimitiveType.Kind.DOUBLE); native_types_to_primitive.put(GLenum.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(GLhandleARB.class, PrimitiveType.Kind.INT); - native_types_to_primitive.put(GLintptr.class, PrimitiveType.Kind.INT); - native_types_to_primitive.put(GLsizeiptrARB.class, PrimitiveType.Kind.INT); + native_types_to_primitive.put(GLintptr.class, PrimitiveType.Kind.LONG); + native_types_to_primitive.put(GLsizeiptrARB.class, PrimitiveType.Kind.LONG); native_types_to_primitive.put(GLubyte.class, PrimitiveType.Kind.BYTE); native_types_to_primitive.put(GLvoid.class, PrimitiveType.Kind.BYTE); } @@ -172,8 +172,8 @@ private static Class[] getValidBufferTypes(Class type) { if (type.equals(IntBuffer.class)) - return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLintptrARB.class, GLintptrARB.class, - GLsizei.class, GLsizeiptrARB.class, GLsizeiptr.class, GLuint.class}; + return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, + GLsizei.class, GLuint.class}; else if (type.equals(FloatBuffer.class)) return new Class[]{GLclampf.class, GLfloat.class}; else if (type.equals(ByteBuffer.class)) @@ -187,9 +187,11 @@ } private static Class[] getValidPrimitiveTypes(Class type) { - if (type.equals(int.class)) - return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLintptrARB.class, GLuint.class, - GLintptr.class, GLintptr.class, GLsizei.class, GLsizeiptrARB.class, GLsizeiptr.class}; + if (type.equals(long .class)) + return new Class[]{GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class}; + else if (type.equals(int.class)) + return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLuint.class, + GLsizei.class}; else if (type.equals(double.class)) return new Class[]{GLclampd.class, GLdouble.class}; else if (type.equals(float.class)) Index: JavaMethodsGenerator.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- JavaMethodsGenerator.java 21 Mar 2005 08:27:43 -0000 1.2 +++ JavaMethodsGenerator.java 26 Feb 2006 11:44:33 -0000 1.3 @@ -141,7 +141,7 @@ if (bo_annotation != null && mode == Mode.BUFFEROBJECT) { if (buffer_type == null) throw new RuntimeException("type of " + param + " is not a nio Buffer parameter but is annotated as buffer object"); - writer.print("int " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX); + writer.print("long " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX); } else { writer.print(type_info.getType().getSimpleName()); writer.print(" " + param.getSimpleName()); Index: JavaTypeTranslator.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- JavaTypeTranslator.java 20 Feb 2005 19:28:31 -0000 1.1 +++ JavaTypeTranslator.java 26 Feb 2006 11:44:33 -0000 1.2 @@ -61,6 +61,9 @@ public void visitPrimitiveType(PrimitiveType t) { switch (t.getKind()) { + case LONG: + type = long.class; + break; case INT: type = int.class; break; Index: TypeInfo.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/TypeInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TypeInfo.java 20 Feb 2005 19:28:32 -0000 1.1 +++ TypeInfo.java 26 Feb 2006 11:44:33 -0000 1.2 @@ -77,6 +77,9 @@ private static Class getTypeFromPrimitiveKind(PrimitiveType.Kind kind) { Class type; switch (kind) { + case LONG: + type = long.class; + break; case INT: type = int.class; break; Index: NativeMethodStubsGenerator.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NativeMethodStubsGenerator.java 20 Feb 2005 19:28:32 -0000 1.1 +++ NativeMethodStubsGenerator.java 26 Feb 2006 11:44:33 -0000 1.2 @@ -70,7 +70,7 @@ private static void generateParameter(PrintWriter writer, ParameterDeclaration param, Mode mode) { writer.print(", "); if (mode == Mode.BUFFEROBJECT && param.getAnnotation(BufferObject.class) != null) { - writer.print("jint " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX); + writer.print("jlong " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX); } else { JNITypeTranslator translator = new JNITypeTranslator(); param.getType().accept(translator); |
|
From: Elias N. <eli...@us...> - 2006-02-26 11:44:39
|
Update of /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13117/src/templates/org/lwjgl/opengl Modified Files: ARB_buffer_object.java GL15.java Log Message: Widened VBO/PBO buffer offsets and sizes to long to better match the GLsizeiptr and GLintptr native types Index: ARB_buffer_object.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ARB_buffer_object.java 27 Dec 2005 14:46:42 -0000 1.8 +++ ARB_buffer_object.java 26 Feb 2006 11:44:34 -0000 1.9 @@ -76,7 +76,7 @@ boolean glIsBufferARB(@GLuint int buffer); @GenerateAutos - void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB int size, + void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB long size, @Const @GLbyte @GLshort @@ -84,7 +84,7 @@ @GLfloat @GLdouble Buffer data, @GLenum int usage); - void glBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, + void glBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size, @Check @Const @GLbyte @@ -93,7 +93,7 @@ @GLfloat @GLdouble Buffer data); - void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, + void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size, @Check @GLbyte @GLshort Index: GL15.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/templates/org/lwjgl/opengl/GL15.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- GL15.java 27 Dec 2005 14:46:42 -0000 1.7 +++ GL15.java 26 Feb 2006 11:44:34 -0000 1.8 @@ -81,7 +81,7 @@ boolean glIsBuffer(@GLuint int buffer); @GenerateAutos - void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr int size, + void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size, @Const @GLbyte @GLshort @@ -89,7 +89,7 @@ @GLfloat @GLdouble Buffer data, @GLenum int usage); - void glBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, + void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @Check @Const @GLbyte @@ -98,7 +98,7 @@ @GLfloat @GLdouble Buffer data); - void glGetBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, + void glGetBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @Check @GLbyte @GLshort |
|
From: Elias N. <eli...@us...> - 2006-02-26 11:44:39
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13117/src/native/common Modified Files: common_tools.h extgl.h Log Message: Widened VBO/PBO buffer offsets and sizes to long to better match the GLsizeiptr and GLintptr native types Index: extgl.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- extgl.h 23 Feb 2005 15:17:17 -0000 1.54 +++ extgl.h 26 Feb 2006 11:44:33 -0000 1.55 @@ -86,6 +86,7 @@ #define __GL_H__ #include <string.h> +#include <stddef.h> #ifndef APIENTRY #define APIENTRY @@ -140,15 +141,15 @@ #endif // OpenGL 2.0 types -typedef int GLintptr; -typedef unsigned int GLsizeiptr; +typedef ptrdiff_t GLintptr; +typedef ptrdiff_t GLsizeiptr; typedef unsigned char GLchar; // ARB_shader_objects types typedef unsigned int GLhandleARB; // ARB_vertex_buffer_object types -typedef int GLintptrARB; -typedef unsigned int GLsizeiptrARB; +typedef ptrdiff_t GLintptrARB; +typedef ptrdiff_t GLsizeiptrARB; typedef unsigned char GLcharARB; // NV_half_float types Index: common_tools.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- common_tools.h 31 Jan 2006 12:31:41 -0000 1.40 +++ common_tools.h 26 Feb 2006 11:44:33 -0000 1.41 @@ -105,7 +105,7 @@ } -static inline void *offsetToPointer(jint offset) { +static inline void *offsetToPointer(jlong offset) { return (char *)NULL + offset; } |
|
From: Elias N. <eli...@us...> - 2006-02-23 19:30:02
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9998 Modified Files: org_lwjgl_opengl_LinuxContextImplementation.c Log Message: Linux: Removed the glXIsDirect test to determine whether a context is accelerated or not. This is specifically not the case for Xgl and friends that accelerates indireect rendering. Unfortunately, I'm not sure what to replace the test with, so there is currently no way to know from LWJGL whether we're software rendered or not (other than measuring FPS). In fact, I'm not even sure that we can come up with a good test, because some (DRI) drivers use software MESA rendering for some parts of GL, while other parts are hardware accelerated Index: org_lwjgl_opengl_LinuxContextImplementation.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- org_lwjgl_opengl_LinuxContextImplementation.c 1 Jan 2006 19:50:06 -0000 1.6 +++ org_lwjgl_opengl_LinuxContextImplementation.c 23 Feb 2006 19:29:49 -0000 1.7 @@ -57,12 +57,19 @@ throwException(env, "Could not create GLX context"); return false; } - jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL"); + /* + * Ditched the requirement that contexts have to be direct. It was + * never true that all accelerated contexts are direct, but it + * was a reasonable test until the appearance of Xgl and friends. + * Now the test is at best useless, and at worst wrong, + * in case the current X server accelerates indirect rendering. + */ +/* jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL"); if (!allow_software_acceleration && lwjgl_glXIsDirect(display, context) == False) { lwjgl_glXDestroyContext(display, context); throwException(env, "Could not create a direct GLX context"); return false; - } + }*/ return true; } |
|
From: Elias N. <eli...@us...> - 2006-02-23 19:22:11
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4320/common Modified Files: org_lwjgl_openal_ALC.c Log Message: Fixed a potentially uninitialized return value in ALC.c Index: org_lwjgl_openal_ALC.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- org_lwjgl_openal_ALC.c 2 Feb 2006 22:33:17 -0000 1.10 +++ org_lwjgl_openal_ALC.c 23 Feb 2006 19:22:00 -0000 1.11 @@ -345,7 +345,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_openal_ALC_ngetImplementations(JNIEnv *env, jclass clazz) { jclass strcls; - jarray strarr; + jarray strarr = NULL; jstring str; char *deviceList; |
|
From: Elias N. <eli...@us...> - 2006-02-22 10:47:18
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13019/src/native/win32 Modified Files: org_lwjgl_opengl_Display.c Log Message: Win32: Made the message processing more friendly to potential foreign windows created on the same thread (and thus sharing message queue with LWJGL). Now handleMessages() in Display.c only processes messages for the current lwjgl window. Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- org_lwjgl_opengl_Display.c 22 Feb 2006 10:30:35 -0000 1.33 +++ org_lwjgl_opengl_Display.c 22 Feb 2006 10:47:14 -0000 1.34 @@ -238,25 +238,25 @@ /* * Handle native Win32 messages */ -static void handleMessages(void) -{ +static void handleMessages(void) { /* * Now's our chance to deal with Windows messages that are * otherwise just piling up and causing everything not to * work properly */ MSG msg; - while (PeekMessage( - &msg, // message information - NULL, // handle to window - 0, // first message - 0, // last message - PM_REMOVE // removal options - )) - { - if (display_hwnd != NULL && msg.hwnd == display_hwnd) - DispatchMessage(&msg); - }; + if (display_hwnd != NULL) { + while (PeekMessage( + &msg, // message information + display_hwnd, // handle to window + 0, // first message + 0, // last message + PM_REMOVE // removal options + )) + { + DispatchMessage(&msg); + } + } } /* |
|
From: Elias N. <eli...@us...> - 2006-02-22 10:30:44
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5279/src/native/win32 Modified Files: org_lwjgl_opengl_Display.c Log Message: Win32: Made the window message proc static Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- org_lwjgl_opengl_Display.c 22 Feb 2006 09:51:25 -0000 1.32 +++ org_lwjgl_opengl_Display.c 22 Feb 2006 10:30:35 -0000 1.33 @@ -120,10 +120,11 @@ did_maximize = false; return result; } + /* * WindowProc for the GL window. */ -LRESULT CALLBACK lwjglWindowProc(HWND hWnd, +static LRESULT CALLBACK lwjglWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) |
|
From: Elias N. <eli...@us...> - 2006-02-22 10:30:40
|
Update of /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5279/platform_build/win32_ms_cmdline Modified Files: build.bat Log Message: Win32: Made the window message proc static Index: build.bat =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline/build.bat,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- build.bat 29 Sep 2005 17:13:36 -0000 1.20 +++ build.bat 22 Feb 2006 10:30:34 -0000 1.21 @@ -5,7 +5,7 @@ if "%CHOME%" == "" goto errorchome if "%ALHOME%" == "" goto erroralhome if "%DXHOME%" == "" goto errordxhome -set COPTIONS=/Wp64 /I"%DXHOME%\include" /I"%CHOME%\include" /I"%PLTSDKHOME%\include" /I"%JAVA_HOME%\include" /I"%JAVA_HOME%\include\win32" /I"%ALHOME%\include" /I"..\..\src\native\common" /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LWJGL_EXPORTS" /D "_WINDLL" +set COPTIONS=/Wp64 /I"%CHOME%\include" /I"%PLTSDKHOME%\include" /I"%DXHOME%\include" /I"%JAVA_HOME%\include" /I"%JAVA_HOME%\include\win32" /I"%ALHOME%\include" /I"..\..\src\native\common" /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LWJGL_EXPORTS" /D "_WINDLL" rem ************************************************* rem ** Build using free compiler requires jawt.dll ** rem ** and awt.dll in current dir. /delayload ** |
|
From: Elias N. <eli...@us...> - 2006-02-22 09:51:33
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18347/src/native/win32 Modified Files: org_lwjgl_opengl_Display.c Log Message: Made handleMessages() in Display.c static Index: org_lwjgl_opengl_Display.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- org_lwjgl_opengl_Display.c 27 Dec 2005 13:47:25 -0000 1.31 +++ org_lwjgl_opengl_Display.c 22 Feb 2006 09:51:25 -0000 1.32 @@ -237,7 +237,7 @@ /* * Handle native Win32 messages */ -void handleMessages(void) +static void handleMessages(void) { /* * Now's our chance to deal with Windows messages that are |
|
From: Brian M. <ma...@us...> - 2006-02-21 22:36:42
|
Update of /cvsroot/java-game-lib/LWJGL/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5963/doc Modified Files: README Log Message: create single distribution Index: README =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/doc/README,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- README 18 Aug 2005 13:48:43 -0000 1.14 +++ README 21 Feb 2006 22:11:49 -0000 1.15 @@ -12,7 +12,7 @@ Extract the archive, and cd into directory (please substitute ; and \ according to platform) - java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\lwjgl_fmod3.jar;jar\lwjgl_devil.jar;jar\jinput.jar; -Djava.library.path=native TEST + java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\lwjgl_fmod3.jar;jar\lwjgl_devil.jar;jar\jinput.jar; -Djava.library.path=native\<win32|linux|macosx> TEST (this specifies that the jvm should locate the lwjgl native libs in 'native' directory) where TEST is one of the following: @@ -59,7 +59,7 @@ org.lwjgl.test.devil.BasicTest You may also run the Space invaders demo by executing: - java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar; -Djava.library.path=native org.lwjgl.examples.spaceinvaders.Game + java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar; -Djava.library.path=native\<win32|linux|macosx> org.lwjgl.examples.spaceinvaders.Game Project Webpage: www.lwjgl.org Project Forum: forum.lwjgl.org |
|
From: Brian M. <ma...@us...> - 2006-02-21 22:35:12
|
Update of /cvsroot/java-game-lib/LWJGL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5963 Modified Files: build.xml Log Message: create single distribution Index: build.xml =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- build.xml 20 Dec 2005 22:35:49 -0000 1.97 +++ build.xml 21 Feb 2006 22:11:49 -0000 1.98 @@ -167,10 +167,13 @@ <mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder" /> <mkdir dir="${lwjgl.res}" taskname="initialiazing res folder" /> <mkdir dir="${lwjgl.temp}" taskname="initialiazing temp folder" /> - <mkdir dir="${lwjgl.temp}/jar" taskname="initialiazing temp folder" /> - <mkdir dir="${lwjgl.temp}/doc" taskname="initialiazing temp folder" /> - <mkdir dir="${lwjgl.temp}/res" taskname="initialiazing temp folder" /> - <mkdir dir="${lwjgl.temp}/native" taskname="initialiazing temp folder" /> + <mkdir dir="${lwjgl.temp}/jar" taskname="initialiazing temp/jar folder" /> + <mkdir dir="${lwjgl.temp}/doc" taskname="initialiazing temp/doc folder" /> + <mkdir dir="${lwjgl.temp}/res" taskname="initialiazing temp/res folder" /> + <mkdir dir="${lwjgl.temp}/native" taskname="initialiazing temp/native folder" /> + <mkdir dir="${lwjgl.temp}/native/win32" taskname="initialiazing temp/win32 folder" /> + <mkdir dir="${lwjgl.temp}/native/linux" taskname="initialiazing temp/linux folder" /> + <mkdir dir="${lwjgl.temp}/native/macosx" taskname="initialiazing temp/macosx folder" /> </target> <target name="clean-generated" description="Deletes the generated java and native source"> @@ -227,9 +230,7 @@ <!-- create distribution from files in libs/ and temp/ --> <antcall target="-distribution_javadoc" /> <antcall target="-distribution_source" /> - <antcall target="-distribute_win32" /> - <antcall target="-distribute_linux" /> - <antcall target="-distribute_macosx" /> + <antcall target="-distribute" /> </target> <!-- Create ONLY the jar archives --> @@ -270,51 +271,30 @@ </jar> </target> - <!-- Distributes win32 files --> - <target name="-distribute_win32"> + <!-- Distributes files --> + <target name="-distribute"> <delete> <fileset dir="${lwjgl.temp}/native/" includes="**/*"/> </delete> <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/> - <copy todir="${lwjgl.temp}/native"> + <copy todir="${lwjgl.temp}/native/win32"> <fileset dir="${lwjgl.lib}/win32"> <patternset refid="lwjgl-win32.fileset" /> </fileset> </copy> - <zip destfile="${lwjgl.dist}/lwjgl-win32-${lwjgl.version}.zip"> - <zipfileset dir="${lwjgl.temp}" prefix="lwjgl-win32-${lwjgl.version}/"/> - </zip> - </target> - - <!-- Distributes linux files --> - <target name="-distribute_linux"> - <delete> - <fileset dir="${lwjgl.temp}/native/" includes="**/*"/> - </delete> - <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/> - <copy todir="${lwjgl.temp}/native"> + <copy todir="${lwjgl.temp}/native/linux"> <fileset dir="${lwjgl.lib}/linux"> <patternset refid="lwjgl-linux.fileset" /> </fileset> </copy> - <zip destfile="${lwjgl.dist}/lwjgl-linux-${lwjgl.version}.zip"> - <zipfileset dir="${lwjgl.temp}" prefix="lwjgl-linux-${lwjgl.version}/"/> - </zip> - </target> - - <!-- Distributes macosx files --> - <target name="-distribute_macosx"> - <delete> - <fileset dir="${lwjgl.temp}/native/" includes="**/*"/> - </delete> - <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/> - <copy todir="${lwjgl.temp}/native"> + <copy todir="${lwjgl.temp}/native/macosx"> <fileset dir="${lwjgl.lib}/macosx"> <patternset refid="lwjgl-macosx.fileset" /> </fileset> </copy> - <zip destfile="${lwjgl.dist}/lwjgl-macosx-${lwjgl.version}.zip"> - <zipfileset dir="${lwjgl.temp}" prefix="lwjgl-macosx-${lwjgl.version}/"/> + + <zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip"> + <zipfileset dir="${lwjgl.temp}" prefix="lwjgl-${lwjgl.version}/"/> </zip> </target> |
|
From: Elias N. <eli...@us...> - 2006-02-06 11:11:22
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10785/src/java/org/lwjgl/util/generator Modified Files: ContextCapabilitiesGenerator.java ContextGeneratorProcessorFactory.java Log Message: OpenGL: Made generated ContextCapabilities only try to load super class symbols if a sub class is supported. This avoids spurious 'Could not locate symbol' warnings in debug mode (glLoadProgramNV on ATI hardware) Index: ContextGeneratorProcessorFactory.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ContextGeneratorProcessorFactory.java 27 Dec 2005 14:46:42 -0000 1.4 +++ ContextGeneratorProcessorFactory.java 6 Feb 2006 11:11:09 -0000 1.5 @@ -139,8 +139,7 @@ ContextCapabilitiesGenerator.generateInitStubsPrologue(writer, context_specific); for (TypeDeclaration typedecl : interface_decls) { InterfaceDeclaration interface_decl = (InterfaceDeclaration)typedecl; - if (!Utils.isFinal(interface_decl)) - ContextCapabilitiesGenerator.generateAddExtension(writer, interface_decl); + ContextCapabilitiesGenerator.generateSuperClassAdds(writer, interface_decl); } for (TypeDeclaration typedecl : interface_decls) { InterfaceDeclaration interface_decl = (InterfaceDeclaration)typedecl; Index: ContextCapabilitiesGenerator.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ContextCapabilitiesGenerator.java 27 Dec 2005 14:46:42 -0000 1.4 +++ ContextCapabilitiesGenerator.java 6 Feb 2006 11:11:09 -0000 1.5 @@ -85,6 +85,19 @@ return EXTENSION_PREFIX + interface_name; } + public static void generateSuperClassAdds(PrintWriter writer, InterfaceDeclaration d) { + Collection<InterfaceType> super_interfaces = d.getSuperinterfaces(); + if (super_interfaces.size() > 1) + throw new RuntimeException(d + " extends more than one other interface"); + if (super_interfaces.size() == 1) { + InterfaceType super_interface = super_interfaces.iterator().next(); + writer.print("\t\tif (" + CACHED_EXTS_VAR_NAME + ".contains(\""); + writer.println(translateFieldName(d.getSimpleName()) + "\"))"); + writer.print("\t\t\t"); + generateAddExtension(writer, super_interface.getDeclaration()); + } + } + public static void generateInitializer(PrintWriter writer, InterfaceDeclaration d) { String translated_field_name = translateFieldName(d.getSimpleName()); writer.print("\t\tthis." + translated_field_name + " = "); @@ -145,13 +158,13 @@ writer.println(translateFieldName(d.getSimpleName()) + "\");"); } else { writer.print("\t\tGLContext." + Utils.STUB_INITIALIZER_NAME + "(" + Utils.getSimpleClassName(d)); - writer.println(".class, supported_extensions, \"" + translateFieldName(d.getSimpleName()) + "\");"); + writer.println(".class, " + CACHED_EXTS_VAR_NAME + ", \"" + translateFieldName(d.getSimpleName()) + "\");"); } } } - public static void generateAddExtension(PrintWriter writer, InterfaceDeclaration d) { - writer.print("\t\t" + CACHED_EXTS_VAR_NAME + ".add(\""); + private static void generateAddExtension(PrintWriter writer, InterfaceDeclaration d) { + writer.print(CACHED_EXTS_VAR_NAME + ".add(\""); writer.println(translateFieldName(d.getSimpleName()) + "\");"); } |
|
From: Elias N. <eli...@us...> - 2006-02-06 11:11:22
|
Update of /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10785/src/generated/org/lwjgl/opengl Modified Files: ContextCapabilities.java Log Message: OpenGL: Made generated ContextCapabilities only try to load super class symbols if a sub class is supported. This avoids spurious 'Could not locate symbol' warnings in debug mode (glLoadProgramNV on ATI hardware) Index: ContextCapabilities.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ContextCapabilities.java 27 Dec 2005 14:46:42 -0000 1.5 +++ ContextCapabilities.java 6 Feb 2006 11:11:09 -0000 1.6 @@ -2094,9 +2094,20 @@ throw new LWJGLException("GL11 not supported"); GLContext.setCapabilities(this); Set supported_extensions = GLContext.getSupportedExtensions(); - supported_extensions.add("GL_ARB_buffer_object"); - supported_extensions.add("GL_ARB_program"); - supported_extensions.add("GL_NV_program"); + if (supported_extensions.contains("GL_ARB_fragment_program")) + supported_extensions.add("GL_ARB_program"); + if (supported_extensions.contains("GL_ARB_pixel_buffer_object")) + supported_extensions.add("GL_ARB_buffer_object"); + if (supported_extensions.contains("GL_ARB_vertex_buffer_object")) + supported_extensions.add("GL_ARB_buffer_object"); + if (supported_extensions.contains("GL_ARB_vertex_program")) + supported_extensions.add("GL_ARB_program"); + if (supported_extensions.contains("GL_EXT_pixel_buffer_object")) + supported_extensions.add("GL_ARB_buffer_object"); + if (supported_extensions.contains("GL_NV_fragment_program")) + supported_extensions.add("GL_NV_program"); + if (supported_extensions.contains("GL_NV_vertex_program")) + supported_extensions.add("GL_NV_program"); if (supported_extensions.contains("GL_ARB_buffer_object") && !ARB_buffer_object_initNativeFunctionAddresses()) supported_extensions.remove("GL_ARB_buffer_object"); if (supported_extensions.contains("GL_ARB_color_buffer_float") && !ARB_color_buffer_float_initNativeFunctionAddresses()) |
|
From: Brian M. <ma...@us...> - 2006-02-02 22:34:49
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22415 Modified Files: BasicTest.java Log Message: support for ALC_ENUMERATION_EXT using LWJGL specific method: AL.getImplementations Index: BasicTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/BasicTest.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- BasicTest.java 20 Feb 2005 11:24:19 -0000 1.20 +++ BasicTest.java 2 Feb 2006 22:34:28 -0000 1.21 @@ -53,6 +53,18 @@ */ public BasicTest() { try { + String[] imps = AL.getImplementations(); + if(imps.length > 0) { + System.out.println("Available devices: "); + for(int i=0; i<imps.length; i++) { + System.out.println(" " + i + ": " + imps[i]); + } + } + } catch (Exception e) { + System.out.println("Unable to query available devices: " + e.getMessage()); + } + + try { AL.create(); } catch (Exception e) { System.out.println("Unable to create OpenAL.\nPlease make sure that OpenAL is available on this system. Exception: " + e); |
|
From: Brian M. <ma...@us...> - 2006-02-02 22:33:51
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22082 Modified Files: AL.java ALC.java Log Message: support for ALC_ENUMERATION_EXT using LWJGL specific method: AL.getImplementations Index: AL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- AL.java 16 Jan 2006 19:35:09 -0000 1.49 +++ AL.java 2 Feb 2006 22:33:41 -0000 1.50 @@ -31,6 +31,8 @@ */ package org.lwjgl.openal; +import java.util.Vector; + import org.lwjgl.LWJGLException; import org.lwjgl.LWJGLUtil; import org.lwjgl.Sys; @@ -52,7 +54,7 @@ /** Have we been created? */ private static boolean created; - + static { Sys.initialize(); } @@ -96,8 +98,17 @@ * @param contextFrequency Frequency for mixing output buffer, in units of Hz (Common values include 11025, 22050, and 44100). * @param contextRefresh Refresh intervalls, in units of Hz. * @param contextSynchronized Flag, indicating a synchronous context.* + */ + public static void create(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized) + throws LWJGLException { + create(deviceArguments, contextFrequency, contextRefresh, contextSynchronized, true); + } + + /** + * @param openDevice Whether to automatically open the device + * @see #create(String, int, int, boolean) */ - public static void create(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized) + static void create(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized, boolean openDevice) throws LWJGLException { if (created) @@ -128,18 +139,20 @@ AL10.initNativeStubs(); ALC.initNativeStubs(); - device = ALC.alcOpenDevice(deviceArguments); - if (device == null) - throw new LWJGLException("Could not open ALC device"); - - if (contextFrequency == -1) { - context = ALC.alcCreateContext(device.device, null); - } else { - context = ALC.alcCreateContext(device.device, - ALCcontext.createAttributeList(contextFrequency, contextRefresh, - contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE)); + if(openDevice) { + device = ALC.alcOpenDevice(deviceArguments); + if (device == null) + throw new LWJGLException("Could not open ALC device"); + + if (contextFrequency == -1) { + context = ALC.alcCreateContext(device.device, null); + } else { + context = ALC.alcCreateContext(device.device, + ALCcontext.createAttributeList(contextFrequency, contextRefresh, + contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE)); + } + ALC.alcMakeContextCurrent(context.context); } - ALC.alcMakeContextCurrent(context.context); } catch (LWJGLException e) { destroy(); throw e; @@ -189,4 +202,41 @@ public static Object getContext() { return context; } + + /** + * + * @return + */ + public static String[] getImplementations() throws LWJGLException, OpenALException { + if(AL.isCreated()) { + throw new OpenALException("Cannot enumerate devices if AL has already been created"); + } + + Vector availableDevices = new Vector(); + + try { + // init + create(null, 44100, 60, false, false); + + // check for extension + if(!ALC.alcIsExtensionPresent("ALC_ENUMERATION_EXT")) { + throw new OpenALException("ALC_ENUMERATION_EXT extension not available"); + } + + // get list of published devices + String[] publishedDevices = ALC.ngetImplementations(); + + // run through them and verify + for (int i = 0; i < publishedDevices.length; i++) { + availableDevices.add(publishedDevices[i]); + } + } finally { + destroy(); + } + + String[] available = new String[availableDevices.size()]; + availableDevices.copyInto(available); + + return available; + } } Index: ALC.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/ALC.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- ALC.java 4 May 2005 20:59:41 -0000 1.28 +++ ALC.java 2 Feb 2006 22:33:41 -0000 1.29 @@ -148,6 +148,13 @@ } static native void initNativeStubs() throws LWJGLException; + + static long getDevice() { + if(AL.device != null) { + return AL.device.device; + } + return 0L; + } /** * The application can obtain certain strings from ALC. @@ -164,7 +171,8 @@ * @return String property from device */ public static String alcGetString(int pname) { - String result = nalcGetString(AL.device.device, pname); + String result; + result = nalcGetString(getDevice(), pname); Util.checkALCError(); return result; } @@ -192,7 +200,7 @@ */ public static void alcGetInteger(int pname, IntBuffer integerdata) { BufferChecks.checkDirect(integerdata); - nalcGetIntegerv(AL.device.device, pname, integerdata.remaining(), integerdata, integerdata.position()); + nalcGetIntegerv(getDevice(), pname, integerdata.remaining(), integerdata, integerdata.position()); Util.checkALCError(); } private native static void nalcGetIntegerv(long device, int pname, int size, Buffer integerdata, int offset); @@ -333,7 +341,7 @@ * @return Errorcode from ALC statemachine */ public static int alcGetError() { - return nalcGetError(AL.device.device); + return nalcGetError(getDevice()); } private native static int nalcGetError(long device); @@ -347,7 +355,7 @@ * @return true if extension is available, false if not */ public static boolean alcIsExtensionPresent(String extName) { - boolean result = nalcIsExtensionPresent(AL.device.device, extName); + boolean result = nalcIsExtensionPresent(getDevice(), extName); Util.checkALCError(); return result; } @@ -364,9 +372,11 @@ * @return value of enumeration */ public static int alcGetEnumValue(String enumName) { - int result = nalcGetEnumValue(AL.device.device, enumName); + int result = nalcGetEnumValue(getDevice(), enumName); Util.checkALCError(); return result; } private native static int nalcGetEnumValue(long device, String enumName); + + static native String[] ngetImplementations(); } |
|
From: Brian M. <ma...@us...> - 2006-02-02 22:33:30
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21925 Modified Files: org_lwjgl_openal_ALC.c Log Message: support for ALC_ENUMERATION_EXT using LWJGL specific method: AL.getImplementations Index: org_lwjgl_openal_ALC.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- org_lwjgl_openal_ALC.c 20 Nov 2005 13:47:45 -0000 1.9 +++ org_lwjgl_openal_ALC.c 2 Feb 2006 22:33:17 -0000 1.10 @@ -343,6 +343,53 @@ return result; } +JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_openal_ALC_ngetImplementations(JNIEnv *env, jclass clazz) { + jclass strcls; + jarray strarr; + jstring str; + + char *deviceList; + char *devices[12]; + int numDevices, i; + + // get device list + deviceList = (char *)alcGetString(NULL, 4100L); + + // build list + for (numDevices = 0; numDevices < 12; numDevices++) {devices[numDevices] = NULL;} + for (numDevices = 0; numDevices < 12; numDevices++) { + devices[numDevices] = deviceList; + deviceList += strlen(deviceList); + if (deviceList[0] == 0) { + if (deviceList[1] == 0) { + break; + } else { + deviceList += 1; + } + } + } + + // iterate found devices and add to java string array + if (devices[numDevices] != NULL) { + numDevices++; + strcls = (*env)->FindClass(env, "java/lang/String"); + strarr = (*env)->NewObjectArray(env, numDevices+1, strcls, 0); + + // add default + str = NewStringNative(env, "NULL Device (Default)"); + (*env)->SetObjectArrayElement(env, strarr, 0, str); + (*env)->DeleteLocalRef(env, str); + + for (i = 0; i < numDevices; i++) { + str = NewStringNative(env, devices[i]); + (*env)->SetObjectArrayElement(env, strarr, i+1, str); + (*env)->DeleteLocalRef(env, str); + } + + } + return strarr; +} + /** * Loads the context OpenAL functions * |
