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
(1) |
|
3
|
4
(1) |
5
|
6
(1) |
7
|
8
|
9
|
|
10
|
11
(2) |
12
(4) |
13
|
14
|
15
|
16
|
|
17
|
18
(1) |
19
|
20
(6) |
21
(2) |
22
(3) |
23
(2) |
|
24
|
25
|
26
(1) |
27
|
28
|
29
|
30
|
|
31
|
|
|
|
|
|
|
|
From: <eli...@us...> - 2006-12-26 09:19:41
|
Revision: 2708
http://svn.sourceforge.net/java-game-lib/?rev=2708&view=rev
Author: elias_naur
Date: 2006-12-26 01:19:40 -0800 (Tue, 26 Dec 2006)
Log Message:
-----------
Refreshed jinput.jar
Modified Paths:
--------------
trunk/LWJGL/libs/jinput.jar
Modified: trunk/LWJGL/libs/jinput.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-23 07:52:52
|
Revision: 2707
http://svn.sourceforge.net/java-game-lib/?rev=2707&view=rev
Author: elias_naur
Date: 2006-12-22 23:52:51 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Updated jinput.jar
Modified Paths:
--------------
trunk/LWJGL/libs/jinput.jar
Modified: trunk/LWJGL/libs/jinput.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: crash <bup...@bs...> - 2006-12-23 03:25:40
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD> <META http-equiv=3DContent-Type content=3D"text/html; charset=3Diso-8859-1"> <META content=3D"MSHTML 6.00.2900.2912" name=3D"GENERATOR"> </HEAD> <BODY> <FONT face=3DArial><FONT size=3D2> <DIV>Michael says: <STRONG>GCME Huge News Release Expected Before Years = End!=20 </STRONG></DIV> <DIV><STRONG></STRONG> </DIV> <DIV><STRONG>Ring In The New Year With Cash!</STRONG></DIV> <DIV> </DIV> <DIV> <DIV><STRONG>GCME</STRONG> is fast becoming a major player in the = foreign film=20 market. With continuing mergers and joint ventures with the industries = most=20 influential corporations.</DIV> <DIV> </DIV></DIV> <DIV><STRONG>Company:</STRONG> Greater China Media & Entertainment=20 Corp.<BR>Symbol: <STRONG>GCME</STRONG><BR><STRONG>Price:</STRONG>=20 $0.70<BR>Status: <STRONG>BUY ALERT</STRONG><BR><STRONG>5 Day = Target:</STRONG>=20 $1.45</DIV> <DIV> </DIV> <DIV><STRONG>Right now</STRONG> it is at $0.70. We have seen consistent = price=20 jumps following <STRONG>news releases</STRONG> and we have been told to=20 <STRONG>expect big news</STRONG> before the end of the year. Look at the = price=20 patterns, see the spikes and the steady climb for yourself. <U>Now is = the time,=20 grab GCME first thing <STRONG>Tuesday</STRONG>=20 Morning</U>.</DIV></FONT></FONT></BODY></HTML> |
|
From: <eli...@us...> - 2006-12-22 11:23:47
|
Revision: 2706
http://svn.sourceforge.net/java-game-lib/?rev=2706&view=rev
Author: elias_naur
Date: 2006-12-22 03:23:45 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Windows: Don't use WS_EX_TOPMOST for fullscreen windows.
Modified Paths:
--------------
trunk/LWJGL/src/native/windows/context.c
Modified: trunk/LWJGL/src/native/windows/context.c
===================================================================
--- trunk/LWJGL/src/native/windows/context.c 2006-12-22 10:45:39 UTC (rev 2705)
+++ trunk/LWJGL/src/native/windows/context.c 2006-12-22 11:23:45 UTC (rev 2706)
@@ -114,7 +114,7 @@
void getWindowFlags(DWORD *windowflags_return, DWORD *exstyle_return, bool fullscreen, bool undecorated) {
DWORD exstyle, windowflags;
if (fullscreen) {
- exstyle = WS_EX_APPWINDOW | WS_EX_TOPMOST;
+ exstyle = WS_EX_APPWINDOW;
windowflags = WS_POPUP;
} else if (undecorated) {
exstyle = WS_EX_APPWINDOW;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-22 10:45:40
|
Revision: 2705
http://svn.sourceforge.net/java-game-lib/?rev=2705&view=rev
Author: elias_naur
Date: 2006-12-22 02:45:39 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Windows: Make window visible after pixel format selection and move code from native WindowsDisplay.nCreate to java side.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2006-12-22 10:36:04 UTC (rev 2704)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2006-12-22 10:45:39 UTC (rev 2705)
@@ -96,6 +96,7 @@
private final static int WA_ACTIVE = 1;
private final static int WA_CLICKACTIVE = 2;
private final static int SW_SHOWMINNOACTIVE = 7;
+ private final static int SW_SHOWDEFAULT = 10;
private final static int SW_RESTORE = 9;
private static WindowsDisplay current_display;
@@ -132,6 +133,9 @@
did_maximize = false;
nCreateWindow(mode, fullscreen, x, y);
peer_info.initDC();
+ showWindow(getHwnd(), SW_SHOWDEFAULT);
+ setForegroundWindow(getHwnd());
+ setFocus(getHwnd());
}
private native void nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException;
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c 2006-12-22 10:36:04 UTC (rev 2704)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c 2006-12-22 10:45:39 UTC (rev 2705)
@@ -199,10 +199,6 @@
return;
}
display_hdc = GetDC(display_hwnd);
- ShowWindow(display_hwnd, SW_SHOWDEFAULT);
- UpdateWindow(display_hwnd);
- SetForegroundWindow(display_hwnd);
- SetFocus(display_hwnd);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nDestroyWindow(JNIEnv *env, jclass clazz) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-22 10:36:06
|
Revision: 2704
http://svn.sourceforge.net/java-game-lib/?rev=2704&view=rev
Author: elias_naur
Date: 2006-12-22 02:36:04 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Windows: Simplify context creation and don't cache the extensions information struct in native code. Just reload it at each use (only at setSwapInterval currently).
Modified Paths:
--------------
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c 2006-12-21 08:11:29 UTC (rev 2703)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c 2006-12-22 10:36:04 UTC (rev 2704)
@@ -43,7 +43,6 @@
#include "common_tools.h"
typedef struct {
- WGLExtensions extensions;
HGLRC context;
} WindowsContext;
@@ -56,7 +55,6 @@
HGLRC shared_context = NULL;
HDC saved_hdc;
HGLRC saved_context;
- WGLExtensions extensions;
jobject context_handle = newJavaManagedByteBuffer(env, sizeof(WindowsContext));
if (context_handle == NULL) {
throwException(env, "Could not create handle buffer");
@@ -77,20 +75,8 @@
return NULL;
}
}
- saved_hdc = wglGetCurrentDC();
- saved_context = wglGetCurrentContext();
- if (!wglMakeCurrent(peer_info->drawable_hdc, context)) {
- wglMakeCurrent(saved_hdc, saved_context);
- wglDeleteContext(context);
- throwException(env, "Could not make context current");
- return NULL;
- }
- extgl_InitWGL(&extensions);
- if (!wglMakeCurrent(saved_hdc, saved_context))
- printfDebugJava(env, "Failed to restore current context");
context_info = (WindowsContext *)(*env)->GetDirectBufferAddress(env, context_handle);
context_info->context = context;
- context_info->extensions = extensions;
return context_handle;
}
@@ -121,9 +107,10 @@
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsContextImplementation_nSetSwapInterval
(JNIEnv *env, jclass clazz, jobject context_handle, jint value) {
- WindowsContext *context_info = (WindowsContext *)(*env)->GetDirectBufferAddress(env, context_handle);
- if (context_info->extensions.WGL_EXT_swap_control) {
- context_info->extensions.wglSwapIntervalEXT(value);
+ WGLExtensions extensions;
+ extgl_InitWGL(&extensions);
+ if (extensions.WGL_EXT_swap_control) {
+ extensions.wglSwapIntervalEXT(value);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-21 08:11:30
|
Revision: 2703
http://svn.sourceforge.net/java-game-lib/?rev=2703&view=rev
Author: elias_naur
Date: 2006-12-21 00:11:29 -0800 (Thu, 21 Dec 2006)
Log Message:
-----------
Commit changes in automatically generated files
Modified Paths:
--------------
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java 2006-12-21 08:10:23 UTC (rev 2702)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java 2006-12-21 08:11:29 UTC (rev 2703)
@@ -194,7 +194,6 @@
* way, an application will normally use glMapBufferARB like this:
* <p/>
* ByteBuffer mapped_buffer; mapped_buffer = glMapBufferARB(..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer);
- * @param result_size The size of the buffer area.
* @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no new buffer will be created.
* @return A ByteBuffer representing the mapped buffer memory.
*/
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java 2006-12-21 08:10:23 UTC (rev 2702)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java 2006-12-21 08:11:29 UTC (rev 2703)
@@ -219,7 +219,6 @@
* <p/>
* ByteBuffer mapped_buffer; mapped_buffer = glMapBuffer(..., ..., ..., null); ... // Another map on the same buffer
* mapped_buffer = glMapBuffer(..., ..., ..., mapped_buffer);
- * @param result_size The size of the buffer area.
* @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no
* new buffer will be created.
* @return A ByteBuffer representing the mapped buffer memory.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-21 08:10:25
|
Revision: 2702
http://svn.sourceforge.net/java-game-lib/?rev=2702&view=rev
Author: elias_naur
Date: 2006-12-21 00:10:23 -0800 (Thu, 21 Dec 2006)
Log Message:
-----------
Update javadoc for glMapBuffer
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-20 19:24:25 UTC (rev 2701)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-21 08:10:23 UTC (rev 2702)
@@ -109,7 +109,6 @@
* <p/>
* ByteBuffer mapped_buffer; mapped_buffer = glMapBufferARB(..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer);
*
- * @param result_size The size of the buffer area.
* @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no new buffer will be created.
*
* @return A ByteBuffer representing the mapped buffer memory.
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-20 19:24:25 UTC (rev 2701)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-21 08:10:23 UTC (rev 2702)
@@ -115,7 +115,6 @@
* ByteBuffer mapped_buffer; mapped_buffer = glMapBuffer(..., ..., ..., null); ... // Another map on the same buffer
* mapped_buffer = glMapBuffer(..., ..., ..., mapped_buffer);
*
- * @param result_size The size of the buffer area.
* @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no
* new buffer will be created.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-20 19:24:26
|
Revision: 2701
http://svn.sourceforge.net/java-game-lib/?rev=2701&view=rev
Author: elias_naur
Date: 2006-12-20 11:24:25 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
Fix VBO tests and bump Sys native JNI library version
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/Sys.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-12-20 19:23:35 UTC (rev 2700)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-12-20 19:24:25 UTC (rev 2701)
@@ -57,7 +57,7 @@
private static final String VERSION = "1.0-rc1";
/** Current version of the JNI library */
- static final int JNI_VERSION = 6;
+ static final int JNI_VERSION = 7;
/** The implementation instance to delegate platform specific behavior to */
private final static SysImplementation implementation;
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java 2006-12-20 19:23:35 UTC (rev 2700)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java 2006-12-20 19:24:25 UTC (rev 2701)
@@ -169,7 +169,6 @@
ByteBuffer new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB,
ARBBufferObject.GL_WRITE_ONLY_ARB,
- 2 * 4 * 4,
mapped_buffer);
if ( new_mapped_buffer != mapped_buffer )
mapped_float_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asFloatBuffer();
@@ -177,7 +176,6 @@
new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_ARB,
ARBBufferObject.GL_WRITE_ONLY_ARB,
- 4 * 4,
mapped_indices_buffer);
if ( new_mapped_buffer != mapped_indices_buffer )
mapped_indices_int_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asIntBuffer();
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java 2006-12-20 19:23:35 UTC (rev 2700)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java 2006-12-20 19:24:25 UTC (rev 2701)
@@ -163,7 +163,6 @@
GL11.glRotatef(angle, 0, 0, 1.0f);
ByteBuffer new_mapped_buffer = ARBBufferObject.glMapBufferARB(ARBVertexBufferObject.GL_ARRAY_BUFFER_ARB,
ARBBufferObject.GL_WRITE_ONLY_ARB,
- 2 * 4 * 4,
mapped_buffer);
if ( new_mapped_buffer != mapped_buffer )
mapped_float_buffer = new_mapped_buffer.order(ByteOrder.nativeOrder()).asFloatBuffer();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-20 19:23:36
|
Revision: 2700
http://svn.sourceforge.net/java-game-lib/?rev=2700&view=rev
Author: elias_naur
Date: 2006-12-20 11:23:35 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
Commit changes in automatically generated files
Modified Paths:
--------------
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL20.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVVertexArrayRange.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -195,19 +195,19 @@
* <p/>
* ByteBuffer mapped_buffer; mapped_buffer = glMapBufferARB(..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer);
* @param result_size The size of the buffer area.
- * @param old_buffer A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no new buffer will be created. In that case, size is ignored.
+ * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no new buffer will be created.
* @return A ByteBuffer representing the mapped buffer memory.
*/
- public static java.nio.ByteBuffer glMapBufferARB(int target, int access, int result_size, java.nio.ByteBuffer old_buffer) {
+ public static java.nio.ByteBuffer glMapBufferARB(int target, int access, java.nio.ByteBuffer old_buffer) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_buffer_object_glMapBufferARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
if (old_buffer != null)
BufferChecks.checkDirect(old_buffer);
- java.nio.ByteBuffer __result = nglMapBufferARB(target, access, result_size, old_buffer, function_pointer);
+ java.nio.ByteBuffer __result = nglMapBufferARB(target, access, GLChecks.getBufferObjectSizeARB(caps, target), old_buffer, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglMapBufferARB(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
+ private static native java.nio.ByteBuffer nglMapBufferARB(int target, int access, long result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
public static boolean glUnmapBufferARB(int target) {
ContextCapabilities caps = GLContext.getCapabilities();
@@ -227,12 +227,12 @@
}
private static native void nglGetBufferParameterivARB(int target, int pname, IntBuffer params, int params_position, long function_pointer);
- public static java.nio.ByteBuffer glGetBufferPointerARB(int target, int pname, int result_size) {
+ public static java.nio.ByteBuffer glGetBufferPointerARB(int target, int pname) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_buffer_object_glGetBufferPointervARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- java.nio.ByteBuffer __result = nglGetBufferPointervARB(target, pname, result_size, function_pointer);
+ java.nio.ByteBuffer __result = nglGetBufferPointervARB(target, pname, GLChecks.getBufferObjectSizeARB(caps, target), function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglGetBufferPointervARB(int target, int pname, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglGetBufferPointervARB(int target, int pname, long result_size, long function_pointer);
}
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexProgram.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -256,12 +256,12 @@
}
private static native void nglGetVertexAttribivARB(int index, int pname, IntBuffer params, int params_position, long function_pointer);
- public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, int result_size) {
+ public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, long result_size) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_vertex_program_glGetVertexAttribPointervARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
java.nio.ByteBuffer __result = nglGetVertexAttribPointervARB(index, pname, result_size, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, long result_size, long function_pointer);
}
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexShader.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -299,12 +299,12 @@
}
private static native void nglGetVertexAttribivARB(int index, int pname, IntBuffer params, int params_position, long function_pointer);
- public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, int result_size) {
+ public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, long result_size) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_vertex_shader_glGetVertexAttribPointervARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
java.nio.ByteBuffer __result = nglGetVertexAttribPointervARB(index, pname, result_size, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglGetVertexAttribPointervARB(int index, int pname, long result_size, long function_pointer);
}
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -18,12 +18,11 @@
* oldBuffer is non-null, it will be returned if it points to the same mapped memory, otherwise a
* new ByteBuffer is created.
* @param result_size The size of the buffer area.
- * @param old_buffer A ByteBuffer. If this argument points to the same address as the new mapping,
- * it will be returned and no new buffer will be created. In that case, size is
- * ignored.
+ * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping,
+ * it will be returned and no new buffer will be created.
* @return A ByteBuffer representing the mapped object buffer memory.
*/
- public static java.nio.ByteBuffer glMapObjectBufferATI(int buffer, int result_size, java.nio.ByteBuffer old_buffer) {
+ public static java.nio.ByteBuffer glMapObjectBufferATI(int buffer, long result_size, java.nio.ByteBuffer old_buffer) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ATI_map_object_buffer_glMapObjectBufferATI_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
@@ -32,7 +31,7 @@
java.nio.ByteBuffer __result = nglMapObjectBufferATI(buffer, result_size, old_buffer, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglMapObjectBufferATI(int buffer, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
+ private static native java.nio.ByteBuffer nglMapObjectBufferATI(int buffer, long result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
public static void glUnmapObjectBufferATI(int buffer) {
ContextCapabilities caps = GLContext.getCapabilities();
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -526,14 +526,14 @@
}
private static native void nglGetVariantFloatvEXT(int id, int value, FloatBuffer pbData, int pbData_position, long function_pointer);
- public static java.nio.ByteBuffer glGetVariantPointerEXT(int id, int value, int result_size) {
+ public static java.nio.ByteBuffer glGetVariantPointerEXT(int id, int value, long result_size) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.EXT_vertex_shader_glGetVariantPointervEXT_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
java.nio.ByteBuffer __result = nglGetVariantPointervEXT(id, value, result_size, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglGetVariantPointervEXT(int id, int value, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglGetVariantPointervEXT(int id, int value, long result_size, long function_pointer);
public static void glGetInvariantBooleanEXT(int id, int value, ByteBuffer pbData) {
ContextCapabilities caps = GLContext.getCapabilities();
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -1396,14 +1396,14 @@
}
private static native void nglFinish(long function_pointer);
- public static java.nio.ByteBuffer glGetPointer(int pname, int result_size) {
+ public static java.nio.ByteBuffer glGetPointer(int pname, long result_size) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL11_glGetPointerv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
java.nio.ByteBuffer __result = nglGetPointerv(pname, result_size, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglGetPointerv(int pname, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglGetPointerv(int pname, long result_size, long function_pointer);
public static boolean glIsEnabled(int cap) {
ContextCapabilities caps = GLContext.getCapabilities();
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL15.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -220,20 +220,20 @@
* ByteBuffer mapped_buffer; mapped_buffer = glMapBuffer(..., ..., ..., null); ... // Another map on the same buffer
* mapped_buffer = glMapBuffer(..., ..., ..., mapped_buffer);
* @param result_size The size of the buffer area.
- * @param old_buffer A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no
- * new buffer will be created. In that case, size is ignored.
+ * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no
+ * new buffer will be created.
* @return A ByteBuffer representing the mapped buffer memory.
*/
- public static java.nio.ByteBuffer glMapBuffer(int target, int access, int result_size, java.nio.ByteBuffer old_buffer) {
+ public static java.nio.ByteBuffer glMapBuffer(int target, int access, java.nio.ByteBuffer old_buffer) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL15_glMapBuffer_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
if (old_buffer != null)
BufferChecks.checkDirect(old_buffer);
- java.nio.ByteBuffer __result = nglMapBuffer(target, access, result_size, old_buffer, function_pointer);
+ java.nio.ByteBuffer __result = nglMapBuffer(target, access, GLChecks.getBufferObjectSize(caps, target), old_buffer, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglMapBuffer(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
+ private static native java.nio.ByteBuffer nglMapBuffer(int target, int access, long result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
public static boolean glUnmapBuffer(int target) {
ContextCapabilities caps = GLContext.getCapabilities();
@@ -253,14 +253,14 @@
}
private static native void nglGetBufferParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
- public static java.nio.ByteBuffer glGetBufferPointer(int target, int pname, int result_size) {
+ public static java.nio.ByteBuffer glGetBufferPointer(int target, int pname) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL15_glGetBufferPointerv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- java.nio.ByteBuffer __result = nglGetBufferPointerv(target, pname, result_size, function_pointer);
+ java.nio.ByteBuffer __result = nglGetBufferPointerv(target, pname, GLChecks.getBufferObjectSize(caps, target), function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglGetBufferPointerv(int target, int pname, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglGetBufferPointerv(int target, int pname, long result_size, long function_pointer);
public static void glGenQueries(IntBuffer ids) {
ContextCapabilities caps = GLContext.getCapabilities();
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL20.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL20.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -757,14 +757,14 @@
}
private static native void nglGetVertexAttribiv(int index, int pname, IntBuffer params, int params_position, long function_pointer);
- public static java.nio.ByteBuffer glGetVertexAttribPointer(int index, int pname, int result_size) {
+ public static java.nio.ByteBuffer glGetVertexAttribPointer(int index, int pname, long result_size) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL20_glGetVertexAttribPointerv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
java.nio.ByteBuffer __result = nglGetVertexAttribPointerv(index, pname, result_size, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglGetVertexAttribPointerv(int index, int pname, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglGetVertexAttribPointerv(int index, int pname, long result_size, long function_pointer);
public static void glBindAttribLocation(int program, int index, ByteBuffer name) {
ContextCapabilities caps = GLContext.getCapabilities();
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -1,181 +1,181 @@
-/* MACHINE GENERATED FILE, DO NOT EDIT */
-
-package org.lwjgl.opengl;
-
-import org.lwjgl.LWJGLException;
-import org.lwjgl.BufferChecks;
-import java.nio.*;
-
-public final class NVTransformFeedback {
- /**
- * Accepted by the <target> parameters of BindBuffer, BufferData,
- * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
- * GetBufferPointerv, BindBufferRangeNV, BindBufferOffsetNV and
- * BindBufferBaseNV:
- */
- public static final int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8c8e;
- /**
- * Accepted by the <param> parameter of GetIntegerIndexedvEXT and
- * GetBooleanIndexedvEXT:
- */
- public static final int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8c84;
- public static final int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8c85;
- public static final int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8c86;
- /**
- * Accepted by the <param> parameter of GetIntegerIndexedvEXT and
- * GetBooleanIndexedvEXT, and by the <pname> parameter of GetBooleanv,
- * GetDoublev, GetIntegerv, and GetFloatv:
- */
- public static final int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8c8f;
- /**
- * Accepted by the <bufferMode> parameter of TransformFeedbackAttribsNV and
- * TransformFeedbackVaryingsNV:
- */
- public static final int GL_INTERLEAVED_ATTRIBS_NV = 0x8c8c;
- public static final int GL_SEPARATE_ATTRIBS_NV = 0x8c8d;
- /**
- * Accepted by the <target> parameter of BeginQuery, EndQuery, and
- * GetQueryiv:
- */
- public static final int GL_PRIMITIVES_GENERATED_NV = 0x8c87;
- public static final int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8c88;
- /**
- * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, and by
- * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
- * GetDoublev:
- */
- public static final int GL_RASTERIZER_DISCARD_NV = 0x8c89;
- /**
- * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
- * and GetFloatv:
- */
- public static final int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8c8a;
- public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8c8b;
- public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8c80;
- public static final int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8c7e;
- /**
- *Accepted by the <pname> parameter of GetProgramiv:
- */
- public static final int GL_ACTIVE_VARYINGS_NV = 0x8c81;
- public static final int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8c82;
- public static final int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8c83;
- /**
- * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
- * GetFloatv, and GetProgramiv:
- */
- public static final int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8c7f;
- /**
- *Accepted by the <attribs> parameter of TransformFeedbackAttribsNV:
- */
- public static final int GL_BACK_PRIMARY_COLOR_NV = 0x8c77;
- public static final int GL_BACK_SECONDARY_COLOR_NV = 0x8c78;
- public static final int GL_TEXTURE_COORD_NV = 0x8c79;
- public static final int GL_CLIP_DISTANCE_NV = 0x8c7a;
- public static final int GL_VERTEX_ID_NV = 0x8c7b;
- public static final int GL_PRIMITIVE_ID_NV = 0x8c7c;
- public static final int GL_GENERIC_ATTRIB_NV = 0x8c7d;
-
- private NVTransformFeedback() {
- }
-
-
- public static void glBindBufferRangeNV(int target, int index, int buffer, long offset, long size) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glBindBufferRangeNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- nglBindBufferRangeNV(target, index, buffer, offset, size, function_pointer);
- }
- private static native void nglBindBufferRangeNV(int target, int index, int buffer, long offset, long size, long function_pointer);
-
- public static void glBindBufferOffsetNV(int target, int index, int buffer, long offset) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glBindBufferOffsetNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- nglBindBufferOffsetNV(target, index, buffer, offset, function_pointer);
- }
- private static native void nglBindBufferOffsetNV(int target, int index, int buffer, long offset, long function_pointer);
-
- public static void glBindBufferBaseNV(int target, int index, int buffer) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glBindBufferBaseNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- nglBindBufferBaseNV(target, index, buffer, function_pointer);
- }
- private static native void nglBindBufferBaseNV(int target, int index, int buffer, long function_pointer);
-
- public static void glTransformFeedbackAttribsNV(IntBuffer attribs, int bufferMode) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glTransformFeedbackAttribsNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- BufferChecks.checkDirect(attribs);
- nglTransformFeedbackAttribsNV((attribs.remaining()), attribs, attribs.position(), bufferMode, function_pointer);
- }
- private static native void nglTransformFeedbackAttribsNV(int count, IntBuffer attribs, int attribs_position, int bufferMode, long function_pointer);
-
- public static void glTransformFeedbackVaryingsNV(int program, IntBuffer locations, int bufferMode) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- BufferChecks.checkDirect(locations);
- nglTransformFeedbackVaryingsNV(program, (locations.remaining()), locations, locations.position(), bufferMode, function_pointer);
- }
- private static native void nglTransformFeedbackVaryingsNV(int program, int count, IntBuffer locations, int locations_position, int bufferMode, long function_pointer);
-
- public static void glBeginTransformFeedbackNV(int primitiveMode) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glBeginTransformFeedbackNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- nglBeginTransformFeedbackNV(primitiveMode, function_pointer);
- }
- private static native void nglBeginTransformFeedbackNV(int primitiveMode, long function_pointer);
-
- public static void glEndTransformFeedbackNV() {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glEndTransformFeedbackNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- nglEndTransformFeedbackNV(function_pointer);
- }
- private static native void nglEndTransformFeedbackNV(long function_pointer);
-
- public static int glGetVaryingLocationNV(int program, ByteBuffer name) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glGetVaryingLocationNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- BufferChecks.checkDirect(name);
- BufferChecks.checkNullTerminated(name);
- int __result = nglGetVaryingLocationNV(program, name, name.position(), function_pointer);
- return __result;
- }
- private static native int nglGetVaryingLocationNV(int program, ByteBuffer name, int name_position, long function_pointer);
-
- public static void glGetActiveVaryingNV(int program, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glGetActiveVaryingNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- BufferChecks.checkBuffer(length, 1);
- BufferChecks.checkBuffer(size, 1);
- BufferChecks.checkBuffer(type, 1);
- BufferChecks.checkDirect(name);
- nglGetActiveVaryingNV(program, index, (name.remaining()), length, length.position(), size, size.position(), type, type.position(), name, name.position(), function_pointer);
- }
- private static native void nglGetActiveVaryingNV(int program, int index, int bufSize, IntBuffer length, int length_position, IntBuffer size, int size_position, IntBuffer type, int type_position, ByteBuffer name, int name_position, long function_pointer);
-
- public static void glActiveVaryingNV(int program, ByteBuffer name) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glActiveVaryingNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- BufferChecks.checkDirect(name);
- BufferChecks.checkNullTerminated(name);
- nglActiveVaryingNV(program, name, name.position(), function_pointer);
- }
- private static native void nglActiveVaryingNV(int program, ByteBuffer name, int name_position, long function_pointer);
-
- public static void glGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- BufferChecks.checkBuffer(location, 1);
- nglGetTransformFeedbackVaryingNV(program, index, location, location.position(), function_pointer);
- }
- private static native void nglGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location, int location_position, long function_pointer);
-}
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+package org.lwjgl.opengl;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.BufferChecks;
+import java.nio.*;
+
+public final class NVTransformFeedback {
+ /**
+ * Accepted by the <target> parameters of BindBuffer, BufferData,
+ * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+ * GetBufferPointerv, BindBufferRangeNV, BindBufferOffsetNV and
+ * BindBufferBaseNV:
+ */
+ public static final int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8c8e;
+ /**
+ * Accepted by the <param> parameter of GetIntegerIndexedvEXT and
+ * GetBooleanIndexedvEXT:
+ */
+ public static final int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8c84;
+ public static final int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8c85;
+ public static final int GL_TRANSFORM_FEEDBACK_RECORD_NV = 0x8c86;
+ /**
+ * Accepted by the <param> parameter of GetIntegerIndexedvEXT and
+ * GetBooleanIndexedvEXT, and by the <pname> parameter of GetBooleanv,
+ * GetDoublev, GetIntegerv, and GetFloatv:
+ */
+ public static final int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8c8f;
+ /**
+ * Accepted by the <bufferMode> parameter of TransformFeedbackAttribsNV and
+ * TransformFeedbackVaryingsNV:
+ */
+ public static final int GL_INTERLEAVED_ATTRIBS_NV = 0x8c8c;
+ public static final int GL_SEPARATE_ATTRIBS_NV = 0x8c8d;
+ /**
+ * Accepted by the <target> parameter of BeginQuery, EndQuery, and
+ * GetQueryiv:
+ */
+ public static final int GL_PRIMITIVES_GENERATED_NV = 0x8c87;
+ public static final int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV = 0x8c88;
+ /**
+ * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, and by
+ * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+ * GetDoublev:
+ */
+ public static final int GL_RASTERIZER_DISCARD_NV = 0x8c89;
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
+ * and GetFloatv:
+ */
+ public static final int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8c8a;
+ public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8c8b;
+ public static final int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8c80;
+ public static final int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8c7e;
+ /**
+ *Accepted by the <pname> parameter of GetProgramiv:
+ */
+ public static final int GL_ACTIVE_VARYINGS_NV = 0x8c81;
+ public static final int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8c82;
+ public static final int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8c83;
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
+ * GetFloatv, and GetProgramiv:
+ */
+ public static final int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8c7f;
+ /**
+ *Accepted by the <attribs> parameter of TransformFeedbackAttribsNV:
+ */
+ public static final int GL_BACK_PRIMARY_COLOR_NV = 0x8c77;
+ public static final int GL_BACK_SECONDARY_COLOR_NV = 0x8c78;
+ public static final int GL_TEXTURE_COORD_NV = 0x8c79;
+ public static final int GL_CLIP_DISTANCE_NV = 0x8c7a;
+ public static final int GL_VERTEX_ID_NV = 0x8c7b;
+ public static final int GL_PRIMITIVE_ID_NV = 0x8c7c;
+ public static final int GL_GENERIC_ATTRIB_NV = 0x8c7d;
+
+ private NVTransformFeedback() {
+ }
+
+
+ public static void glBindBufferRangeNV(int target, int index, int buffer, long offset, long size) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glBindBufferRangeNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ nglBindBufferRangeNV(target, index, buffer, offset, size, function_pointer);
+ }
+ private static native void nglBindBufferRangeNV(int target, int index, int buffer, long offset, long size, long function_pointer);
+
+ public static void glBindBufferOffsetNV(int target, int index, int buffer, long offset) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glBindBufferOffsetNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ nglBindBufferOffsetNV(target, index, buffer, offset, function_pointer);
+ }
+ private static native void nglBindBufferOffsetNV(int target, int index, int buffer, long offset, long function_pointer);
+
+ public static void glBindBufferBaseNV(int target, int index, int buffer) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glBindBufferBaseNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ nglBindBufferBaseNV(target, index, buffer, function_pointer);
+ }
+ private static native void nglBindBufferBaseNV(int target, int index, int buffer, long function_pointer);
+
+ public static void glTransformFeedbackAttribsNV(IntBuffer attribs, int bufferMode) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glTransformFeedbackAttribsNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ BufferChecks.checkDirect(attribs);
+ nglTransformFeedbackAttribsNV((attribs.remaining()), attribs, attribs.position(), bufferMode, function_pointer);
+ }
+ private static native void nglTransformFeedbackAttribsNV(int count, IntBuffer attribs, int attribs_position, int bufferMode, long function_pointer);
+
+ public static void glTransformFeedbackVaryingsNV(int program, IntBuffer locations, int bufferMode) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ BufferChecks.checkDirect(locations);
+ nglTransformFeedbackVaryingsNV(program, (locations.remaining()), locations, locations.position(), bufferMode, function_pointer);
+ }
+ private static native void nglTransformFeedbackVaryingsNV(int program, int count, IntBuffer locations, int locations_position, int bufferMode, long function_pointer);
+
+ public static void glBeginTransformFeedbackNV(int primitiveMode) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glBeginTransformFeedbackNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ nglBeginTransformFeedbackNV(primitiveMode, function_pointer);
+ }
+ private static native void nglBeginTransformFeedbackNV(int primitiveMode, long function_pointer);
+
+ public static void glEndTransformFeedbackNV() {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glEndTransformFeedbackNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ nglEndTransformFeedbackNV(function_pointer);
+ }
+ private static native void nglEndTransformFeedbackNV(long function_pointer);
+
+ public static int glGetVaryingLocationNV(int program, ByteBuffer name) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glGetVaryingLocationNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ BufferChecks.checkDirect(name);
+ BufferChecks.checkNullTerminated(name);
+ int __result = nglGetVaryingLocationNV(program, name, name.position(), function_pointer);
+ return __result;
+ }
+ private static native int nglGetVaryingLocationNV(int program, ByteBuffer name, int name_position, long function_pointer);
+
+ public static void glGetActiveVaryingNV(int program, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glGetActiveVaryingNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ BufferChecks.checkBuffer(length, 1);
+ BufferChecks.checkBuffer(size, 1);
+ BufferChecks.checkBuffer(type, 1);
+ BufferChecks.checkDirect(name);
+ nglGetActiveVaryingNV(program, index, (name.remaining()), length, length.position(), size, size.position(), type, type.position(), name, name.position(), function_pointer);
+ }
+ private static native void nglGetActiveVaryingNV(int program, int index, int bufSize, IntBuffer length, int length_position, IntBuffer size, int size_position, IntBuffer type, int type_position, ByteBuffer name, int name_position, long function_pointer);
+
+ public static void glActiveVaryingNV(int program, ByteBuffer name) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glActiveVaryingNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ BufferChecks.checkDirect(name);
+ BufferChecks.checkNullTerminated(name);
+ nglActiveVaryingNV(program, name, name.position(), function_pointer);
+ }
+ private static native void nglActiveVaryingNV(int program, ByteBuffer name, int name_position, long function_pointer);
+
+ public static void glGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location) {
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer;
+ BufferChecks.checkFunctionAddress(function_pointer);
+ BufferChecks.checkBuffer(location, 1);
+ nglGetTransformFeedbackVaryingNV(program, index, location, location.position(), function_pointer);
+ }
+ private static native void nglGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location, int location_position, long function_pointer);
+}
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -69,7 +69,7 @@
java.nio.ByteBuffer __result = nglAllocateMemoryNV(size, readFrequency, writeFrequency, priority, size, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority, long result_size, long function_pointer);
public static void glFreeMemoryNV(ByteBuffer pointer) {
ContextCapabilities caps = GLContext.getCapabilities();
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java 2006-12-20 19:23:35 UTC (rev 2700)
@@ -214,14 +214,14 @@
}
private static native void nglGetVertexAttribivNV(int index, int parameterName, IntBuffer params, int params_position, long function_pointer);
- public static java.nio.ByteBuffer glGetVertexAttribPointerNV(int index, int parameterName, int result_size) {
+ public static java.nio.ByteBuffer glGetVertexAttribPointerNV(int index, int parameterName, long result_size) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_vertex_program_glGetVertexAttribPointervNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
java.nio.ByteBuffer __result = nglGetVertexAttribPointervNV(index, parameterName, result_size, function_pointer);
return __result;
}
- private static native java.nio.ByteBuffer nglGetVertexAttribPointervNV(int index, int parameterName, int result_size, long function_pointer);
+ private static native java.nio.ByteBuffer nglGetVertexAttribPointervNV(int index, int parameterName, long result_size, long function_pointer);
public static void glProgramParameter4fNV(int target, int index, float x, float y, float z, float w) {
ContextCapabilities caps = GLContext.getCapabilities();
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -56,7 +56,7 @@
glGetBufferSubDataARB(target, offset, size, data_address);
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglMapBufferARB(JNIEnv *env, jclass clazz, jint target, jint access, jint result_size, jobject old_buffer, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglMapBufferARB(JNIEnv *env, jclass clazz, jint target, jint access, jlong result_size, jobject old_buffer, jlong function_pointer) {
glMapBufferARBPROC glMapBufferARB = (glMapBufferARBPROC)((intptr_t)function_pointer);
GLvoid * __result = glMapBufferARB(target, access);
return safeNewBufferCached(env, __result, result_size, old_buffer);
@@ -74,7 +74,7 @@
glGetBufferParameterivARB(target, pname, params_address);
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglGetBufferPointervARB(JNIEnv *env, jclass clazz, jint target, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglGetBufferPointervARB(JNIEnv *env, jclass clazz, jint target, jint pname, jlong result_size, jlong function_pointer) {
glGetBufferPointervARBPROC glGetBufferPointervARB = (glGetBufferPointervARBPROC)((intptr_t)function_pointer);
GLvoid * __result;
glGetBufferPointervARB(target, pname, &__result);
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -129,7 +129,7 @@
glGetVertexAttribivARB(index, pname, params_address);
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jlong result_size, jlong function_pointer) {
glGetVertexAttribPointervARBPROC glGetVertexAttribPointervARB = (glGetVertexAttribPointervARBPROC)((intptr_t)function_pointer);
GLvoid * __result;
glGetVertexAttribPointervARB(index, pname, &__result);
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -154,7 +154,7 @@
glGetVertexAttribivARB(index, pname, params_address);
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetVertexAttribPointervARB(JNIEnv *env, jclass clazz, jint index, jint pname, jlong result_size, jlong function_pointer) {
glGetVertexAttribPointervARBPROC glGetVertexAttribPointervARB = (glGetVertexAttribPointervARBPROC)((intptr_t)function_pointer);
GLvoid * __result;
glGetVertexAttribPointervARB(index, pname, &__result);
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_ATIMapObjectBuffer.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -6,7 +6,7 @@
typedef GLvoid * (APIENTRY *glMapObjectBufferATIPROC) (GLuint buffer);
typedef void (APIENTRY *glUnmapObjectBufferATIPROC) (GLuint buffer);
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_nglMapObjectBufferATI(JNIEnv *env, jclass clazz, jint buffer, jint result_size, jobject old_buffer, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_nglMapObjectBufferATI(JNIEnv *env, jclass clazz, jint buffer, jlong result_size, jobject old_buffer, jlong function_pointer) {
glMapObjectBufferATIPROC glMapObjectBufferATI = (glMapObjectBufferATIPROC)((intptr_t)function_pointer);
GLvoid * __result = glMapObjectBufferATI(buffer);
return safeNewBufferCached(env, __result, result_size, old_buffer);
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -249,7 +249,7 @@
glGetVariantFloatvEXT(id, value, pbData_address);
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantPointervEXT(JNIEnv *env, jclass clazz, jint id, jint value, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantPointervEXT(JNIEnv *env, jclass clazz, jint id, jint value, jlong result_size, jlong function_pointer) {
glGetVariantPointervEXTPROC glGetVariantPointervEXT = (glGetVariantPointervEXTPROC)((intptr_t)function_pointer);
GLvoid * __result;
glGetVariantPointervEXT(id, value, &__result);
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -739,7 +739,7 @@
glFinish();
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL11_nglGetPointerv(JNIEnv *env, jclass clazz, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL11_nglGetPointerv(JNIEnv *env, jclass clazz, jint pname, jlong result_size, jlong function_pointer) {
glGetPointervPROC glGetPointerv = (glGetPointervPROC)((intptr_t)function_pointer);
GLvoid * __result;
glGetPointerv(pname, &__result);
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL15.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -64,7 +64,7 @@
glGetBufferSubData(target, offset, size, data_address);
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_nglMapBuffer(JNIEnv *env, jclass clazz, jint target, jint access, jint result_size, jobject old_buffer, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_nglMapBuffer(JNIEnv *env, jclass clazz, jint target, jint access, jlong result_size, jobject old_buffer, jlong function_pointer) {
glMapBufferPROC glMapBuffer = (glMapBufferPROC)((intptr_t)function_pointer);
GLvoid * __result = glMapBuffer(target, access);
return safeNewBufferCached(env, __result, result_size, old_buffer);
@@ -82,7 +82,7 @@
glGetBufferParameteriv(target, pname, params_address);
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferPointerv(JNIEnv *env, jclass clazz, jint target, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferPointerv(JNIEnv *env, jclass clazz, jint target, jint pname, jlong result_size, jlong function_pointer) {
glGetBufferPointervPROC glGetBufferPointerv = (glGetBufferPointervPROC)((intptr_t)function_pointer);
GLvoid * __result;
glGetBufferPointerv(target, pname, &__result);
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL20.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -423,7 +423,7 @@
glGetVertexAttribiv(index, pname, params_address);
}
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL20_nglGetVertexAttribPointerv(JNIEnv *env, jclass clazz, jint index, jint pname, jint result_size, jlong function_pointer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL20_nglGetVertexAttribPointerv(JNIEnv *env, jclass clazz, jint index, jint pname, jlong result_size, jlong function_pointer) {
glGetVertexAttribPointervPROC glGetVertexAttribPointerv = (glGetVertexAttribPointervPROC)((intptr_t)function_pointer);
GLvoid * __result;
glGetVertexAttribPointerv(index, pname, &__result);
Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c 2006-12-20 19:22:33 UTC (rev 2699)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c 2006-12-20 19:23:35 UTC (rev 2700)
@@ -1,82 +1,82 @@
-/* MACHINE GENERATED FILE, DO NOT EDIT */
-
-#include <jni.h>
-#include "extgl.h"
-
-typedef void (APIENTRY *glBindBufferRangeNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRY *glBindBufferOffsetNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRY *glBindBufferBaseNVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRY *glTransformFeedbackAttribsNVPROC) (GLsizei count, const GLint * attribs, GLenum bufferMode);
-typedef void (APIENTRY *glTransformFeedbackVaryingsNVPROC) (GLuint program, GLsizei count, const GLint * locations, GLenum bufferMode);
-typedef void (APIENTRY *glBeginTransformFeedbackNVPROC) (GLenum primitiveMode);
-typedef void (APIENTRY *glEndTransformFeedbackNVPROC) ();
-typedef GLint (APIENTRY *glGetVaryingLocationNVPROC) (GLuint program, const GLchar * name);
-typedef void (APIENTRY *glGetActiveVaryingNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name);
-typedef void (APIENTRY *glActiveVaryingNVPROC) (GLuint program, const GLchar * name);
-typedef void (APIENTRY *glGetTransformFeedbackVaryingNVPROC) (GLuint program, GLuint index, GLint * location);
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferRangeNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong size, jlong function_pointer) {
- glBindBufferRangeNVPROC glBindBufferRangeNV = (glBindBufferRangeNVPROC)((intptr_t)function_pointer);
- glBindBufferRangeNV(target, index, buffer, offset, size);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferOffsetNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong function_pointer) {
- glBindBufferOffsetNVPROC glBindBufferOffsetNV = (glBindBufferOffsetNVPROC)((intptr_t)function_pointer);
- glBindBufferOffsetNV(target, index, buffer, offset);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferBaseNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong function_pointer) {
- glBindBufferBaseNVPROC glBindBufferBaseNV = (glBindBufferBaseNVPROC)((intptr_t)function_pointer);
- glBindBufferBaseNV(target, index, buffer);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackAttribsNV(JNIEnv *env, jclass clazz, jint count, jobject attribs, jint attribs_position, jint bufferMode, jlong function_pointer) {
- const GLint *attribs_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, attribs)) + attribs_position;
- glTransformFeedbackAttribsNVPROC glTransformFeedbackAttribsNV = (glTransformFeedbackAttribsNVPROC)((intptr_t)function_pointer);
- glTransformFeedbackAttribsNV(count, attribs_address, bufferMode);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackVaryingsNV(JNIEnv *env, jclass clazz, jint program, jint count, jobject locations, jint locations_position, jint bufferMode, jlong function_pointer) {
- const GLint *locations_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, locations)) + locations_position;
- glTransformFeedbackVaryingsNVPROC glTransformFeedbackVaryingsNV = (glTransformFeedbackVaryingsNVPROC)((intptr_t)function_pointer);
- glTransformFeedbackVaryingsNV(program, count, locations_address, bufferMode);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBeginTransformFeedbackNV(JNIEnv *env, jclass clazz, jint primitiveMode, jlong function_pointer) {
- glBeginTransformFeedbackNVPROC glBeginTransformFeedbackNV = (glBeginTransformFeedbackNVPROC)((intptr_t)function_pointer);
- glBeginTransformFeedbackNV(primitiveMode);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglEndTransformFeedbackNV(JNIEnv *env, jclass clazz, jlong function_pointer) {
- glEndTransformFeedbackNVPROC glEndTransformFeedbackNV = (glEndTransformFeedbackNVPROC)((intptr_t)function_pointer);
- glEndTransformFeedbackNV();
-}
-
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetVaryingLocationNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
- const GLchar *name_address = ((const GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
- glGetVaryingLocationNVPROC glGetVaryingLocationNV = (glGetVaryingLocationNVPROC)((intptr_t)function_pointer);
- GLint __result = glGetVaryingLocationNV(program, name_address);
- return __result;
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jint bufSize, jobject length, jint length_position, jobject size, jint size_position, jobject type, jint type_position, jobject name, jint name_position, jlong function_pointer) {
- GLsizei *length_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, length)) + length_position;
- GLsizei *size_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, size)) + size_position;
- GLenum *type_address = ((GLenum *)(*env)->GetDirectBufferAddress(env, type)) + type_position;
- GLchar *name_address = ((GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
- glGetActiveVaryingNVPROC glGetActiveVaryingNV = (glGetActiveVaryingNVPROC)((intptr_t)function_pointer);
- glGetActiveVaryingNV(program, index, bufSize, length_address, size_address, type_address, name_address);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
- const GLchar *name_address = ((const GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
- glActiveVaryingNVPROC glActiveVaryingNV = (glActiveVaryingNVPROC)((intptr_t)function_pointer);
- glActiveVaryingNV(program, name_address);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetTransformFeedbackVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jobject location, jint location_position, jlong function_pointer) {
- GLint *location_address = ((GLint *)(*env)->GetDirectBufferAddress(env, location)) + location_position;
- glGetTransformFeedbackVaryingNVPROC glGetTransformFeedbackVaryingNV = (glGetTransformFeedbackVaryingNVPROC)((intptr_t)function_pointer);
- glGetTransformFeedbackVaryingNV(program, index, location_address);
-}
-
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+#include <jni.h>
+#include "extgl.h"
+
+typedef void (APIENTRY *glBindBufferRangeNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRY *glBindBufferOffsetNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRY *glBindBufferBaseNVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRY *glTransformFeedbackAttribsNVPROC) (GLsizei count, const GLint * attribs, GLenum bufferMode);
+typedef void (APIENTRY *glTransformFeedbackVaryingsNVPROC) (GLuint program, GLsizei count, const GLint * locations, GLenum bufferMode);
+typedef void (APIENTRY *glBeginTransformFeedbackNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRY *glEndTransformFeedbackNVPROC) ();
+typedef GLint (APIENTRY *glGetVaryingLocationNVPROC) (GLuint program, const GLchar * name);
+typedef void (APIENTRY *glGetActiveVaryingNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name);
+typedef void (APIENTRY *glActiveVaryingNVPROC) (GLuint program, const GLchar * name);
+typedef void (APIENTRY *glGetTransformFeedbackVaryingNVPROC) (GLuint program, GLuint index, GLint * location);
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferRangeNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong size, jlong function_pointer) {
+ glBindBufferRangeNVPROC glBindBufferRangeNV = (glBindBufferRangeNVPROC)((intptr_t)function_pointer);
+ glBindBufferRangeNV(target, index, buffer, offset, size);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferOffsetNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong function_pointer) {
+ glBindBufferOffsetNVPROC glBindBufferOffsetNV = (glBindBufferOffsetNVPROC)((intptr_t)function_pointer);
+ glBindBufferOffsetNV(target, index, buffer, offset);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferBaseNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong function_pointer) {
+ glBindBufferBaseNVPROC glBindBufferBaseNV = (glBindBufferBaseNVPROC)((intptr_t)function_pointer);
+ glBindBufferBaseNV(target, index, buffer);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackAttribsNV(JNIEnv *env, jclass clazz, jint count, jobject attribs, jint attribs_position, jint bufferMode, jlong function_pointer) {
+ const GLint *attribs_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, attribs)) + attribs_position;
+ glTransformFeedbackAttribsNVPROC glTransformFeedbackAttribsNV = (glTransformFeedbackAttribsNVPROC)((intptr_t)function_pointer);
+ glTransformFeedbackAttribsNV(count, attribs_address, bufferMode);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackVaryingsNV(JNIEnv *env, jclass clazz, jint program, jint count, jobject locations, jint locations_position, jint bufferMode, jlong function_pointer) {
+ const GLint *locations_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, locations)) + locations_position;
+ glTransformFeedbackVaryingsNVPROC glTransformFeedbackVaryingsNV = (glTransformFeedbackVaryingsNVPROC)((intptr_t)function_pointer);
+ glTransformFeedbackVaryingsNV(program, count, locations_address, bufferMode);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBeginTransformFeedbackNV(JNIEnv *env, jclass clazz, jint primitiveMode, jlong function_pointer) {
+ glBeginTransformFeedbackNVPROC glBeginTransformFeedbackNV = (glBeginTransformFeedbackNVPROC)((intptr_t)function_pointer);
+ glBeginTransformFeedbackNV(primitiveMode);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglEndTransformFeedbackNV(JNIEnv *env, jclass clazz, jlong function_pointer) {
+ glEndTransformFeedbackNVPROC glEndTransformFeedbackNV = (glEndTransformFeedbackNVPROC)((intptr_t)function_pointer);
+ glEndTransformFeedbackNV();
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetVaryingLocationNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
+ const GLchar *name_address = ((const GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
+ glGetVaryingLocationNVPROC glGetVaryingLocationNV = (glGetVaryingLocationNVPROC)((intptr_t)function_pointer);
+ GLint __result = glGetVaryingLocationNV(program, name_address);
+ return __result;
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jint bufSize, jobject length, jint length_position, jobject size, jint size_position, jobject type, jint type_position, jobject name, jint name_position, jlong function_pointer) {
+ GLsizei *length_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, length)) + length_position;
+ GLsizei *size_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, size)) + size_position;
+ GLenum *type_address = ((GLenum *)(*env)->GetDirectBufferAddress(env, type)) + type_position;
+ GLchar...
[truncated message content] |
|
From: <eli...@us...> - 2006-12-20 19:22:34
|
Revision: 2699
http://svn.sourceforge.net/java-game-lib/?rev=2699&view=rev
Author: elias_naur
Date: 2006-12-20 11:22:33 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
Add GLChecks support methods for GL15 and ARB_buffer_object
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java 2006-12-20 19:21:35 UTC (rev 2698)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java 2006-12-20 19:22:33 UTC (rev 2699)
@@ -59,6 +59,18 @@
return StateTracker.getReferencesStack(caps).getReferences();
}
+ static int getBufferObjectSize(ContextCapabilities caps, int buffer_enum) {
+ IntBuffer scratch_buffer = caps.scratch_int_buffer;
+ GL15.glGetBufferParameter(buffer_enum, GL15.GL_BUFFER_SIZE, scratch_buffer);
+ return scratch_buffer.get(0);
+ }
+
+ static int getBufferObjectSizeARB(ContextCapabilities caps, int buffer_enum) {
+ IntBuffer scratch_buffer = caps.scratch_int_buffer;
+ ARBBufferObject.glGetBufferParameterARB(buffer_enum, ARBBufferObject.GL_BUFFER_SIZE_ARB, scratch_buffer);
+ return scratch_buffer.get(0);
+ }
+
private static boolean checkBufferObject(ContextCapabilities caps, int buffer_enum, boolean state) {
IntBuffer scratch_buffer = caps.scratch_int_buffer;
GL11.glGetInteger(buffer_enum, scratch_buffer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-20 19:21:36
|
Revision: 2698
http://svn.sourceforge.net/java-game-lib/?rev=2698&view=rev
Author: elias_naur
Date: 2006-12-20 11:21:35 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
Make glGetBufferPointer and glMapBuffer in GL15 and ARB_buffer_object compute result_size automatically. Change NV_vertes_array_range to use the new AutoResultSize syntax.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-20 19:19:56 UTC (rev 2697)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-20 19:21:35 UTC (rev 2698)
@@ -116,6 +116,7 @@
*/
@CachedResult
@GLvoid
+ @AutoResultSize("GLChecks.getBufferObjectSizeARB(caps, target)")
ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access);
boolean glUnmapBufferARB(@GLenum int target);
@@ -124,5 +125,6 @@
void glGetBufferParameterivARB(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
@StripPostfix("pointer")
+ @AutoResultSize("GLChecks.getBufferObjectSizeARB(caps, target)")
void glGetBufferPointervARB(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer);
}
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-20 19:19:56 UTC (rev 2697)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-20 19:21:35 UTC (rev 2698)
@@ -123,6 +123,7 @@
*/
@CachedResult
@GLvoid
+ @AutoResultSize("GLChecks.getBufferObjectSize(caps, target)")
ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access);
boolean glUnmapBuffer(@GLenum int target);
@@ -131,6 +132,7 @@
void glGetBufferParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
@StripPostfix("pointer")
+ @AutoResultSize("GLChecks.getBufferObjectSize(caps, target)")
void glGetBufferPointerv(@GLenum int target, @GLenum int pname, @Result @GLvoid ByteBuffer pointer);
// -----------------------------------------------------------------
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java 2006-12-20 19:19:56 UTC (rev 2697)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_vertex_array_range.java 2006-12-20 19:21:35 UTC (rev 2698)
@@ -54,7 +54,8 @@
@PlatformDependent({Platform.WGL, Platform.GLX})
@GLvoid
- ByteBuffer glAllocateMemoryNV(@AutoResultSize int size, float readFrequency, float writeFrequency, float priority);
+ @AutoResultSize("size")
+ ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority);
@PlatformDependent({Platform.WGL, Platform.GLX})
void glFreeMemoryNV(@Check @GLbyte Buffer pointer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-20 19:19:57
|
Revision: 2697
http://svn.sourceforge.net/java-game-lib/?rev=2697&view=rev
Author: elias_naur
Date: 2006-12-20 11:19:56 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
Generator: Support arbitrary @AutoResultSize expressions. Make Buffer result sizes long instead of int
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java 2006-12-20 17:55:10 UTC (rev 2696)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/AutoResultSize.java 2006-12-20 19:19:56 UTC (rev 2697)
@@ -33,8 +33,8 @@
/**
*
- * AutoResultSize specifies that a parameter should determine
- * the size of a Buffer result.
+ * AutoResultSize specifies the size of a returned Buffer
+ * as an expression.
*
* @author elias_naur <eli...@us...>
* @version $Revision$
@@ -44,6 +44,7 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
-@Target(ElementType.PARAMETER)
+@Target(ElementType.METHOD)
public @interface AutoResultSize {
+ String value(); // The size as a java expression
}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2006-12-20 17:55:10 UTC (rev 2696)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2006-12-20 19:19:56 UTC (rev 2697)
@@ -123,12 +123,14 @@
if (!first_parameter)
writer.print(", ");
first_parameter = false;
- writer.print("int " + Utils.RESULT_SIZE_NAME);
- if (method.getAnnotation(CachedResult.class) != null) {
+ writer.print("long " + Utils.RESULT_SIZE_NAME);
+ }
+ if (method.getAnnotation(CachedResult.class) != null) {
+ if (!first_parameter)
writer.print(", ");
- printResultType(writer, method);
- writer.print(" " + Utils.CACHED_BUFFER_NAME);
- }
+ first_parameter = false;
+ printResultType(writer, method);
+ writer.print(" " + Utils.CACHED_BUFFER_NAME);
}
return first_parameter;
}
@@ -382,13 +384,13 @@
if (!first_parameter)
writer.print(", ");
first_parameter = false;
- ParameterDeclaration auto_result_size_parameter = Utils.getAutoResultSizeParameter(method);
- String result_size_parameter_name;
- if (auto_result_size_parameter == null)
- result_size_parameter_name = Utils.RESULT_SIZE_NAME;
+ AutoResultSize auto_result_size_annotation = method.getAnnotation(AutoResultSize.class);
+ String result_size_expression;
+ if (auto_result_size_annotation == null)
+ result_size_expression = Utils.RESULT_SIZE_NAME;
else
- result_size_parameter_name = auto_result_size_parameter.getSimpleName();
- Utils.printExtraCallArguments(writer, method, result_size_parameter_name);
+ result_size_expression = auto_result_size_annotation.value();
+ Utils.printExtraCallArguments(writer, method, result_size_expression);
}
return first_parameter;
}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java 2006-12-20 17:55:10 UTC (rev 2696)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java 2006-12-20 19:19:56 UTC (rev 2697)
@@ -95,7 +95,7 @@
writer.print("(JNIEnv *env, jclass clazz");
generateParameters(writer, method.getParameters(), mode);
if (Utils.getNIOBufferType(result_type) != null) {
- writer.print(", jint " + Utils.RESULT_SIZE_NAME);
+ writer.print(", jlong " + Utils.RESULT_SIZE_NAME);
if (method.getAnnotation(CachedResult.class) != null)
writer.print(", jobject " + Utils.CACHED_BUFFER_NAME);
}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java 2006-12-20 17:55:10 UTC (rev 2696)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/Utils.java 2006-12-20 19:19:56 UTC (rev 2697)
@@ -144,17 +144,6 @@
}
}
- public static ParameterDeclaration getAutoResultSizeParameter(MethodDeclaration method) {
- ParameterDeclaration result = null;
- for (ParameterDeclaration param : method.getParameters())
- if (param.getAnnotation(AutoResultSize.class) != null) {
- if (result != null)
- throw new RuntimeException(method + " contains multiple AutoResultSize annotations");
- result = param;
- }
- return result;
- }
-
public static AnnotationMirror getParameterAutoAnnotation(ParameterDeclaration param) {
for (AnnotationMirror annotation : param.getAnnotationMirrors())
if (NativeTypeTranslator.getAnnotation(annotation, Auto.class) != null)
@@ -210,7 +199,7 @@
}
public static boolean needResultSize(MethodDeclaration method) {
- return getNIOBufferType(getMethodReturnType(method)) != null && getAutoResultSizeParameter(method) == null;
+ return getNIOBufferType(getMethodReturnType(method)) != null && method.getAnnotation(AutoResultSize.class) == null;
}
public static void printExtraCallArguments(PrintWriter writer, MethodDeclaration method, String size_parameter_name) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-20 17:55:12
|
Revision: 2696
http://svn.sourceforge.net/java-game-lib/?rev=2696&view=rev
Author: elias_naur
Date: 2006-12-20 09:55:10 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
Check cached buffer results in OpenGL functions for matching capacity
Modified Paths:
--------------
trunk/LWJGL/src/native/common/common_tools.h
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
Modified: trunk/LWJGL/src/native/common/common_tools.h
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.h 2006-12-18 18:27:15 UTC (rev 2695)
+++ trunk/LWJGL/src/native/common/common_tools.h 2006-12-20 17:55:10 UTC (rev 2696)
@@ -89,7 +89,8 @@
static inline jobject safeNewBufferCached(JNIEnv *env, void *p, int size, jobject old_buffer) {
if (old_buffer != NULL) {
void *old_buffer_address = (*env)->GetDirectBufferAddress(env, old_buffer);
- if (old_buffer_address == p)
+ jlong capacity = (*env)->GetDirectBufferCapacity(env, old_buffer);
+ if (old_buffer_address == p && capacity == size)
return old_buffer;
}
return safeNewBuffer(env, p, size);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-18 18:27:15 UTC (rev 2695)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2006-12-20 17:55:10 UTC (rev 2696)
@@ -110,7 +110,7 @@
* ByteBuffer mapped_buffer; mapped_buffer = glMapBufferARB(..., ..., ..., null); ... // Another map on the same buffer mapped_buffer = glMapBufferARB(..., ..., ..., mapped_buffer);
*
* @param result_size The size of the buffer area.
- * @param old_buffer A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no new buffer will be created. In that case, size is ignored.
+ * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no new buffer will be created.
*
* @return A ByteBuffer representing the mapped buffer memory.
*/
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java 2006-12-18 18:27:15 UTC (rev 2695)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java 2006-12-20 17:55:10 UTC (rev 2696)
@@ -44,9 +44,8 @@
* new ByteBuffer is created.
*
* @param result_size The size of the buffer area.
- * @param old_buffer A ByteBuffer. If this argument points to the same address as the new mapping,
- * it will be returned and no new buffer will be created. In that case, size is
- * ignored.
+ * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping,
+ * it will be returned and no new buffer will be created.
*
* @return A ByteBuffer representing the mapped object buffer memory.
*/
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-18 18:27:15 UTC (rev 2695)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2006-12-20 17:55:10 UTC (rev 2696)
@@ -116,8 +116,8 @@
* mapped_buffer = glMapBuffer(..., ..., ..., mapped_buffer);
*
* @param result_size The size of the buffer area.
- * @param old_buffer A ByteBuffer. If this argument points to the same address as the new mapping, it will be returned and no
- * new buffer will be created. In that case, size is ignored.
+ * @param old_buffer A ByteBuffer. If this argument points to the same address and has the same capacity as the new mapping, it will be returned and no
+ * new buffer will be created.
*
* @return A ByteBuffer representing the mapped buffer memory.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-12-18 18:27:16
|
Revision: 2695
http://svn.sourceforge.net/java-game-lib/?rev=2695&view=rev
Author: matzon
Date: 2006-12-18 10:27:15 -0800 (Mon, 18 Dec 2006)
Log Message:
-----------
1.0-rc1 version string
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/src/java/org/lwjgl/Sys.java
trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2006-12-12 21:44:46 UTC (rev 2694)
+++ trunk/LWJGL/build.xml 2006-12-18 18:27:15 UTC (rev 2695)
@@ -13,7 +13,7 @@
<property name="lwjgl.docs" location="doc" />
<property name="lwjgl.temp" location="temp" />
<property name="lwjgl.res" location="res" />
- <property name="lwjgl.version" value="1.0beta4" />
+ <property name="lwjgl.version" value="1.0-rc1" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
<!-- ================================================================== -->
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-12-12 21:44:46 UTC (rev 2694)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-12-18 18:27:15 UTC (rev 2695)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "1.0beta4";
+ private static final String VERSION = "1.0-rc1";
/** Current version of the JNI library */
static final int JNI_VERSION = 6;
Modified: trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-12-12 21:44:46 UTC (rev 2694)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-12-18 18:27:15 UTC (rev 2695)
@@ -53,7 +53,7 @@
private static String JNI_LIBRARY_NAME = "lwjgl-devil";
/** Version of IL */
- static final String VERSION = "1.0beta4";
+ static final String VERSION = "1.0-rc1";
/** Current version of the JNI library */
static final int JNI_VERSION = 2;
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-12-12 21:44:46 UTC (rev 2694)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-12-18 18:27:15 UTC (rev 2695)
@@ -193,7 +193,7 @@
private static String JNI_LIBRARY_NAME = "lwjgl-fmod3";
/** Version of FMOD */
- private static final String VERSION = "1.0beta4";
+ private static final String VERSION = "1.0-rc1";
/** Current version of the JNI library */
static final int JNI_VERSION = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-12-12 21:44:52
|
Revision: 2694
http://svn.sourceforge.net/java-game-lib/?rev=2694&view=rev
Author: matzon
Date: 2006-12-12 13:44:46 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
version screw-up
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/devil/IL.java
trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
Modified: trunk/LWJGL/src/java/org/lwjgl/devil/IL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/IL.java 2006-12-12 21:30:58 UTC (rev 2693)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/IL.java 2006-12-12 21:44:46 UTC (rev 2694)
@@ -295,7 +295,7 @@
public static final int IL_EOF = -1;
/**
- * Return the version of the core LWJGL libraries as a String.
+ * Return the version of the DevIL-LWJGL binding as a String.
*/
public static String getVersion() {
return ILNative.VERSION;
Modified: trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-12-12 21:30:58 UTC (rev 2693)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-12-12 21:44:46 UTC (rev 2694)
@@ -85,13 +85,6 @@
}
}
- /**
- * Return the version of the DevIL-lwjgl binding as a String.
- */
- public static String getVersion() {
- return VERSION;
- }
-
// IL
// ===========================================================
static native void initNativeStubsIL(Class clazz) throws LWJGLException;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-12-12 21:31:02
|
Revision: 2693
http://svn.sourceforge.net/java-game-lib/?rev=2693&view=rev
Author: matzon
Date: 2006-12-12 13:30:58 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
added getVersion like lwjgl
bumped native version
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/devil/IL.java
trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
Modified: trunk/LWJGL/src/java/org/lwjgl/devil/IL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/IL.java 2006-12-12 21:30:21 UTC (rev 2692)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/IL.java 2006-12-12 21:30:58 UTC (rev 2693)
@@ -293,6 +293,13 @@
public static final int IL_SEEK_CUR = 1;
public static final int IL_SEEK_END = 2;
public static final int IL_EOF = -1;
+
+ /**
+ * Return the version of the core LWJGL libraries as a String.
+ */
+ public static String getVersion() {
+ return ILNative.VERSION;
+ }
public static native boolean ilActiveImage(int Number);
public static native boolean ilActiveLayer(int Number);
Modified: trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-12-12 21:30:21 UTC (rev 2692)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-12-12 21:30:58 UTC (rev 2693)
@@ -53,10 +53,10 @@
private static String JNI_LIBRARY_NAME = "lwjgl-devil";
/** Version of IL */
- public static final String VERSION = "1.0beta4";
+ static final String VERSION = "1.0beta4";
/** Current version of the JNI library */
- static final int JNI_VERSION = 1;
+ static final int JNI_VERSION = 2;
private static void loadLibrary(final String lib_name) {
AccessController.doPrivileged(new PrivilegedAction() {
@@ -85,6 +85,13 @@
}
}
+ /**
+ * Return the version of the DevIL-lwjgl binding as a String.
+ */
+ public static String getVersion() {
+ return VERSION;
+ }
+
// IL
// ===========================================================
static native void initNativeStubsIL(Class clazz) throws LWJGLException;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-12-12 21:30:23
|
Revision: 2692
http://svn.sourceforge.net/java-game-lib/?rev=2692&view=rev
Author: matzon
Date: 2006-12-12 13:30:21 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
fixed comment for getVersion
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-12-12 21:29:08 UTC (rev 2691)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-12-12 21:30:21 UTC (rev 2692)
@@ -243,7 +243,7 @@
}
/**
- * Return the version of the core LWJGL libraries as a String.
+ * Return the version of the FMOD3-LWJGL binding as a String.
*/
public static String getVersion() {
return VERSION;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-12-12 21:29:12
|
Revision: 2691
http://svn.sourceforge.net/java-game-lib/?rev=2691&view=rev
Author: matzon
Date: 2006-12-12 13:29:08 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
added getVersion like lwjgl
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-12-11 20:38:21 UTC (rev 2690)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-12-12 21:29:08 UTC (rev 2691)
@@ -193,7 +193,7 @@
private static String JNI_LIBRARY_NAME = "lwjgl-fmod3";
/** Version of FMOD */
- public static final String VERSION = "1.0beta4";
+ private static final String VERSION = "1.0beta4";
/** Current version of the JNI library */
static final int JNI_VERSION = 1;
@@ -240,6 +240,13 @@
return null;
}
});
+ }
+
+ /**
+ * Return the version of the core LWJGL libraries as a String.
+ */
+ public static String getVersion() {
+ return VERSION;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-11 20:38:25
|
Revision: 2690
http://svn.sourceforge.net/java-game-lib/?rev=2690&view=rev
Author: elias_naur
Date: 2006-12-11 12:38:21 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
Linux: Make sure a newly created window get the focus, if possible, to avoid a fullscreen window immediately getting minimized
Modified Paths:
--------------
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c 2006-12-11 11:26:26 UTC (rev 2689)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c 2006-12-11 20:38:21 UTC (rev 2690)
@@ -298,6 +298,7 @@
XMapRaised(disp, win);
waitMapped(disp, win);
XClearWindow(disp, win);
+ XSetInputFocus(disp, win, RevertToNone, CurrentTime);
if (!checkXError(env, disp)) {
destroyWindow(env, disp, win);
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-11 11:26:28
|
Revision: 2689
http://svn.sourceforge.net/java-game-lib/?rev=2689&view=rev
Author: elias_naur
Date: 2006-12-11 03:26:26 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
Linux: Add more include paths to the build script to handle distros with a different JRE layout
Modified Paths:
--------------
trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml 2006-12-06 14:01:29 UTC (rev 2688)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml 2006-12-11 11:26:26 UTC (rev 2689)
@@ -30,6 +30,8 @@
<arg line="${cflags}"/>
<arg value="-I${java.home}/include"/>
<arg value="-I${java.home}/include/linux"/>
+ <arg value="-I${java.home}/../include"/>
+ <arg value="-I${java.home}/../include/linux"/>
<arg value="-I${native}/common"/>
<arg value="-I${native}/linux"/>
<mapper type="glob" from="*.c" to="*.o"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-06 14:01:34
|
Revision: 2688
http://svn.sourceforge.net/java-game-lib/?rev=2688&view=rev
Author: elias_naur
Date: 2006-12-06 06:01:29 -0800 (Wed, 06 Dec 2006)
Log Message:
-----------
Bumped Sys.JNI_VERSION because of earlier OpenGL function changes
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/Sys.java
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-12-04 21:58:46 UTC (rev 2687)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-12-06 14:01:29 UTC (rev 2688)
@@ -57,7 +57,7 @@
private static final String VERSION = "1.0beta4";
/** Current version of the JNI library */
- static final int JNI_VERSION = 5;
+ static final int JNI_VERSION = 6;
/** The implementation instance to delegate platform specific behavior to */
private final static SysImplementation implementation;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-12-04 21:58:49
|
Revision: 2687
http://svn.sourceforge.net/java-game-lib/?rev=2687&view=rev
Author: matzon
Date: 2006-12-04 13:58:46 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
fix loading issues on linux/mac
Modified Paths:
--------------
trunk/LWJGL/src/native/common/devil/extil.c
trunk/LWJGL/src/native/common/devil/extilu.c
trunk/LWJGL/src/native/common/devil/extilut.c
Modified: trunk/LWJGL/src/native/common/devil/extil.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extil.c 2006-12-02 22:21:32 UTC (rev 2686)
+++ trunk/LWJGL/src/native/common/devil/extil.c 2006-12-04 21:58:46 UTC (rev 2687)
@@ -5,10 +5,9 @@
#else
#include <dlfcn.h>
#include "extil.h"
- #include <libgen.h>
static void* devILhandle;
#endif
-#include "org_lwjgl_devil_ILNative.h";
+#include "org_lwjgl_devil_ILNative.h"
/*
* Class: org_lwjgl_devil_ILNative
@@ -68,7 +67,7 @@
printfDebug("Testing '%s'\n", path_str);
#ifdef _WIN32
devILhandle = LoadLibrary(path_str);
-#else
+#elif __APPLE__ && __MACH__
char* directoryName = dirname(path_str);
char* fileName = basename(path_str);
char* currentDirectory = getwd(NULL);
@@ -77,13 +76,18 @@
}
devILhandle = dlopen(fileName, RTLD_LAZY);
if(devILhandle == NULL) {
- printfDebug("dlopen failure: %s\n\n\n", dlerror());
+ printfDebug("dlopen failure: %s\n", dlerror());
}
chdir(currentDirectory);
free(currentDirectory);
+#else
+ devILhandle = dlopen(path_str, RTLD_LAZY);
+ if(devILhandle == NULL) {
+ printfDebug("dlopen failure: %s\n", dlerror());
+ }
#endif
if (devILhandle != NULL) {
- printfDebug("Found devil at '%s'\n", path_str);
+ printfDebug("Found IL at '%s'\n", path_str);
}
free(path_str);
Modified: trunk/LWJGL/src/native/common/devil/extilu.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extilu.c 2006-12-02 22:21:32 UTC (rev 2686)
+++ trunk/LWJGL/src/native/common/devil/extilu.c 2006-12-04 21:58:46 UTC (rev 2687)
@@ -5,7 +5,6 @@
#else
#include <dlfcn.h>
#include "extilu.h"
- #include <libgen.h>
static void* devILUhandle;
#endif
@@ -58,7 +57,7 @@
printfDebug("Testing '%s'\n", path_str);
#ifdef _WIN32
devILUhandle = LoadLibrary(path_str);
-#else
+#elif __APPLE__ && __MACH__
char* directoryName = dirname(path_str);
char* fileName = basename(path_str);
char* currentDirectory = getwd(NULL);
@@ -67,13 +66,18 @@
}
devILUhandle = dlopen(fileName, RTLD_LAZY);
if(devILUhandle == NULL) {
- printfDebug("dlopen failure: %s\n\n\n", dlerror());
+ printfDebug("dlopen failure: %s\n", dlerror());
}
chdir(currentDirectory);
free(currentDirectory);
+#else
+ devILUhandle = dlopen(path_str, RTLD_LAZY);
+ if(devILUhandle == NULL) {
+ printfDebug("dlopen failure: %s\n", dlerror());
+ }
#endif
if (devILUhandle != NULL) {
- printfDebug("Found ilu at '%s'\n", path_str);
+ printfDebug("Found ILU at '%s'\n", path_str);
}
free(path_str);
Modified: trunk/LWJGL/src/native/common/devil/extilut.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extilut.c 2006-12-02 22:21:32 UTC (rev 2686)
+++ trunk/LWJGL/src/native/common/devil/extilut.c 2006-12-04 21:58:46 UTC (rev 2687)
@@ -5,7 +5,6 @@
#else
#include <dlfcn.h>
#include "extilut.h"
- #include <libgen.h>
static void* devILUThandle;
#endif
@@ -58,7 +57,7 @@
printfDebug("Testing '%s'\n", path_str);
#ifdef _WIN32
devILUThandle = LoadLibrary(path_str);
-#else
+#elif __APPLE__ && __MACH__
char* directoryName = dirname(path_str);
char* fileName = basename(path_str);
char* currentDirectory = getwd(NULL);
@@ -67,13 +66,18 @@
}
devILUThandle = dlopen(fileName, RTLD_LAZY);
if(devILUThandle == NULL) {
- printfDebug("dlopen failure: %s\n\n\n", dlerror());
+ printfDebug("dlopen failure: %s\n", dlerror());
}
chdir(currentDirectory);
free(currentDirectory);
+#else
+ devILUThandle = dlopen(path_str, RTLD_LAZY);
+ if(devILUThandle == NULL) {
+ printfDebug("dlopen failure: %s\n", dlerror());
+ }
#endif
if (devILUThandle != NULL) {
- printfDebug("Found ilut at '%s'\n", path_str);
+ printfDebug("Found ILUT at '%s'\n", path_str);
}
free(path_str);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-12-02 22:21:34
|
Revision: 2686
http://svn.sourceforge.net/java-game-lib/?rev=2686&view=rev
Author: elias_naur
Date: 2006-12-02 14:21:32 -0800 (Sat, 02 Dec 2006)
Log Message:
-----------
Linux: Don't double free the Display connection in the switchDisplayMode error path
Modified Paths:
--------------
trunk/LWJGL/src/native/linux/display.c
Modified: trunk/LWJGL/src/native/linux/display.c
===================================================================
--- trunk/LWJGL/src/native/linux/display.c 2006-11-27 23:04:37 UTC (rev 2685)
+++ trunk/LWJGL/src/native/linux/display.c 2006-12-02 22:21:32 UTC (rev 2686)
@@ -330,7 +330,6 @@
int height = (*env)->GetIntField(env, mode, fid_height);
int freq = (*env)->GetIntField(env, mode, fid_freq);
if (!setMode(env, disp, screen, extension, width, height, freq)) {
- XCloseDisplay(disp);
throwException(env, "Could not switch mode.");
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
