Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
1
|
2
|
3
|
4
|
|
5
|
6
|
7
(1) |
8
|
9
(7) |
10
(4) |
11
|
|
12
|
13
(1) |
14
(3) |
15
(1) |
16
(1) |
17
(2) |
18
(7) |
|
19
(14) |
20
(6) |
21
|
22
|
23
|
24
(7) |
25
(1) |
|
26
|
27
(3) |
28
|
29
|
30
|
|
|
|
From: <eli...@us...> - 2006-11-27 23:04:39
|
Revision: 2685
http://svn.sourceforge.net/java-game-lib/?rev=2685&view=rev
Author: elias_naur
Date: 2006-11-27 15:04:37 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
ARBTextureCompression, GL13: Only allow ByteBuffer for glCompressedTex*Image*D since the spec defines that the image data is interpreted as (unsigned) bytes anyway. Also let the imageSize parameter be automatically determined
Modified Paths:
--------------
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java 2006-11-27 23:01:01 UTC (rev 2684)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java 2006-11-27 23:04:37 UTC (rev 2685)
@@ -23,47 +23,15 @@
}
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData) {
+ public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexImage1DARB(target, level, internalformat, width, border, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, Buffer pData, int pData_position, long function_pointer);
+ private static native void nglCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData, int pData_position, long function_pointer);
public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
@@ -73,47 +41,15 @@
}
private static native void nglCompressedTexImage1DARBBO(int target, int level, int internalformat, int width, int border, int imageSize, long pData_buffer_offset, long function_pointer);
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer pData) {
+ public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer pData, int pData_position, long function_pointer);
+ private static native void nglCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer pData, int pData_position, long function_pointer);
public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
@@ -123,47 +59,15 @@
}
private static native void nglCompressedTexImage2DARBBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, long pData_buffer_offset, long function_pointer);
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) {
+ public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer pData, int pData_position, long function_pointer);
+ private static native void nglCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer pData, int pData_position, long function_pointer);
public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
@@ -173,47 +77,15 @@
}
private static native void nglCompressedTexImage3DARBBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long pData_buffer_offset, long function_pointer);
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer pData) {
+ public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, Buffer pData, int pData_position, long function_pointer);
+ private static native void nglCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer pData, int pData_position, long function_pointer);
public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
@@ -223,47 +95,15 @@
}
private static native void nglCompressedTexSubImage1DARBBO(int target, int level, int xoffset, int width, int format, int imageSize, long pData_buffer_offset, long function_pointer);
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer pData) {
+ public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer pData, int pData_position, long function_pointer);
+ private static native void nglCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer pData, int pData_position, long function_pointer);
public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
@@ -273,47 +113,15 @@
}
private static native void nglCompressedTexSubImage2DARBBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long pData_buffer_offset, long function_pointer);
- public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer pData) {
+ public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, Buffer pData, int pData_position, long function_pointer);
+ private static native void nglCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer pData, int pData_position, long function_pointer);
public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
@@ -331,39 +139,7 @@
BufferChecks.checkDirect(pImg);
nglGetCompressedTexImageARB(target, lod, pImg, pImg.position(), function_pointer);
}
- public static void glGetCompressedTexImageARB(int target, int lod, DoubleBuffer pImg) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled(caps);
- BufferChecks.checkDirect(pImg);
- nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 3, function_pointer);
- }
- public static void glGetCompressedTexImageARB(int target, int lod, FloatBuffer pImg) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled(caps);
- BufferChecks.checkDirect(pImg);
- nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer);
- }
- public static void glGetCompressedTexImageARB(int target, int lod, IntBuffer pImg) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled(caps);
- BufferChecks.checkDirect(pImg);
- nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer);
- }
- public static void glGetCompressedTexImageARB(int target, int lod, ShortBuffer pImg) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled(caps);
- BufferChecks.checkDirect(pImg);
- nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 1, function_pointer);
- }
- private static native void nglGetCompressedTexImageARB(int target, int lod, Buffer pImg, int pImg_position, long function_pointer);
+ private static native void nglGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg, int pImg_position, long function_pointer);
public static void glGetCompressedTexImageARB(int target, int lod, long pImg_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java 2006-11-27 23:01:01 UTC (rev 2684)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java 2006-11-27 23:04:37 UTC (rev 2685)
@@ -124,46 +124,14 @@
}
private static native void nglClientActiveTexture(int texture, long function_pointer);
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer data) {
+ public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexImage1D(target, level, internalformat, width, border, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 1, function_pointer);
- }
private static native void nglCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, Buffer data, int data_position, long function_pointer);
public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
@@ -174,47 +142,15 @@
}
private static native void nglCompressedTexImage1DBO(int target, int level, int internalformat, int width, int border, int imageSize, long data_buffer_offset, long function_pointer);
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer data) {
+ public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexImage2D(target, level, internalformat, width, height, border, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data, int data_position, long function_pointer);
+ private static native void nglCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer data, int data_position, long function_pointer);
public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
@@ -224,47 +160,15 @@
}
private static native void nglCompressedTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, long data_buffer_offset, long function_pointer);
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer data) {
+ public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer data, int data_position, long function_pointer);
+ private static native void nglCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer data, int data_position, long function_pointer);
public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
@@ -274,47 +178,15 @@
}
private static native void nglCompressedTexImage3DBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long data_buffer_offset, long function_pointer);
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer data) {
+ public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexSubImage1D(target, level, xoffset, width, format, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, Buffer data, int data_position, long function_pointer);
+ private static native void nglCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer data, int data_position, long function_pointer);
public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
@@ -324,47 +196,15 @@
}
private static native void nglCompressedTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int imageSize, long data_buffer_offset, long function_pointer);
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer data) {
+ public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data, int data_position, long function_pointer);
+ private static native void nglCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer data, int data_position, long function_pointer);
public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
@@ -374,47 +214,15 @@
}
private static native void nglCompressedTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long data_buffer_offset, long function_pointer);
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer data) {
+ public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 1, function_pointer);
- }
- private static native void nglCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, Buffer data, int data_position, long function_pointer);
+ private static native void nglCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer data, int data_position, long function_pointer);
public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java 2006-11-27 23:01:01 UTC (rev 2684)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java 2006-11-27 23:04:37 UTC (rev 2685)
@@ -48,72 +48,51 @@
int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2;
int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3;
- void glCompressedTexImage1DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize,
+ void glCompressedTexImage1DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize,
+ void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize,
+ void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize,
+ void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize,
+ void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize,
+ void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
void glGetCompressedTexImageARB(@GLenum int target, int lod,
@BufferObject(BufferKind.PackPBO)
@Check
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pImg);
+ @GLvoid
+ ByteBuffer pImg);
}
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java 2006-11-27 23:01:01 UTC (rev 2684)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java 2006-11-27 23:04:37 UTC (rev 2685)
@@ -150,65 +150,47 @@
void glClientActiveTexture(@GLenum int texture);
- void glCompressedTexImage1D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize,
+ void glCompressedTexImage1D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @AutoSize("data") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer data);
+ @GLvoid
+ Buffer data);
- void glCompressedTexImage2D(@GLenum int target, int level,...
[truncated message content] |
|
From: <eli...@us...> - 2006-11-27 23:01:05
|
Revision: 2684
http://svn.sourceforge.net/java-game-lib/?rev=2684&view=rev
Author: elias_naur
Date: 2006-11-27 15:01:01 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Generator: Make sure that @GLvoid types result in proper address calculations at the native side, even though the parameter java type is not java.nio.Buffer
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java 2006-11-27 22:45:28 UTC (rev 2683)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java 2006-11-27 23:01:01 UTC (rev 2684)
@@ -215,7 +215,8 @@
} else {
Class java_type = Utils.getJavaType(param.getType());
if (Buffer.class.isAssignableFrom(java_type)) {
- boolean explicitly_byte_sized = java_type.equals(Buffer.class);
+ boolean explicitly_byte_sized = java_type.equals(Buffer.class) ||
+ translator.getAnnotationType().equals(type_map.getVoidType());
if (explicitly_byte_sized)
writer.print("(((char *)");
if (method.getAnnotation(GenerateAutos.class) != null || (check_annotation != null && check_annotation.canBeNull())) {
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java 2006-11-27 22:45:28 UTC (rev 2683)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeTypeTranslator.java 2006-11-27 23:01:01 UTC (rev 2684)
@@ -77,16 +77,20 @@
StringBuilder signature = new StringBuilder();
if (declaration.getAnnotation(Const.class) != null)
signature.append("const ");
- if (native_types.size() != 1)
- throw new RuntimeException("Expected only one native type for declaration " + declaration +
- ", but got " + native_types.size());
// Use the name of the native type annotation as the C type name
- signature.append(native_types.iterator().next().getSimpleName());
+ signature.append(getAnnotationType().getSimpleName());
if (is_indirect)
signature.append(" *");
return signature.toString();
}
+ public Class getAnnotationType() {
+ if (native_types.size() != 1)
+ throw new RuntimeException("Expected only one native type for declaration " + declaration +
+ ", but got " + native_types.size());
+ return native_types.iterator().next();
+ }
+
public void visitAnnotationType(AnnotationType t) {
throw new RuntimeException(t + " is not allowed");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-27 22:45:32
|
Revision: 2683
http://svn.sourceforge.net/java-game-lib/?rev=2683&view=rev
Author: elias_naur
Date: 2006-11-27 14:45:28 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Remove GL.java and GLImpl.java as they're not updated automatically anyway
Removed Paths:
-------------
trunk/LWJGL/src/java/org/lwjgl/util/GL.java
trunk/LWJGL/src/java/org/lwjgl/util/GLImpl.java
Deleted: trunk/LWJGL/src/java/org/lwjgl/util/GL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/GL.java 2006-11-24 15:30:36 UTC (rev 2682)
+++ trunk/LWJGL/src/java/org/lwjgl/util/GL.java 2006-11-27 22:45:28 UTC (rev 2683)
@@ -1,6758 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.util;
-
-import java.nio.ByteBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
-
-import org.lwjgl.opengl.ARBBufferObject;
-import org.lwjgl.opengl.ARBFragmentProgram;
-import org.lwjgl.opengl.ARBImaging;
-import org.lwjgl.opengl.ARBMatrixPalette;
-import org.lwjgl.opengl.ARBMultisample;
-import org.lwjgl.opengl.ARBMultitexture;
-import org.lwjgl.opengl.ARBOcclusionQuery;
-import org.lwjgl.opengl.ARBPointParameters;
-import org.lwjgl.opengl.ARBShaderObjects;
-import org.lwjgl.opengl.ARBTextureCompression;
-import org.lwjgl.opengl.ARBTransposeMatrix;
-import org.lwjgl.opengl.ARBVertexBlend;
-import org.lwjgl.opengl.ARBVertexProgram;
-import org.lwjgl.opengl.ARBVertexShader;
-import org.lwjgl.opengl.ARBWindowPos;
-import org.lwjgl.opengl.EXTBlendEquationSeparate;
-import org.lwjgl.opengl.EXTBlendFuncSeparate;
-import org.lwjgl.opengl.EXTCompiledVertexArray;
-import org.lwjgl.opengl.EXTDepthBoundsTest;
-import org.lwjgl.opengl.EXTDrawRangeElements;
-import org.lwjgl.opengl.EXTFogCoord;
-import org.lwjgl.opengl.EXTMultiDrawArrays;
-import org.lwjgl.opengl.EXTPointParameters;
-import org.lwjgl.opengl.EXTSecondaryColor;
-import org.lwjgl.opengl.EXTStencilTwoSide;
-import org.lwjgl.opengl.EXTVertexShader;
-import org.lwjgl.opengl.EXTVertexWeighting;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-import org.lwjgl.opengl.GL13;
-import org.lwjgl.opengl.GL14;
-import org.lwjgl.opengl.GL15;
-import org.lwjgl.opengl.GL20;
-
-/**
- * <p/>
- * An extensible GL class that contains all the GL11 through GL15 methods, and all the ARB and EXT extension methods.
- *
- * @author $Author$
- * @version $Revision$
- * $Id$
- */
-public class GL {
-
- /** C'tor */
- public GL() {
- }
-
- /**
- * @param op
- * @param value
- */
- public static void glAccum(int op, float value) {
- GL11.glAccum(op, value);
- }
-
- /**
- * @param func
- * @param ref
- */
- public static void glAlphaFunc(int func, float ref) {
- GL11.glAlphaFunc(func, ref);
- }
-
- /** @param i */
- public static void glArrayElement(int i) {
- GL11.glArrayElement(i);
- }
-
- /** @param mode */
- public static void glBegin(int mode) {
- GL11.glBegin(mode);
- }
-
- /**
- * @param target
- * @param texture
- */
- public static void glBindTexture(int target, int texture) {
- GL11.glBindTexture(target, texture);
- }
-
- /**
- * @param width
- * @param height
- * @param xorig
- * @param yorig
- * @param xmove
- * @param ymove
- * @param bitmap
- */
- public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, ByteBuffer bitmap) {
- GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
- }
-
- /**
- * @param width
- * @param height
- * @param xorig
- * @param yorig
- * @param xmove
- * @param ymove
- * @param buffer_offect
- */
- public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, int buffer_offect) {
- GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, buffer_offect);
- }
-
- /**
- * @param sfactor
- * @param dfactor
- */
- public static void glBlendFunc(int sfactor, int dfactor) {
- GL11.glBlendFunc(sfactor, dfactor);
- }
-
- /** @param list */
- public static void glCallList(int list) {
- GL11.glCallList(list);
- }
-
- /** @param lists */
- public static void glCallLists(ByteBuffer lists) {
- GL11.glCallLists(lists);
- }
-
- /** @param lists */
- public static void glCallLists(ShortBuffer lists) {
- GL11.glCallLists(lists);
- }
-
- /** @param lists */
- public static void glCallLists(IntBuffer lists) {
- GL11.glCallLists(lists);
- }
-
- /** @param mask */
- public static void glClear(int mask) {
- GL11.glClear(mask);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- * @param alpha
- */
- public static void glClearAccum(float red, float green, float blue, float alpha) {
- GL11.glClearAccum(red, green, blue, alpha);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- * @param alpha
- */
- public static void glClearColor(float red, float green, float blue, float alpha) {
- GL11.glClearColor(red, green, blue, alpha);
- }
-
- /** @param depth */
- public static void glClearDepth(double depth) {
- GL11.glClearDepth(depth);
- }
-
- /** @param c */
-/* public static void glClearIndex(float c) {
- GL11.glClearIndex(c);
- }
-*/
- /** @param s */
- public static void glClearStencil(int s) {
- GL11.glClearStencil(s);
- }
-
- /**
- * @param plane
- * @param equation
- */
- public static void glClipPlane(int plane, DoubleBuffer equation) {
- GL11.glClipPlane(plane, equation);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- */
- public static void glColor3b(byte red, byte green, byte blue) {
- GL11.glColor3b(red, green, blue);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- */
- public static void glColor3f(float red, float green, float blue) {
- GL11.glColor3f(red, green, blue);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- */
- public static void glColor3ub(byte red, byte green, byte blue) {
- GL11.glColor3ub(red, green, blue);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- * @param alpha
- */
- public static void glColor4b(byte red, byte green, byte blue, byte alpha) {
- GL11.glColor4b(red, green, blue, alpha);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- * @param alpha
- */
- public static void glColor4f(float red, float green, float blue, float alpha) {
- GL11.glColor4f(red, green, blue, alpha);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- * @param alpha
- */
- public static void glColor4ub(byte red, byte green, byte blue, byte alpha) {
- GL11.glColor4ub(red, green, blue, alpha);
- }
-
- /**
- * @param red
- * @param green
- * @param blue
- * @param alpha
- */
- public static void glColorMask(boolean red, boolean green, boolean blue, boolean alpha) {
- GL11.glColorMask(red, green, blue, alpha);
- }
-
- /**
- * @param face
- * @param mode
- */
- public static void glColorMaterial(int face, int mode) {
- GL11.glColorMaterial(face, mode);
- }
-
- /**
- * @param size
- * @param unsigned
- * @param stride
- * @param pointer
- */
- public static void glColorPointer(int size, boolean unsigned, int stride, ByteBuffer pointer) {
- GL11.glColorPointer(size, unsigned, stride, pointer);
- }
-
- /**
- * @param size
- * @param stride
- * @param pointer
- */
- public static void glColorPointer(int size, int stride, FloatBuffer pointer) {
- GL11.glColorPointer(size, stride, pointer);
- }
-
- /**
- * @param size
- * @param type
- * @param stride
- * @param buffer_offset
- */
- public static void glColorPointer(int size, int type, int stride, int buffer_offset) {
- GL11.glColorPointer(size, type, stride, buffer_offset);
- }
-
- /**
- * @param x
- * @param y
- * @param width
- * @param height
- * @param type
- */
- public static void glCopyPixels(int x, int y, int width, int height, int type) {
- GL11.glCopyPixels(x, y, width, height, type);
- }
-
- /**
- * @param target
- * @param level
- * @param internalFormat
- * @param x
- * @param y
- * @param width
- * @param border
- */
- public static void glCopyTexImage1D(int target, int level, int internalFormat, int x, int y, int width, int border) {
- GL11.glCopyTexImage1D(target, level, internalFormat, x, y, width, border);
- }
-
- /**
- * @param target
- * @param level
- * @param internalFormat
- * @param x
- * @param y
- * @param width
- * @param height
- * @param border
- */
- public static void glCopyTexImage2D(int target, int level, int internalFormat, int x, int y, int width, int height, int border) {
- GL11.glCopyTexImage2D(target, level, internalFormat, x, y, width, height, border);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param x
- * @param y
- * @param width
- */
- public static void glCopyTexSubImage1D(int target, int level, int xoffset, int x, int y, int width) {
- GL11.glCopyTexSubImage1D(target, level, xoffset, x, y, width);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param x
- * @param y
- * @param width
- * @param height
- */
- public static void glCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y, int width, int height) {
- GL11.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
- }
-
- /** @param mode */
- public static void glCullFace(int mode) {
- GL11.glCullFace(mode);
- }
-
- /**
- * @param list
- * @param range
- */
- public static void glDeleteLists(int list, int range) {
- GL11.glDeleteLists(list, range);
- }
-
- /** @param textures */
- public static void glDeleteTextures(IntBuffer textures) {
- GL11.glDeleteTextures(textures);
- }
-
- /** @param func */
- public static void glDepthFunc(int func) {
- GL11.glDepthFunc(func);
- }
-
- /** @param flag */
- public static void glDepthMask(boolean flag) {
- GL11.glDepthMask(flag);
- }
-
- /**
- * @param zNear
- * @param zFar
- */
- public static void glDepthRange(double zNear, double zFar) {
- GL11.glDepthRange(zNear, zFar);
- }
-
- /** @param cap */
- public static void glDisable(int cap) {
- GL11.glDisable(cap);
- }
-
- /** @param cap */
- public static void glDisableClientState(int cap) {
- GL11.glDisableClientState(cap);
- }
-
- /**
- * @param mode
- * @param first
- * @param count
- */
- public static void glDrawArrays(int mode, int first, int count) {
- GL11.glDrawArrays(mode, first, count);
- }
-
- /** @param mode */
- public static void glDrawBuffer(int mode) {
- GL11.glDrawBuffer(mode);
- }
-
- /**
- * @param mode
- * @param indices
- */
- public static void glDrawElements(int mode, ByteBuffer indices) {
- GL11.glDrawElements(mode, indices);
- }
-
- /**
- * @param mode
- * @param count
- * @param type
- * @param buffer_offset
- */
- public static void glDrawElements(int mode, int count, int type, int buffer_offset) {
- GL11.glDrawElements(mode, count, type, buffer_offset);
- }
-
- /**
- * @param mode
- * @param indices
- */
- public static void glDrawElements(int mode, IntBuffer indices) {
- GL11.glDrawElements(mode, indices);
- }
-
- /**
- * @param mode
- * @param indices
- */
- public static void glDrawElements(int mode, ShortBuffer indices) {
- GL11.glDrawElements(mode, indices);
- }
-
- /**
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glDrawPixels(int width, int height, int format, int type, ByteBuffer pixels) {
- GL11.glDrawPixels(width, height, format, type, pixels);
- }
-
- /**
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glDrawPixels(int width, int height, int format, int type, IntBuffer pixels) {
- GL11.glDrawPixels(width, height, format, type, pixels);
- }
-
- /**
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glDrawPixels(int width, int height, int format, int type, ShortBuffer pixels) {
- GL11.glDrawPixels(width, height, format, type, pixels);
- }
-
- /**
- * @param width
- * @param height
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glDrawPixels(int width, int height, int format, int type, int buffer_offset) {
- GL11.glDrawPixels(width, height, format, type, buffer_offset);
- }
-
- /** @param flag */
- public static void glEdgeFlag(boolean flag) {
- GL11.glEdgeFlag(flag);
- }
-
- /**
- * @param stride
- * @param pointer
- */
- public static void glEdgeFlagPointer(int stride, ByteBuffer pointer) {
- GL11.glEdgeFlagPointer(stride, pointer);
- }
-
- /**
- * @param stride
- * @param buffer_offset
- */
- public static void glEdgeFlagPointer(int stride, int buffer_offset) {
- GL11.glEdgeFlagPointer(stride, buffer_offset);
- }
-
- /** @param cap */
- public static void glEnable(int cap) {
- GL11.glEnable(cap);
- }
-
- /** @param cap */
- public static void glEnableClientState(int cap) {
- GL11.glEnableClientState(cap);
- }
-
- /**
- *
- */
- public static void glEnd() {
- GL11.glEnd();
- }
-
- /**
- *
- */
- public static void glEndList() {
- GL11.glEndList();
- }
-
- /** @param u */
- public static void glEvalCoord1f(float u) {
- GL11.glEvalCoord1f(u);
- }
-
- /**
- * @param u
- * @param v
- */
- public static void glEvalCoord2f(float u, float v) {
- GL11.glEvalCoord2f(u, v);
- }
-
- /**
- * @param mode
- * @param i1
- * @param i2
- */
- public static void glEvalMesh1(int mode, int i1, int i2) {
- GL11.glEvalMesh1(mode, i1, i2);
- }
-
- /**
- * @param mode
- * @param i1
- * @param i2
- * @param j1
- * @param j2
- */
- public static void glEvalMesh2(int mode, int i1, int i2, int j1, int j2) {
- GL11.glEvalMesh2(mode, i1, i2, j1, j2);
- }
-
- /** @param i */
- public static void glEvalPoint1(int i) {
- GL11.glEvalPoint1(i);
- }
-
- /**
- * @param i
- * @param j
- */
- public static void glEvalPoint2(int i, int j) {
- GL11.glEvalPoint2(i, j);
- }
-
- /**
- * @param type
- * @param buffer
- */
- public static void glFeedbackBuffer(int type, FloatBuffer buffer) {
- GL11.glFeedbackBuffer(type, buffer);
- }
-
- /**
- *
- */
- public static void glFinish() {
- GL11.glFinish();
- }
-
- /**
- *
- */
- public static void glFlush() {
- GL11.glFlush();
- }
-
- /**
- * @param pname
- * @param params
- */
- public static void glFog(int pname, FloatBuffer params) {
- GL11.glFog(pname, params);
- }
-
- /**
- * @param pname
- * @param params
- */
- public static void glFog(int pname, IntBuffer params) {
- GL11.glFog(pname, params);
- }
-
- /**
- * @param pname
- * @param param
- */
- public static void glFogf(int pname, float param) {
- GL11.glFogf(pname, param);
- }
-
- /**
- * @param pname
- * @param param
- */
- public static void glFogi(int pname, int param) {
- GL11.glFogi(pname, param);
- }
-
- /** @param mode */
- public static void glFrontFace(int mode) {
- GL11.glFrontFace(mode);
- }
-
- /**
- * @param left
- * @param right
- * @param bottom
- * @param top
- * @param zNear
- * @param zFar
- */
- public static void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar) {
- GL11.glFrustum(left, right, bottom, top, zNear, zFar);
- }
-
- /**
- * @param range
- *
- * @return
- */
- public static int glGenLists(int range) {
- return GL11.glGenLists(range);
- }
-
- /** @param textures */
- public static void glGenTextures(IntBuffer textures) {
- GL11.glGenTextures(textures);
- }
-
- /**
- * @param pname
- * @param params
- */
- public static void glGetBoolean(int pname, ByteBuffer params) {
- GL11.glGetBoolean(pname, params);
- }
-
- /**
- * @param plane
- * @param equation
- */
- public static void glGetClipPlane(int plane, DoubleBuffer equation) {
- GL11.glGetClipPlane(plane, equation);
- }
-
- /**
- * @param pname
- * @param params
- */
- public static void glGetDouble(int pname, DoubleBuffer params) {
- GL11.glGetDouble(pname, params);
- }
-
- /** @return */
- public static int glGetError() {
- return GL11.glGetError();
- }
-
- /**
- * @param pname
- * @param params
- */
- public static void glGetFloat(int pname, FloatBuffer params) {
- GL11.glGetFloat(pname, params);
- }
-
- /**
- * @param pname
- * @param params
- */
- public static void glGetInteger(int pname, IntBuffer params) {
- GL11.glGetInteger(pname, params);
- }
-
- /**
- * @param light
- * @param pname
- * @param params
- */
- public static void glGetLight(int light, int pname, FloatBuffer params) {
- GL11.glGetLight(light, pname, params);
- }
-
- /**
- * @param light
- * @param pname
- * @param params
- */
- public static void glGetLight(int light, int pname, IntBuffer params) {
- GL11.glGetLight(light, pname, params);
- }
-
- /**
- * @param target
- * @param query
- * @param v
- */
- public static void glGetMap(int target, int query, FloatBuffer v) {
- GL11.glGetMap(target, query, v);
- }
-
- /**
- * @param target
- * @param query
- * @param v
- */
- public static void glGetMap(int target, int query, IntBuffer v) {
- GL11.glGetMap(target, query, v);
- }
-
- /**
- * @param face
- * @param pname
- * @param params
- */
- public static void glGetMaterial(int face, int pname, FloatBuffer params) {
- GL11.glGetMaterial(face, pname, params);
- }
-
- /**
- * @param face
- * @param pname
- * @param params
- */
- public static void glGetMaterial(int face, int pname, IntBuffer params) {
- GL11.glGetMaterial(face, pname, params);
- }
-
- /**
- * @param map
- * @param values
- */
- public static void glGetPixelMap(int map, FloatBuffer values) {
- GL11.glGetPixelMap(map, values);
- }
-
- /**
- * @param map
- * @param buffer_offset
- */
- public static void glGetPixelMapfv(int map, int buffer_offset) {
- GL11.glGetPixelMapfv(map, buffer_offset);
- }
-
- /**
- * @param map
- * @param values
- */
- public static void glGetPixelMapu(int map, IntBuffer values) {
- GL11.glGetPixelMapu(map, values);
- }
-
- /**
- * @param map
- * @param buffer_offset
- */
- public static void glGetPixelMapuiv(int map, int buffer_offset) {
- GL11.glGetPixelMapuiv(map, buffer_offset);
- }
-
- /**
- * @param map
- * @param values
- */
- public static void glGetPixelMapu(int map, ShortBuffer values) {
- GL11.glGetPixelMapu(map, values);
- }
-
- /**
- * @param map
- * @param buffer_offset
- */
- public static void glGetPixelMapusv(int map, int buffer_offset) {
- GL11.glGetPixelMapusv(map, buffer_offset);
- }
-
- /**
- * @param pname
- * @param size
- *
- * @return
- */
- public static ByteBuffer glGetPointer(int pname, int size) {
- return GL11.glGetPointer(pname, size);
- }
-
- /** @param mask */
- public static void glGetPolygonStipple(ByteBuffer mask) {
- GL11.glGetPolygonStipple(mask);
- }
-
- /**
- * @param buffer_offset
- */
- public static void glGetPolygonStipple(int buffer_offset) {
- GL11.glGetPolygonStipple(buffer_offset);
- }
-
- /**
- * @param name
- *
- * @return
- */
- public static String glGetString(int name) {
- return GL11.glGetString(name);
- }
-
- /**
- * @param coord
- * @param pname
- * @param params
- */
- public static void glGetTexEnv(int coord, int pname, FloatBuffer params) {
- GL11.glGetTexEnv(coord, pname, params);
- }
-
- /**
- * @param coord
- * @param pname
- * @param params
- */
- public static void glGetTexEnv(int coord, int pname, IntBuffer params) {
- GL11.glGetTexEnv(coord, pname, params);
- }
-
- /**
- * @param coord
- * @param pname
- * @param params
- */
- public static void glGetTexGen(int coord, int pname, FloatBuffer params) {
- GL11.glGetTexGen(coord, pname, params);
- }
-
- /**
- * @param coord
- * @param pname
- * @param params
- */
- public static void glGetTexGen(int coord, int pname, IntBuffer params) {
- GL11.glGetTexGen(coord, pname, params);
- }
-
- /**
- * @param target
- * @param level
- * @param format
- * @param type
- * @param pixels
- */
- public static void glGetTexImage(int target, int level, int format, int type, ByteBuffer pixels) {
- GL11.glGetTexImage(target, level, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param format
- * @param type
- * @param pixels
- */
- public static void glGetTexImage(int target, int level, int format, int type, IntBuffer pixels) {
- GL11.glGetTexImage(target, level, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param format
- * @param type
- * @param pixels
- */
- public static void glGetTexImage(int target, int level, int format, int type, ShortBuffer pixels) {
- GL11.glGetTexImage(target, level, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glGetTexImage(int target, int level, int format, int type, int buffer_offset) {
- GL11.glGetTexImage(target, level, format, type, buffer_offset);
- }
- /**
- * @param target
- * @param level
- * @param pname
- * @param params
- */
- public static void glGetTexLevelParameter(int target, int level, int pname, FloatBuffer params) {
- GL11.glGetTexLevelParameter(target, level, pname, params);
- }
-
- /**
- * @param target
- * @param level
- * @param pname
- * @param params
- */
- public static void glGetTexLevelParameter(int target, int level, int pname, IntBuffer params) {
- GL11.glGetTexLevelParameter(target, level, pname, params);
- }
-
- /**
- * @param target
- * @param pname
- * @param params
- */
- public static void glGetTexParameter(int target, int pname, FloatBuffer params) {
- GL11.glGetTexParameter(target, pname, params);
- }
-
- /**
- * @param target
- * @param pname
- * @param params
- */
- public static void glGetTexParameter(int target, int pname, IntBuffer params) {
- GL11.glGetTexParameter(target, pname, params);
- }
-
- /**
- * @param target
- * @param mode
- */
- public static void glHint(int target, int mode) {
- GL11.glHint(target, mode);
- }
-
- /**
- *
- */
- public static void glInitNames() {
- GL11.glInitNames();
- }
-
- /**
- * @param format
- * @param stride
- * @param pointer
- */
- public static void glInterleavedArrays(int format, int stride, ByteBuffer pointer) {
- GL11.glInterleavedArrays(format, stride, pointer);
- }
-
- /**
- * @param format
- * @param stride
- * @param pointer
- */
- public static void glInterleavedArrays(int format, int stride, FloatBuffer pointer) {
- GL11.glInterleavedArrays(format, stride, pointer);
- }
-
- /**
- * @param format
- * @param stride
- * @param buffer_offset
- */
- public static void glInterleavedArrays(int format, int stride, int buffer_offset) {
- GL11.glInterleavedArrays(format, stride, buffer_offset);
- }
-
- /**
- * @param format
- * @param stride
- * @param pointer
- */
- public static void glInterleavedArrays(int format, int stride, IntBuffer pointer) {
- GL11.glInterleavedArrays(format, stride, pointer);
- }
-
- /**
- * @param format
- * @param stride
- * @param pointer
- */
- public static void glInterleavedArrays(int format, int stride, ShortBuffer pointer) {
- GL11.glInterleavedArrays(format, stride, pointer);
- }
-
- /**
- * @param cap
- *
- * @return
- */
- public static boolean glIsEnabled(int cap) {
- return GL11.glIsEnabled(cap);
- }
-
- /**
- * @param list
- *
- * @return
- */
- public static boolean glIsList(int list) {
- return GL11.glIsList(list);
- }
-
- /**
- * @param texture
- *
- * @return
- */
- public static boolean glIsTexture(int texture) {
- return GL11.glIsTexture(texture);
- }
-
- /**
- * @param light
- * @param pname
- * @param params
- */
- public static void glLight(int light, int pname, FloatBuffer params) {
- GL11.glLight(light, pname, params);
- }
-
- /**
- * @param light
- * @param pname
- * @param params
- */
- public static void glLight(int light, int pname, IntBuffer params) {
- GL11.glLight(light, pname, params);
- }
-
- /**
- * @param light
- * @param pname
- * @param param
- */
- public static void glLightf(int light, int pname, float param) {
- GL11.glLightf(light, pname, param);
- }
-
- /**
- * @param light
- * @param pname
- * @param param
- */
- public static void glLighti(int light, int pname, int param) {
- GL11.glLighti(light, pname, param);
- }
-
- /**
- * @param pname
- * @param params
- */
- public static void glLightModel(int pname, FloatBuffer params) {
- GL11.glLightModel(pname, params);
- }
-
- /**
- * @param pname
- * @param params
- */
- public static void glLightModel(int pname, IntBuffer params) {
- GL11.glLightModel(pname, params);
- }
-
- /**
- * @param pname
- * @param param
- */
- public static void glLightModelf(int pname, float param) {
- GL11.glLightModelf(pname, param);
- }
-
- /**
- * @param pname
- * @param param
- */
- public static void glLightModeli(int pname, int param) {
- GL11.glLightModeli(pname, param);
- }
-
- /**
- * @param factor
- * @param pattern
- */
- public static void glLineStipple(int factor, short pattern) {
- GL11.glLineStipple(factor, pattern);
- }
-
- /** @param width */
- public static void glLineWidth(float width) {
- GL11.glLineWidth(width);
- }
-
- /** @param base */
- public static void glListBase(int base) {
- GL11.glListBase(base);
- }
-
- /**
- *
- */
- public static void glLoadIdentity() {
- GL11.glLoadIdentity();
- }
-
- /** @param m */
- public static void glLoadMatrix(FloatBuffer m) {
- GL11.glLoadMatrix(m);
- }
-
- /** @param name */
- public static void glLoadName(int name) {
- GL11.glLoadName(name);
- }
-
- /** @param opcode */
- public static void glLogicOp(int opcode) {
- GL11.glLogicOp(opcode);
- }
-
- /**
- * @param target
- * @param u1
- * @param u2
- * @param stride
- * @param order
- * @param points
- */
- public static void glMap1f(int target, float u1, float u2, int stride, int order, FloatBuffer points) {
- GL11.glMap1f(target, u1, u2, stride, order, points);
- }
-
- /**
- * @param target
- * @param u1
- * @param u2
- * @param ustride
- * @param uorder
- * @param v1
- * @param v2
- * @param vstride
- * @param vorder
- * @param points
- */
- public static void glMap2f(int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, FloatBuffer points) {
- GL11.glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
- }
-
- /**
- * @param un
- * @param u1
- * @param u2
- */
- public static void glMapGrid1f(int un, float u1, float u2) {
- GL11.glMapGrid1f(un, u1, u2);
- }
-
- /**
- * @param un
- * @param u1
- * @param u2
- * @param vn
- * @param v1
- * @param v2
- */
- public static void glMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2) {
- GL11.glMapGrid2f(un, u1, u2, vn, v1, v2);
- }
-
- /**
- * @param face
- * @param pname
- * @param params
- */
- public static void glMaterial(int face, int pname, FloatBuffer params) {
- GL11.glMaterial(face, pname, params);
- }
-
- /**
- * @param face
- * @param pname
- * @param params
- */
- public static void glMaterial(int face, int pname, IntBuffer params) {
- GL11.glMaterial(face, pname, params);
- }
-
- /**
- * @param face
- * @param pname
- * @param param
- */
- public static void glMaterialf(int face, int pname, float param) {
- GL11.glMaterialf(face, pname, param);
- }
-
- /**
- * @param face
- * @param pname
- * @param param
- */
- public static void glMateriali(int face, int pname, int param) {
- GL11.glMateriali(face, pname, param);
- }
-
- /** @param mode */
- public static void glMatrixMode(int mode) {
- GL11.glMatrixMode(mode);
- }
-
- /** @param m */
- public static void glMultMatrix(FloatBuffer m) {
- GL11.glMultMatrix(m);
- }
-
- /**
- * @param list
- * @param mode
- */
- public static void glNewList(int list, int mode) {
- GL11.glNewList(list, mode);
- }
-
- /**
- * @param nx
- * @param ny
- * @param nz
- */
- public static void glNormal3b(byte nx, byte ny, byte nz) {
- GL11.glNormal3b(nx, ny, nz);
- }
-
- /**
- * @param nx
- * @param ny
- * @param nz
- */
- public static void glNormal3f(float nx, float ny, float nz) {
- GL11.glNormal3f(nx, ny, nz);
- }
-
- /**
- * @param nx
- * @param ny
- * @param nz
- */
- public static void glNormal3i(int nx, int ny, int nz) {
- GL11.glNormal3i(nx, ny, nz);
- }
-
- /**
- * @param stride
- * @param pointer
- */
- public static void glNormalPointer(int stride, ByteBuffer pointer) {
- GL11.glNormalPointer(stride, pointer);
- }
-
- /**
- * @param stride
- * @param pointer
- */
- public static void glNormalPointer(int stride, FloatBuffer pointer) {
- GL11.glNormalPointer(stride, pointer);
- }
-
- /**
- * @param type
- * @param stride
- * @param buffer_offset
- */
- public static void glNormalPointer(int type, int stride, int buffer_offset) {
- GL11.glNormalPointer(type, stride, buffer_offset);
- }
-
- /**
- * @param stride
- * @param pointer
- */
- public static void glNormalPointer(int stride, IntBuffer pointer) {
- GL11.glNormalPointer(stride, pointer);
- }
-
- /**
- * @param left
- * @param right
- * @param bottom
- * @param top
- * @param zNear
- * @param zFar
- */
- public static void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar) {
- GL11.glOrtho(left, right, bottom, top, zNear, zFar);
- }
-
- /** @param token */
- public static void glPassThrough(float token) {
- GL11.glPassThrough(token);
- }
-
- /**
- * @param map
- * @param values
- */
- public static void glPixelMap(int map, FloatBuffer values) {
- GL11.glPixelMap(map, values);
- }
-
- /**
- * @param map
- * @param mapsize
- * @param buffer_offset
- */
- public static void glPixelMapfv(int map, int mapsize, int buffer_offset) {
- GL11.glPixelMapfv(map, mapsize, buffer_offset);
- }
-
- /**
- * @param map
- * @param values
- */
- public static void glPixelMapu(int map, IntBuffer values) {
- GL11.glPixelMapu(map, values);
- }
-
- /**
- * @param map
- * @param mapsize
- * @param buffer_offset
- */
- public static void glPixelMapuiv(int map, int mapsize, int buffer_offset) {
- GL11.glPixelMapuiv(map, mapsize, buffer_offset);
- }
-
- /**
- * @param map
- * @param values
- */
- public static void glPixelMapu(int map, ShortBuffer values) {
- GL11.glPixelMapu(map, values);
- }
-
- /**
- * @param map
- * @param mapsize
- * @param buffer_offset
- */
- public static void glPixelMapusv(int map, int mapsize, int buffer_offset) {
- GL11.glPixelMapusv(map, mapsize, buffer_offset);
- }
-
- /**
- * @param pname
- * @param param
- */
- public static void glPixelStoref(int pname, float param) {
- GL11.glPixelStoref(pname, param);
- }
-
- /**
- * @param pname
- * @param param
- */
- public static void glPixelStorei(int pname, int param) {
- GL11.glPixelStorei(pname, param);
- }
-
- /**
- * @param pname
- * @param param
- */
- public static void glPixelTransferf(int pname, float param) {
- GL11.glPixelTransferf(pname, param);
- }
-
- /**
- * @param pname
- * @param param
- */
- public static void glPixelTransferi(int pname, int param) {
- GL11.glPixelTransferi(pname, param);
- }
-
- /**
- * @param xfactor
- * @param yfactor
- */
- public static void glPixelZoom(float xfactor, float yfactor) {
- GL11.glPixelZoom(xfactor, yfactor);
- }
-
- /** @param size */
- public static void glPointSize(float size) {
- GL11.glPointSize(size);
- }
-
- /**
- * @param face
- * @param mode
- */
- public static void glPolygonMode(int face, int mode) {
- GL11.glPolygonMode(face, mode);
- }
-
- /**
- * @param factor
- * @param units
- */
- public static void glPolygonOffset(float factor, float units) {
- GL11.glPolygonOffset(factor, units);
- }
-
- /** @param mask */
- public static void glPolygonStipple(ByteBuffer mask) {
- GL11.glPolygonStipple(mask);
- }
-
- /**
- * @param buffer_offset
- */
- public static void glPolygonStipple(int buffer_offset) {
- GL11.glPolygonStipple(buffer_offset);
- }
-
- /**
- *
- */
- public static void glPopAttrib() {
- GL11.glPopAttrib();
- }
-
- /**
- *
- */
- public static void glPopClientAttrib() {
- GL11.glPopClientAttrib();
- }
-
- /**
- *
- */
- public static void glPopMatrix() {
- GL11.glPopMatrix();
- }
-
- /**
- *
- */
- public static void glPopName() {
- GL11.glPopName();
- }
-
- /** @param mask */
- public static void glPushAttrib(int mask) {
- GL11.glPushAttrib(mask);
- }
-
- /** @param mask */
- public static void glPushClientAttrib(int mask) {
- GL11.glPushClientAttrib(mask);
- }
-
- /**
- *
- */
- public static void glPushMatrix() {
- GL11.glPushMatrix();
- }
-
- /** @param name */
- public static void glPushName(int name) {
- GL11.glPushName(name);
- }
-
- /**
- * @param x
- * @param y
- */
- public static void glRasterPos2f(float x, float y) {
- GL11.glRasterPos2f(x, y);
- }
-
- /**
- * @param x
- * @param y
- */
- public static void glRasterPos2i(int x, int y) {
- GL11.glRasterPos2i(x, y);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- */
- public static void glRasterPos3f(float x, float y, float z) {
- GL11.glRasterPos3f(x, y, z);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- */
- public static void glRasterPos3i(int x, int y, int z) {
- GL11.glRasterPos3i(x, y, z);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- * @param w
- */
- public static void glRasterPos4f(float x, float y, float z, float w) {
- GL11.glRasterPos4f(x, y, z, w);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- * @param w
- */
- public static void glRasterPos4i(int x, int y, int z, int w) {
- GL11.glRasterPos4i(x, y, z, w);
- }
-
- /** @param mode */
- public static void glReadBuffer(int mode) {
- GL11.glReadBuffer(mode);
- }
-
- /**
- * @param x
- * @param y
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer pixels) {
- GL11.glReadPixels(x, y, width, height, format, type, pixels);
- }
-
- /**
- * @param x
- * @param y
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glReadPixels(int x, int y, int width, int height, int format, int type, IntBuffer pixels) {
- GL11.glReadPixels(x, y, width, height, format, type, pixels);
- }
-
- /**
- * @param x
- * @param y
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glReadPixels(int x, int y, int width, int height, int format, int type, ShortBuffer pixels) {
- GL11.glReadPixels(x, y, width, height, format, type, pixels);
- }
-
- /**
- * @param x
- * @param y
- * @param width
- * @param height
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glReadPixels(int x, int y, int width, int height, int format, int type, int buffer_offset) {
- GL11.glReadPixels(x, y, width, height, format, type, buffer_offset);
- }
-
- /**
- * @param x1
- * @param y1
- * @param x2
- * @param y2
- */
- public static void glRectf(float x1, float y1, float x2, float y2) {
- GL11.glRectf(x1, y1, x2, y2);
- }
-
- /**
- * @param x1
- * @param y1
- * @param x2
- * @param y2
- */
- public static void glRecti(int x1, int y1, int x2, int y2) {
- GL11.glRecti(x1, y1, x2, y2);
- }
-
- /**
- * @param mode
- *
- * @return
- */
- public static int glRenderMode(int mode) {
- return GL11.glRenderMode(mode);
- }
-
- /**
- * @param angle
- * @param x
- * @param y
- * @param z
- */
- public static void glRotatef(float angle, float x, float y, float z) {
- GL11.glRotatef(angle, x, y, z);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- */
- public static void glScalef(float x, float y, float z) {
- GL11.glScalef(x, y, z);
- }
-
- /**
- * @param x
- * @param y
- * @param width
- * @param height
- */
- public static void glScissor(int x, int y, int width, int height) {
- GL11.glScissor(x, y, width, height);
- }
-
- /** @param buffer */
- public static void glSelectBuffer(IntBuffer buffer) {
- GL11.glSelectBuffer(buffer);
- }
-
- /** @param mode */
- public static void glShadeModel(int mode) {
- GL11.glShadeModel(mode);
- }
-
- /**
- * @param func
- * @param ref
- * @param mask
- */
- public static void glStencilFunc(int func, int ref, int mask) {
- GL11.glStencilFunc(func, ref, mask);
- }
-
- /** @param mask */
- public static void glStencilMask(int mask) {
- GL11.glStencilMask(mask);
- }
-
- /**
- * @param fail
- * @param zfail
- * @param zpass
- */
- public static void glStencilOp(int fail, int zfail, int zpass) {
- GL11.glStencilOp(fail, zfail, zpass);
- }
-
- /** @param s */
- public static void glTexCoord1f(float s) {
- GL11.glTexCoord1f(s);
- }
-
- /**
- * @param s
- * @param t
- */
- public static void glTexCoord2f(float s, float t) {
- GL11.glTexCoord2f(s, t);
- }
-
- /**
- * @param s
- * @param t
- * @param r
- */
- public static void glTexCoord3f(float s, float t, float r) {
- GL11.glTexCoord3f(s, t, r);
- }
-
- /**
- * @param s
- * @param t
- * @param r
- * @param q
- */
- public static void glTexCoord4f(float s, float t, float r, float q) {
- GL11.glTexCoord4f(s, t, r, q);
- }
-
- /**
- * @param size
- * @param stride
- * @param pointer
- */
- public static void glTexCoordPointer(int size, int stride, FloatBuffer pointer) {
- GL11.glTexCoordPointer(size, stride, pointer);
- }
-
- /**
- * @param size
- * @param type
- * @param stride
- * @param buffer_offset
- */
- public static void glTexCoordPointer(int size, int type, int stride, int buffer_offset) {
- GL11.glTexCoordPointer(size, type, stride, buffer_offset);
- }
-
- /**
- * @param target
- * @param pname
- * @param params
- */
- public static void glTexEnv(int target, int pname, FloatBuffer params) {
- GL11.glTexEnv(target, pname, params);
- }
-
- /**
- * @param target
- * @param pname
- * @param params
- */
- public static void glTexEnv(int target, int pname, IntBuffer params) {
- GL11.glTexEnv(target, pname, params);
- }
-
- /**
- * @param target
- * @param pname
- * @param param
- */
- public static void glTexEnvf(int target, int pname, float param) {
- GL11.glTexEnvf(target, pname, param);
- }
-
- /**
- * @param target
- * @param pname
- * @param param
- */
- public static void glTexEnvi(int target, int pname, int param) {
- GL11.glTexEnvi(target, pname, param);
- }
-
- /**
- * @param coord
- * @param pname
- * @param params
- */
- public static void glTexGen(int coord, int pname, FloatBuffer params) {
- GL11.glTexGen(coord, pname, params);
- }
-
- /**
- * @param coord
- * @param pname
- * @param params
- */
- public static void glTexGen(int coord, int pname, IntBuffer params) {
- GL11.glTexGen(coord, pname, params);
- }
-
- /**
- * @param coord
- * @param pname
- * @param param
- */
- public static void glTexGenf(int coord, int pname, float param) {
- GL11.glTexGenf(coord, pname, param);
- }
-
- /**
- * @param coord
- * @param pname
- * @param param
- */
- public static void glTexGeni(int coord, int pname, int param) {
- GL11.glTexGeni(coord, pname, param);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ByteBuffer pixels) {
- GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, FloatBuffer pixels) {
- GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, IntBuffer pixels) {
- GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ShortBuffer pixels) {
- GL11.glTexImage1D(target, level, internalformat, width, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, int buffer_offset) {
- GL11.glTexImage1D(target, level, internalformat, width, border, format, type, buffer_offset);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param height
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ByteBuffer pixels) {
- GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param height
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, FloatBuffer pixels) {
- GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param height
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, IntBuffer pixels) {
- GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param height
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ShortBuffer pixels) {
- GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param height
- * @param border
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, int buffer_offset) {
- GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, buffer_offset);
- }
-
- /**
- * @param target
- * @param pname
- * @param param
- */
- public static void glTexParameter(int target, int pname, FloatBuffer param) {
- GL11.glTexParameter(target, pname, param);
- }
-
- /**
- * @param target
- * @param pname
- * @param param
- */
- public static void glTexParameter(int target, int pname, IntBuffer param) {
- GL11.glTexParameter(target, pname, param);
- }
-
- /**
- * @param target
- * @param pname
- * @param param
- */
- public static void glTexParameterf(int target, int pname, float param) {
- GL11.glTexParameterf(target, pname, param);
- }
-
- /**
- * @param target
- * @param pname
- * @param param
- */
- public static void glTexParameteri(int target, int pname, int param) {
- GL11.glTexParameteri(target, pname, param);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param width
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ByteBuffer pixels) {
- GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param width
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, IntBuffer pixels) {
- GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param width
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ShortBuffer pixels) {
- GL11.glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param width
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, int buffer_offset) {
- GL11.glTexSubImage1D(target, level, xoffset, width, format, type, buffer_offset);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer pixels) {
- GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, IntBuffer pixels) {
- GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param width
- * @param height
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ShortBuffer pixels) {
- GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param width
- * @param height
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int buffer_offset) {
- GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, buffer_offset);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- */
- public static void glTranslatef(float x, float y, float z) {
- GL11.glTranslatef(x, y, z);
- }
-
- /**
- * @param x
- * @param y
- */
- public static void glVertex2f(float x, float y) {
- GL11.glVertex2f(x, y);
- }
-
- /**
- * @param x
- * @param y
- */
- public static void glVertex2i(int x, int y) {
- GL11.glVertex2i(x, y);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- */
- public static void glVertex3f(float x, float y, float z) {
- GL11.glVertex3f(x, y, z);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- */
- public static void glVertex3i(int x, int y, int z) {
- GL11.glVertex3i(x, y, z);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- * @param w
- */
- public static void glVertex4f(float x, float y, float z, float w) {
- GL11.glVertex4f(x, y, z, w);
- }
-
- /**
- * @param x
- * @param y
- * @param z
- * @param w
- */
- public static void glVertex4i(int x, int y, int z, int w) {
- GL11.glVertex4i(x, y, z, w);
- }
-
- /**
- * @param size
- * @param stride
- * @param pointer
- */
- public static void glVertexPointer(int size, int stride, FloatBuffer pointer) {
- GL11.glVertexPointer(size, stride, pointer);
- }
-
- /**
- * @param size
- * @param type
- * @param stride
- * @param buffer_offset
- */
- public static void glVertexPointer(int size, int type, int stride, int buffer_offset) {
- GL11.glVertexPointer(size, type, stride, buffer_offset);
- }
-
- /**
- * @param size
- * @param stride
- * @param pointer
- */
- public static void glVertexPointer(int size, int stride, IntBuffer pointer) {
- GL11.glVertexPointer(size, stride, pointer);
- }
-
- /**
- * @param x
- * @param y
- * @param width
- * @param height
- */
- public static void glViewport(int x, int y, int width, int height) {
- GL11.glViewport(x, y, width, height);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param zoffset
- * @param x
- * @param y
- * @param width
- * @param height
- */
- public static void glCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height) {
- GL12.glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
- }
-
- /**
- * @param mode
- * @param start
- * @param end
- * @param indices
- */
- public static void glDrawRangeElements(int mode, int start, int end, ByteBuffer indices) {
- GL12.glDrawRangeElements(mode, start, end, indices);
- }
-
- /**
- * @param mode
- * @param start
- * @param end
- * @param count
- * @param type
- * @param buffer_offset
- */
- public static void glDrawRangeElements(int mode, int start, int end, int count, int type, int buffer_offset) {
- GL12.glDrawRangeElements(mode, start, end, count, type, buffer_offset);
- }
-
- /**
- * @param mode
- * @param start
- * @param end
- * @param indices
- */
- public static void glDrawRangeElements(int mode, int start, int end, IntBuffer indices) {
- GL12.glDrawRangeElements(mode, start, end, indices);
- }
-
- /**
- * @param mode
- * @param start
- * @param end
- * @param indices
- */
- public static void glDrawRangeElements(int mode, int start, int end, ShortBuffer indices) {
- GL12.glDrawRangeElements(mode, start, end, indices);
- }
-
- /**
- * @param target
- * @param level
- * @param internalFormat
- * @param width
- * @param height
- * @param depth
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ByteBuffer pixels) {
- GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalFormat
- * @param width
- * @param height
- * @param depth
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, FloatBuffer pixels) {
- GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalFormat
- * @param width
- * @param height
- * @param depth
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, IntBuffer pixels) {
- GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalFormat
- * @param width
- * @param height
- * @param depth
- * @param border
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ShortBuffer pixels) {
- GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param internalFormat
- * @param width
- * @param height
- * @param depth
- * @param border
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int buffer_offset) {
- GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, buffer_offset);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param zoffset
- * @param width
- * @param height
- * @param depth
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ByteBuffer pixels) {
- GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param zoffset
- * @param width
- * @param height
- * @param depth
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, FloatBuffer pixels) {
- GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param zoffset
- * @param width
- * @param height
- * @param depth
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, IntBuffer pixels) {
- GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param zoffset
- * @param width
- * @param height
- * @param depth
- * @param format
- * @param type
- * @param pixels
- */
- public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ShortBuffer pixels) {
- GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
- }
-
- /**
- * @param target
- * @param level
- * @param xoffset
- * @param yoffset
- * @param zoffset
- * @param width
- * @param height
- * @param depth
- * @param format
- * @param type
- * @param buffer_offset
- */
- public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int buffer_offset) {
- GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, buffer_offset);
- }
-
- /** @param texture */
- public static void glActiveTexture(int texture) {
- GL13.glActiveTexture(texture);
- }
-
- /** @param texture */
- public static void glClientActiveTexture(int texture) {
- GL13.glClientActiveTexture(texture);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param imageSize
- * @param data
- */
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer data) {
- GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param imageSize
- * @param data
- */
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) {
- GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param imageSize
- * @param data
- */
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer data) {
- GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param imageSize
- * @param data
- */
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) {
- GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param border
- * @param imageSize
- * @param buffer_offset
- */
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int buffer_offset) {
- GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, buffer_offset);
- }
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param height
- * @param border
- * @param imageSize
- * @param data
- */
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer data) {
- GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param height
- * @param border
- * @param imageSize
- * @param data
- */
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) {
- GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
- }
-
- /**
- * @param target
- * @param level
- * @param internalformat
- * @param width
- * @param height
- * @param border
- * @param imageSize
- * @param data
- */
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, in...
[truncated message content] |
|
From: Artists <qco...@cp...> - 2006-11-25 08:33:54
|
<!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> <DIV align=3Dleft><FONT face=3DArial size=3D3>We Told You!!! <b>BLNM Volume UP 4000% and Price Up 47.06%!</b></FONT></DIV> <DIV align=3Dleft><FONT face=3DArial size=3D3>Can You feel The Rocket!??</FONT></DIV><BR> <DIV align=3Dleft><FONT face=3DArial size=3D2><b>Company:</b> Bralorne Mining Company</FONT></DIV> <DIV align=3Dleft><FONT face=3DArial size=3D2><b>Symbol:</b> BLNM.OB</FONT></DIV> <DIV align=3Dleft><FONT face=3DArial size=3D2><b>Price:</b> $0.25 (+47.06% in 1 day)</FONT></DIV> <DIV align=3Dleft><FONT face=3DArial size=3D2><b>3 Day Target:</b> $0.75</FONT></DIV><BR> <DIV align=3Dleft><FONT face=3DArial size=3D2><b>BLNM.OB</b> recently announced taking control Beijing QTC, Beijing's largest provider of Public Pay Phones and controls 34% of the total market. Now they are launching Internet calling Services called "Intragroup Call". They are working with companies such as Ericsson, SONY, JVC, AIRBUS, Panasonic and Citizen.</FONT></DIV><BR> <DIV align=3Dleft><FONT face=3DArial size=3D2>We knew this was going to take off but we did not expect it till Monday due to the holiday. Well today we saw it <b>climb 68% in price</b> and the <b>volume is up over 4000%</b>. WOW!</FONT></DIV><BR> <DIV align=3Dleft><FONT face=3DArial size=3D2>We have been told that there will be big news beginning of the week. Monday this will be off the scale. Set your buys for first thing Monday morning. We could see the 3 day projection hit in one day at this rate. Waste no time.</FONT></DIV><BR> <DIV align=3Dleft><FONT face=3DArial size=3D2><b>Grab BLNM first thing Monday Morning!!</b></FONT></DIV> </BODY> </HTML> |
|
From: <eli...@us...> - 2006-11-24 15:30:38
|
Revision: 2682
http://svn.sourceforge.net/java-game-lib/?rev=2682&view=rev
Author: elias_naur
Date: 2006-11-24 07:30:36 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Linux: Tweak LinuxAWTInput
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java 2006-11-24 15:21:02 UTC (rev 2681)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java 2006-11-24 15:30:36 UTC (rev 2682)
@@ -170,10 +170,10 @@
public synchronized void grabMouse(boolean grab) {
if (grab != isGrabbed()) {
- super.grabMouse(grab);
if (cached_mouse != null)
cached_mouse.changeGrabbed(grab, shouldGrab());
ungrabInputLocked();
+ super.grabMouse(grab);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-24 15:21:05
|
Revision: 2681
http://svn.sourceforge.net/java-game-lib/?rev=2681&view=rev
Author: elias_naur
Date: 2006-11-24 07:21:02 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Windows: Make sure that the cursor position doesn't jump when switching grab mode
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-24 15:10:15 UTC (rev 2680)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-24 15:21:02 UTC (rev 2681)
@@ -142,12 +142,12 @@
public synchronized void grabMouse(boolean grab) {
if (grab != isGrabbed()) {
- super.grabMouse(grab);
/* Only ungrab since grabbing can only occur in processInput
* when the hwnd is guaranteed valid
*/
if (cached_mouse != null && !grab)
grab(grab);
+ super.grabMouse(grab);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-24 15:10:17
|
Revision: 2680
http://svn.sourceforge.net/java-game-lib/?rev=2680&view=rev
Author: elias_naur
Date: 2006-11-24 07:10:15 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Windows: Fix potential NPE
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2006-11-24 15:03:05 UTC (rev 2679)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2006-11-24 15:10:15 UTC (rev 2680)
@@ -300,7 +300,7 @@
* is maximized helps some gfx recover from fullscreen
*/
try {
- if (Display.getContext().isCurrent())
+ if (Display.getContext() != null && Display.getContext().isCurrent())
Display.getContext().makeCurrent();
} catch (LWJGLException e) {
LWJGLUtil.log("Exception occurred while trying to make context current: " + e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-24 15:03:07
|
Revision: 2679
http://svn.sourceforge.net/java-game-lib/?rev=2679&view=rev
Author: elias_naur
Date: 2006-11-24 07:03:05 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Compile fix
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2006-11-24 14:53:01 UTC (rev 2678)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2006-11-24 15:03:05 UTC (rev 2679)
@@ -138,8 +138,6 @@
LWJGLUtil.log("Failed to query pointer location: " + e.getCause());
} catch (NoSuchMethodException e) {
LWJGLUtil.log("Failed to query pointer location: " + e);
- } catch (IllegalAccessException e) {
- LWJGLUtil.log("Failed to query pointer location: " + e);
} catch (ClassNotFoundException e) {
LWJGLUtil.log("Failed to query pointer location: " + e);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-24 14:53:03
|
Revision: 2678
http://svn.sourceforge.net/java-game-lib/?rev=2678&view=rev
Author: elias_naur
Date: 2006-11-24 06:53:01 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Make sure that the cursor position doesn't jump when switching grab mode
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2006-11-24 12:05:46 UTC (rev 2677)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2006-11-24 14:53:01 UTC (rev 2678)
@@ -570,6 +570,10 @@
isGrabbed = grab;
if (isCreated()) {
implementation.grabMouse(isGrabbed);
+ // Get latest values from native side
+ poll();
+ event_x = x;
+ event_y = y;
resetMouse();
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2006-11-24 12:05:46 UTC (rev 2677)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2006-11-24 14:53:01 UTC (rev 2678)
@@ -37,7 +37,9 @@
import java.awt.Cursor;
import java.awt.Component;
+import java.awt.GraphicsDevice;
import java.awt.Dimension;
+import java.awt.IllegalComponentStateException;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Robot;
@@ -106,12 +108,75 @@
}
}
+ private static int transformY(Component component, int y) {
+ return component.getHeight() - 1 - y;
+ }
+
+ /**
+ * Use reflection to access the JDK 1.5 pointer location, if possible and
+ * only if the given component is on the same screen as the cursor. Return
+ * null otherwise.
+ */
+ private static Point getPointerLocation(final Component component) {
+ try {
+ final Class MouseInfo_class = Class.forName("java.awt.MouseInfo");
+ final Method getPointerInfo_method = MouseInfo_class.getMethod("getPointerInfo", null);
+ final Class PointerInfo_class = Class.forName("java.awt.PointerInfo");
+ final Method getDevice_method = PointerInfo_class.getMethod("getDevice", null);
+ final Method getLocation_method = PointerInfo_class.getMethod("getLocation", null);
+ return (Point)AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ public final Object run() throws Exception {
+ Object pointer_info = getPointerInfo_method.invoke(null, null);
+ GraphicsDevice device = (GraphicsDevice)getDevice_method.invoke(pointer_info, null);
+ if (device == component.getGraphicsConfiguration().getDevice()) {
+ return (Point)getLocation_method.invoke(pointer_info, null);
+ } else
+ return null;
+ }
+ });
+ } catch (PrivilegedActionException e) {
+ LWJGLUtil.log("Failed to query pointer location: " + e.getCause());
+ } catch (NoSuchMethodException e) {
+ LWJGLUtil.log("Failed to query pointer location: " + e);
+ } catch (IllegalAccessException e) {
+ LWJGLUtil.log("Failed to query pointer location: " + e);
+ } catch (ClassNotFoundException e) {
+ LWJGLUtil.log("Failed to query pointer location: " + e);
+ }
+ return null;
+ }
+
+ /**
+ * Use the 1.5 API to get the cursor position relative to the component. Return null
+ * if it fails (JDK <= 1.4).
+ */
+ public static Point getCursorPosition(Component component) {
+ try {
+ Point pointer_location = getPointerLocation(component);
+ if (pointer_location != null) {
+ Point location = component.getLocationOnScreen();
+ pointer_location.translate(-location.x, -location.y);
+ pointer_location.move(pointer_location.x, transformY(component, pointer_location.y));
+ return pointer_location;
+ }
+ } catch (IllegalComponentStateException e) {
+ LWJGLUtil.log("Failed to set cursor position: " + e);
+ } catch (NoClassDefFoundError e) { // Not JDK 1.5
+ LWJGLUtil.log("Failed to query cursor position: " + e);
+ }
+ return null;
+ }
+
public static void setCursorPosition(Component component, Robot robot, int x, int y) {
if (robot != null) {
- Point location = component.getLocationOnScreen();
- int transformed_x = location.x + x;
- int transformed_y = location.y + component.getHeight() - 1 - y;
- robot.mouseMove(transformed_x, transformed_y);
+ try {
+ Point location = component.getLocationOnScreen();
+ int transformed_x = location.x + x;
+ int transformed_y = location.y + transformY(component, y);
+ robot.mouseMove(transformed_x, transformed_y);
+ } catch (IllegalComponentStateException e) {
+ LWJGLUtil.log("Failed to set cursor position: " + e);
+ }
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2006-11-24 12:05:46 UTC (rev 2677)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2006-11-24 14:53:01 UTC (rev 2678)
@@ -173,7 +173,15 @@
public void changeGrabbed(boolean grab, boolean warp_pointer) {
reset();
long root_window = nQueryPointer(display, window, query_pointer_buffer);
- doHandlePointerMotion(grab, warp_pointer, root_window, query_pointer_buffer.get(0), query_pointer_buffer.get(1), query_pointer_buffer.get(2), query_pointer_buffer.get(3), last_event_nanos);
+
+ int root_x = query_pointer_buffer.get(0);
+ int root_y = query_pointer_buffer.get(1);
+ int win_x = query_pointer_buffer.get(2);
+ int win_y = query_pointer_buffer.get(3);
+ // Pretend that the cursor never moved
+ last_x = win_x;
+ last_y = transformY(win_y);
+ doHandlePointerMotion(grab, warp_pointer, root_window, root_x, root_y, win_x, win_y, last_event_nanos);
}
public int getButtonCount() {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java 2006-11-24 12:05:46 UTC (rev 2677)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java 2006-11-24 14:53:01 UTC (rev 2678)
@@ -42,6 +42,7 @@
import java.awt.event.MouseWheelEvent;
import java.awt.event.MouseWheelListener;
import java.awt.Component;
+import java.awt.Point;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
@@ -112,6 +113,11 @@
protected void resetCursorToCenter() {
clearEvents();
accum_dx = accum_dy = 0;
+ Point cursor_location = AWTUtil.getCursorPosition(component);
+ if (cursor_location != null) {
+ last_x = cursor_location.x;
+ last_y = cursor_location.y;
+ }
}
private void putMouseEvent(byte button, byte state, int dz, long nanos) {
Modified: trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java 2006-11-24 12:05:46 UTC (rev 2677)
+++ trunk/LWJGL/src/java/org/lwjgl/test/input/MouseTest.java 2006-11-24 14:53:01 UTC (rev 2678)
@@ -242,6 +242,8 @@
if(Mouse.getEventButton() != -1 && Mouse.getEventButtonState()) {
lastButton = Mouse.getEventButton();
}
+ if (Mouse.getEventDX() != 0 || Mouse.getEventDY() != 0)
+ System.out.println("Mouse.getEventDX() = " + Mouse.getEventDX() + " | Mouse.getEventDY() = " + Mouse.getEventDY());
}
updateState();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-24 12:05:48
|
Revision: 2677
http://svn.sourceforge.net/java-game-lib/?rev=2677&view=rev
Author: elias_naur
Date: 2006-11-24 04:05:46 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Fix locking in MouseEventQueue
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java 2006-11-24 10:18:36 UTC (rev 2676)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MouseEventQueue.java 2006-11-24 12:05:46 UTC (rev 2677)
@@ -79,14 +79,14 @@
this.component = component;
}
- public void register() {
+ public synchronized void register() {
resetCursorToCenter();
component.addMouseListener(this);
component.addMouseMotionListener(this);
component.addMouseWheelListener(this);
}
- public void unregister() {
+ public synchronized void unregister() {
component.removeMouseListener(this);
component.removeMouseMotionListener(this);
component.removeMouseWheelListener(this);
@@ -143,7 +143,7 @@
buttons_buffer.position(old_position);
}
- private synchronized void setCursorPos(int x, int y, long nanos) {
+ private void setCursorPos(int x, int y, long nanos) {
y = transformY(y);
if ( grabbed )
return;
@@ -212,16 +212,16 @@
setButton(button, state, e.getWhen()*1000000);
}
- public void mousePressed(MouseEvent e) {
+ public synchronized void mousePressed(MouseEvent e) {
handleButton(e);
}
- private synchronized void setButton(byte button, byte state, long nanos) {
+ private void setButton(byte button, byte state, long nanos) {
buttons[button] = state;
putMouseEvent(button, state, 0, nanos);
}
- public void mouseReleased(MouseEvent e) {
+ public synchronized void mouseReleased(MouseEvent e) {
handleButton(e);
}
@@ -233,15 +233,15 @@
}
}
- public void mouseDragged(MouseEvent e) {
+ public synchronized void mouseDragged(MouseEvent e) {
handleMotion(e);
}
- public void mouseMoved(MouseEvent e) {
+ public synchronized void mouseMoved(MouseEvent e) {
handleMotion(e);
}
- private synchronized void handleWheel(int amount, long nanos) {
+ private void handleWheel(int amount, long nanos) {
accum_dz += amount;
putMouseEvent((byte)-1, (byte)0, amount, nanos);
}
@@ -249,7 +249,7 @@
protected void updateDeltas(long nanos) {
}
- public void mouseWheelMoved(MouseWheelEvent e) {
+ public synchronized void mouseWheelMoved(MouseWheelEvent e) {
int wheel_amount = -e.getWheelRotation() * WHEEL_SCALE;
handleWheel(wheel_amount, e.getWhen()*1000000);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-24 10:18:41
|
Revision: 2676
http://svn.sourceforge.net/java-game-lib/?rev=2676&view=rev
Author: elias_naur
Date: 2006-11-24 02:18:36 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Synchronize Keyboard and Mouse to avoid problems with AWTInputAdapter based usage
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2006-11-20 20:07:29 UTC (rev 2675)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Keyboard.java 2006-11-24 10:18:36 UTC (rev 2676)
@@ -306,7 +306,7 @@
*
* @throws LWJGLException if the keyboard could not be created for any reason
*/
- public static void create() throws LWJGLException {
+ public static synchronized void create() throws LWJGLException {
if (!Display.isCreated()) throw new IllegalStateException("Display must be created.");
create(Mouse.createImplementation());
@@ -324,14 +324,14 @@
/**
* @return true if the keyboard has been created
*/
- public static boolean isCreated() {
+ public static synchronized boolean isCreated() {
return created;
}
/**
* "Destroy" the keyboard
*/
- public static void destroy() {
+ public static synchronized void destroy() {
if (!created)
return;
created = false;
@@ -357,7 +357,7 @@
* @see org.lwjgl.input.Keyboard#getEventKeyState()
* @see org.lwjgl.input.Keyboard#getEventCharacter()
*/
- public static void poll() {
+ public static synchronized void poll() {
if (!created)
throw new IllegalStateException("Keyboard must be created before you can poll the device");
implementation.pollKeyboard(keyDownBuffer);
@@ -375,7 +375,7 @@
* @param key Keycode to check
* @return true if the key is down according to the last poll()
*/
- public static boolean isKeyDown(int key) {
+ public static synchronized boolean isKeyDown(int key) {
if (!created)
throw new IllegalStateException("Keyboard must be created before you can query key state");
return keyDownBuffer.get(key) != 0;
@@ -398,7 +398,7 @@
* @param key The key
* @return a String with the key's human readable name in it or null if the key is unnamed
*/
- public static String getKeyName(int key) {
+ public static synchronized String getKeyName(int key) {
return keyName[key];
}
@@ -406,7 +406,7 @@
* Get's a key's index. If the key is unrecognised then KEY_NONE is returned.
* @param keyName The key name
*/
- public static int getKeyIndex(String keyName) {
+ public static synchronized int getKeyIndex(String keyName) {
Integer ret = (Integer) keyMap.get(keyName);
if (ret == null)
return KEY_NONE;
@@ -418,7 +418,7 @@
* Gets the number of keyboard events waiting after doing a buffer enabled poll().
* @return the number of keyboard events
*/
- public static int getNumKeyboardEvents() {
+ public static synchronized int getNumKeyboardEvents() {
if (!created)
throw new IllegalStateException("Keyboard must be created before you can read events");
return readBuffer.remaining()/EVENT_SIZE;
@@ -435,7 +435,7 @@
* @see org.lwjgl.input.Keyboard#getEventCharacter()
* @return true if a keyboard event was read, false otherwise
*/
- public static boolean next() {
+ public static synchronized boolean next() {
if (!created)
throw new IllegalStateException("Keyboard must be created before you can read events");
@@ -453,14 +453,14 @@
/**
* @return Number of keys on this keyboard
*/
- public static int getKeyCount() {
+ public static synchronized int getKeyCount() {
return keyCount;
}
/**
* @return The character from the current event
*/
- public static char getEventCharacter() {
+ public static synchronized char getEventCharacter() {
return (char)eventCharacter;
}
@@ -471,7 +471,7 @@
*
* @return The key from the current event
*/
- public static int getEventKey() {
+ public static synchronized int getEventKey() {
return eventKey;
}
@@ -481,7 +481,7 @@
*
* @return True if key was down, or false if released
*/
- public static boolean getEventKeyState() {
+ public static synchronized boolean getEventKeyState() {
return eventState;
}
@@ -492,7 +492,7 @@
* origin.
* @return The time in nanoseconds of the current event
*/
- public static long getEventNanoseconds() {
+ public static synchronized long getEventNanoseconds() {
return eventNanos;
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2006-11-20 20:07:29 UTC (rev 2675)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2006-11-24 10:18:36 UTC (rev 2676)
@@ -150,7 +150,7 @@
*
* @return the currently bound native cursor, if any.
*/
- public static Cursor getNativeCursor() {
+ public static synchronized Cursor getNativeCursor() {
return currentCursor;
}
@@ -165,7 +165,7 @@
* @return The previous Cursor object set, or null.
* @throws LWJGLException if the cursor could not be set for any reason
*/
- public static Cursor setNativeCursor(Cursor cursor) throws LWJGLException {
+ public static synchronized Cursor setNativeCursor(Cursor cursor) throws LWJGLException {
if ((Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) == 0)
throw new IllegalStateException("Mouse doesn't support native cursors");
Cursor oldCursor = currentCursor;
@@ -190,7 +190,7 @@
* @param y The y coordinate of the new cursor position in OpenGL coordinates relative
* to the window origin.
*/
- public static void setCursorPosition(int new_x, int new_y) {
+ public static synchronized void setCursorPosition(int new_x, int new_y) {
if (!isCreated())
throw new IllegalStateException("Mouse is not created");
x = event_x = new_x;
@@ -275,7 +275,7 @@
*
* @throws LWJGLException if the mouse could not be created for any reason
*/
- public static void create() throws LWJGLException {
+ public static synchronized void create() throws LWJGLException {
if (!Display.isCreated()) throw new IllegalStateException("Display must be created.");
create(createImplementation());
@@ -284,14 +284,14 @@
/**
* @return true if the mouse has been created
*/
- public static boolean isCreated() {
+ public static synchronized boolean isCreated() {
return created;
}
/**
* "Destroy" the mouse.
*/
- public static void destroy() {
+ public static synchronized void destroy() {
if (!created) return;
created = false;
buttons = null;
@@ -321,7 +321,7 @@
* @see org.lwjgl.input.Mouse#getDY()
* @see org.lwjgl.input.Mouse#getDWheel()
*/
- public static void poll() {
+ public static synchronized void poll() {
if (!created) throw new IllegalStateException("Mouse must be created before you can poll it");
implementation.pollMouse(coord_buffer, buttons);
@@ -360,7 +360,7 @@
* @param button The index of the button you wish to test (0..getButtonCount-1)
* @return true if the specified button is down
*/
- public static boolean isButtonDown(int button) {
+ public static synchronized boolean isButtonDown(int button) {
if (!created) throw new IllegalStateException("Mouse must be created before you can poll the button state");
if (button >= buttonCount || button < 0)
return false;
@@ -373,7 +373,7 @@
* @param button The button
* @return a String with the button's human readable name in it or null if the button is unnamed
*/
- public static String getButtonName(int button) {
+ public static synchronized String getButtonName(int button) {
if (button >= buttonName.length || button < 0)
return null;
else
@@ -384,7 +384,7 @@
* Get's a button's index. If the button is unrecognised then -1 is returned.
* @param buttonName The button name
*/
- public static int getButtonIndex(String buttonName) {
+ public static synchronized int getButtonIndex(String buttonName) {
Integer ret = (Integer) buttonMap.get(buttonName);
if (ret == null)
return -1;
@@ -401,7 +401,7 @@
* @see org.lwjgl.input.Mouse#getEventButtonState()
* @return true if a mouse event was read, false otherwise
*/
- public static boolean next() {
+ public static synchronized boolean next() {
if (!created) throw new IllegalStateException("Mouse must be created before you can read events");
if (readBuffer.hasRemaining()) {
eventButton = readBuffer.get();
@@ -431,7 +431,7 @@
/**
* @return Current events button. Returns -1 if no button state was changed
*/
- public static int getEventButton() {
+ public static synchronized int getEventButton() {
return eventButton;
}
@@ -439,42 +439,42 @@
* Get the current events button state.
* @return Current events button state.
*/
- public static boolean getEventButtonState() {
+ public static synchronized boolean getEventButtonState() {
return eventState;
}
/**
* @return Current events delta x. Only valid when the mouse is grabbed.
*/
- public static int getEventDX() {
+ public static synchronized int getEventDX() {
return event_dx;
}
/**
* @return Current events delta y. Only valid when the mouse is grabbed.
*/
- public static int getEventDY() {
+ public static synchronized int getEventDY() {
return event_dy;
}
/**
* @return Current events absolute x. Only valid when the mouse is not grabbed.
*/
- public static int getEventX() {
+ public static synchronized int getEventX() {
return event_x;
}
/**
* @return Current events absolute y. Only valid when the mouse is not grabbed.
*/
- public static int getEventY() {
+ public static synchronized int getEventY() {
return event_y;
}
/**
* @return Current events delta z
*/
- public static int getEventDWheel() {
+ public static synchronized int getEventDWheel() {
return event_dwheel;
}
@@ -486,7 +486,7 @@
*
* @return The time in nanoseconds of the current event
*/
- public static long getEventNanoseconds() {
+ public static synchronized long getEventNanoseconds() {
return event_nanos;
}
@@ -496,7 +496,7 @@
*
* @return Absolute x axis position of mouse
*/
- public static int getX() {
+ public static synchronized int getX() {
return x;
}
@@ -506,14 +506,14 @@
*
* @return Absolute y axis position of mouse
*/
- public static int getY() {
+ public static synchronized int getY() {
return y;
}
/**
* @return Movement on the x axis since last time getDX() was called. Only valid when the mouse is grabbed.
*/
- public static int getDX() {
+ public static synchronized int getDX() {
int result = dx;
dx = 0;
return result;
@@ -522,7 +522,7 @@
/**
* @return Movement on the y axis since last time getDY() was called. Only valid when the mouse is grabbed.
*/
- public static int getDY() {
+ public static synchronized int getDY() {
int result = dy;
dy = 0;
return result;
@@ -531,7 +531,7 @@
/**
* @return Movement of the wheel since last time getDWheel() was called
*/
- public static int getDWheel() {
+ public static synchronized int getDWheel() {
int result = dwheel;
dwheel = 0;
return result;
@@ -540,21 +540,21 @@
/**
* @return Number of buttons on this mouse
*/
- public static int getButtonCount() {
+ public static synchronized int getButtonCount() {
return buttonCount;
}
/**
* @return Whether or not this mouse has wheel support
*/
- public static boolean hasWheel() {
+ public static synchronized boolean hasWheel() {
return hasWheel;
}
/**
* @return whether or not the mouse has grabbed the cursor
*/
- public static boolean isGrabbed() {
+ public static synchronized boolean isGrabbed() {
return isGrabbed;
}
@@ -566,7 +566,7 @@
*
* @param grab whether the mouse should be grabbed
*/
- public static void setGrabbed(boolean grab) {
+ public static synchronized void setGrabbed(boolean grab) {
isGrabbed = grab;
if (isCreated()) {
implementation.grabMouse(isGrabbed);
@@ -579,7 +579,7 @@
* This method is called automatically by the window on its update, and
* shouldn't be called otherwise
*/
- public static void updateCursor() {
+ public static synchronized void updateCursor() {
if (isWindows && currentCursor != null && currentCursor.hasTimedOut()) {
currentCursor.nextCursor();
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-20 20:07:32
|
Revision: 2675
http://svn.sourceforge.net/java-game-lib/?rev=2675&view=rev
Author: elias_naur
Date: 2006-11-20 12:07:29 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Made LWJGLUtil.getLibraryPaths support multiple library names. Now AL.create on linux tries both libopenal.so and libopenal.so.0, which is the name of the system library
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2006-11-20 19:28:50 UTC (rev 2674)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2006-11-20 20:07:29 UTC (rev 2675)
@@ -315,73 +315,68 @@
/**
* Locates the paths required by a library.
*
- * @param libNames List of library names to look for, in the form of Local Library name, Platform library name.
- * At least 6 names must be passed. 2 for each supported platform in the following order: Windows, Linux, MacOSX.
+ * @param libName Local Library Name to search the classloader with ("openal").
+ * @param platform_lib_name The native library name ("libopenal.so")
* @param classloader The classloader to ask for library paths
* @return Paths to located libraries, if any
*/
- public static String[] getLibraryPaths(String[] libNames, ClassLoader classloader) throws LWJGLException {
+ public static String[] getLibraryPaths(String libname, String platform_lib_name, ClassLoader classloader) {
+ return getLibraryPaths(libname, new String[]{platform_lib_name}, classloader);
+ }
+
+ /**
+ * Locates the paths required by a library.
+ *
+ * @param libName Local Library Name to search the classloader with ("openal").
+ * @param platform_lib_names The list of possible library names ("libopenal.so")
+ * @param classloader The classloader to ask for library paths
+ * @return Paths to located libraries, if any
+ */
+ public static String[] getLibraryPaths(String libname, String[] platform_lib_names, ClassLoader classloader) {
// need to pass path of possible locations of library to native side
List possible_paths = new ArrayList();
- String libname;
- String platform_lib_name;
- switch (getPlatform()) {
- case PLATFORM_WINDOWS:
- libname = libNames[0];
- platform_lib_name = libNames[1];
- break;
- case PLATFORM_LINUX:
- libname = libNames[2];
- platform_lib_name = libNames[3];
- break;
- case PLATFORM_MACOSX:
- libname = libNames[4];
- platform_lib_name = libNames[5];
- break;
- default:
- throw new LWJGLException("Unknown platform: " + getPlatform());
- }
-
String classloader_path = getPathFromClassLoader(libname, classloader);
if (classloader_path != null) {
log("getPathFromClassLoader: Path found: " + classloader_path);
possible_paths.add(classloader_path);
}
- String lwjgl_classloader_path = getPathFromClassLoader("lwjgl", classloader);
- if (lwjgl_classloader_path != null) {
- log("getPathFromClassLoader: Path found: " + lwjgl_classloader_path);
- possible_paths.add(lwjgl_classloader_path.substring(0, lwjgl_classloader_path.lastIndexOf(File.separator))
- + File.separator + platform_lib_name);
- }
-
- // add Installer path
- String alternative_path = getPrivilegedProperty("org.lwjgl.librarypath");
- if (alternative_path != null) {
- possible_paths.add(alternative_path + File.separator + platform_lib_name);
- }
+ for (int i = 0; i < platform_lib_names.length; i++) {
+ String platform_lib_name = platform_lib_names[i];
+ String lwjgl_classloader_path = getPathFromClassLoader("lwjgl", classloader);
+ if (lwjgl_classloader_path != null) {
+ log("getPathFromClassLoader: Path found: " + lwjgl_classloader_path);
+ possible_paths.add(lwjgl_classloader_path.substring(0, lwjgl_classloader_path.lastIndexOf(File.separator))
+ + File.separator + platform_lib_name);
+ }
- // Add all possible paths from java.library.path
- String java_library_path = getPrivilegedProperty("java.library.path");
-
- StringTokenizer st = new StringTokenizer(java_library_path, File.pathSeparator);
- while (st.hasMoreTokens()) {
- String path = st.nextToken();
- possible_paths.add(path + File.separator + platform_lib_name);
- }
+ // add Installer path
+ String alternative_path = getPrivilegedProperty("org.lwjgl.librarypath");
+ if (alternative_path != null) {
+ possible_paths.add(alternative_path + File.separator + platform_lib_name);
+ }
- //add current path
- String current_dir = getPrivilegedProperty("user.dir");
- possible_paths.add(current_dir + File.separator + platform_lib_name);
+ // Add all possible paths from java.library.path
+ String java_library_path = getPrivilegedProperty("java.library.path");
- //add pure library (no path, let OS search)
- possible_paths.add(platform_lib_name);
+ StringTokenizer st = new StringTokenizer(java_library_path, File.pathSeparator);
+ while (st.hasMoreTokens()) {
+ String path = st.nextToken();
+ possible_paths.add(path + File.separator + platform_lib_name);
+ }
+ //add current path
+ String current_dir = getPrivilegedProperty("user.dir");
+ possible_paths.add(current_dir + File.separator + platform_lib_name);
+
+ //add pure library (no path, let OS search)
+ possible_paths.add(platform_lib_name);
+ }
+
//create needed string array
String[] paths = new String[possible_paths.size()];
possible_paths.toArray(paths);
-
return paths;
}
Modified: trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-11-20 19:28:50 UTC (rev 2674)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-11-20 20:07:29 UTC (rev 2675)
@@ -94,10 +94,25 @@
private static native int getNativeLibraryVersion();
static void createIL() throws LWJGLException {
- String[] illPaths = LWJGLUtil.getLibraryPaths(new String[]{
- "DevIL", "DevIL.dll",
- "IL", "libIL.so",
- "IL", "libIL.dylib"}, IL.class.getClassLoader());
+ String libname;
+ String platform_libname;
+ switch (LWJGLUtil.getPlatform()) {
+ case LWJGLUtil.PLATFORM_WINDOWS:
+ libname = "DevIL";
+ platform_libname = "DevIL.dll";
+ break;
+ case LWJGLUtil.PLATFORM_LINUX:
+ libname = "IL";
+ platform_libname = "libIL.so";
+ break;
+ case LWJGLUtil.PLATFORM_MACOSX:
+ libname = "IL";
+ platform_libname = "libIL.dylib";
+ break;
+ default:
+ throw new LWJGLException("Unknown platform: " + LWJGLUtil.getPlatform());
+ }
+ String[] illPaths = LWJGLUtil.getLibraryPaths(libname, platform_libname, IL.class.getClassLoader());
ILNative.nCreateIL(illPaths);
try {
@@ -124,10 +139,22 @@
static native void nDestroyILU();
static void createILU() throws LWJGLException {
- String[] iluPaths = LWJGLUtil.getLibraryPaths(new String[]{
- "ILU", "ILU.dll",
- "ILU", "libILU.so",
- "ILU", "libILU.dylib"}, ILU.class.getClassLoader());
+ String libname;
+ switch (LWJGLUtil.getPlatform()) {
+ case LWJGLUtil.PLATFORM_WINDOWS:
+ libname = "ILU.dll";
+ break;
+ case LWJGLUtil.PLATFORM_LINUX:
+ libname = "libILU.so";
+ break;
+ case LWJGLUtil.PLATFORM_MACOSX:
+ libname = "libILU.dylib";
+ break;
+ default:
+ throw new LWJGLException("Unknown platform: " + LWJGLUtil.getPlatform());
+ }
+
+ String[] iluPaths = LWJGLUtil.getLibraryPaths("ILU", libname, ILU.class.getClassLoader());
ILNative.nCreateILU(iluPaths);
try {
@@ -153,10 +180,21 @@
static native void nDestroyILUT();
static void createILUT() throws LWJGLException {
- String[] ilutPaths = LWJGLUtil.getLibraryPaths(new String[]{
- "ILUT", "ILUT.dll",
- "ILUT", "libILUT.so",
- "ILUT", "libILUT.dylib"}, ILUT.class.getClassLoader());
+ String libname;
+ switch (LWJGLUtil.getPlatform()) {
+ case LWJGLUtil.PLATFORM_WINDOWS:
+ libname = "ILUT.dll";
+ break;
+ case LWJGLUtil.PLATFORM_LINUX:
+ libname = "libILUT.so";
+ break;
+ case LWJGLUtil.PLATFORM_MACOSX:
+ libname = "libILUT.dylib";
+ break;
+ default:
+ throw new LWJGLException("Unknown platform: " + LWJGLUtil.getPlatform());
+ }
+ String[] ilutPaths = LWJGLUtil.getLibraryPaths("ILUT", libname, ILUT.class.getClassLoader());
ILNative.nCreateILUT(ilutPaths);
try {
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-11-20 19:28:50 UTC (rev 2674)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-11-20 20:07:29 UTC (rev 2675)
@@ -263,11 +263,21 @@
}
try {
- String[] fmodPaths = LWJGLUtil.getLibraryPaths(new String[]{
- "fmod", "fmod.dll",
- "fmod", "libfmod.so",
- "fmod", "static-ignored"},
- FMOD.class.getClassLoader());
+ String libname;
+ switch (LWJGLUtil.getPlatform()) {
+ case LWJGLUtil.PLATFORM_WINDOWS:
+ libname = "fmod.dll";
+ break;
+ case LWJGLUtil.PLATFORM_LINUX:
+ libname = "libfmod.so";
+ break;
+ case LWJGLUtil.PLATFORM_MACOSX:
+ libname = "static-ignored";
+ break;
+ default:
+ throw new FMODException("Unknown platform: " + LWJGLUtil.getPlatform());
+ }
+ String[] fmodPaths = LWJGLUtil.getLibraryPaths("fmod", libname, FMOD.class.getClassLoader());
LWJGLUtil.log("Found " + fmodPaths.length + " FMOD paths");
nCreate(fmodPaths);
created = true;
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2006-11-20 19:28:50 UTC (rev 2674)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2006-11-20 20:07:29 UTC (rev 2675)
@@ -113,10 +113,25 @@
if (created)
throw new IllegalStateException("Only one OpenAL context may be instantiated at any one time.");
- String[] oalPaths = LWJGLUtil.getLibraryPaths(new String[]{
- "OpenAL32", "OpenAL32.dll",
- "openal", "libopenal.so",
- "openal", "openal.dylib"}, AL.class.getClassLoader());
+ String libname;
+ String[] library_names;
+ switch (LWJGLUtil.getPlatform()) {
+ case LWJGLUtil.PLATFORM_WINDOWS:
+ libname = "OpenAL32";
+ library_names = new String[]{"OpenAL32.dll"};
+ break;
+ case LWJGLUtil.PLATFORM_LINUX:
+ libname = "openal";
+ library_names = new String[]{"libopenal.so", "libopenal.so.0"};
+ break;
+ case LWJGLUtil.PLATFORM_MACOSX:
+ libname = "openal";
+ library_names = new String[]{"openal.dylib"};
+ break;
+ default:
+ throw new LWJGLException("Unknown platform: " + LWJGLUtil.getPlatform());
+ }
+ String[] oalPaths = LWJGLUtil.getLibraryPaths(libname, library_names, AL.class.getClassLoader());
LWJGLUtil.log("Found " + oalPaths.length + " OpenAL paths");
for (int i = 0; i < oalPaths.length; i++) {
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-20 19:28:54
|
Revision: 2674
http://svn.sourceforge.net/java-game-lib/?rev=2674&view=rev
Author: elias_naur
Date: 2006-11-20 11:28:50 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Made LWJGLUtil.getPathFromClassLoader private
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2006-11-20 09:26:44 UTC (rev 2673)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java 2006-11-20 19:28:50 UTC (rev 2674)
@@ -404,7 +404,7 @@
* @param classloader Classloader to use
* @return Absolute path to library if found, otherwise null
*/
- public static String getPathFromClassLoader(final String libname, final ClassLoader classloader) {
+ private static String getPathFromClassLoader(final String libname, final ClassLoader classloader) {
try {
log("getPathFromClassLoader: searching for: " + libname);
Class c = classloader.getClass();
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2006-11-20 09:26:44 UTC (rev 2673)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2006-11-20 19:28:50 UTC (rev 2674)
@@ -122,6 +122,7 @@
try {
nCreate(oalPaths[i]);
created = true;
+ init(deviceArguments, contextFrequency, contextRefresh, contextSynchronized, openDevice);
break;
} catch (LWJGLException e) {
LWJGLUtil.log("Failed to load " + oalPaths[i] + ": " + e.getMessage());
@@ -131,10 +132,13 @@
// Try to load OpenAL from the framework instead
nCreateDefault();
created = true;
+ init(deviceArguments, contextFrequency, contextRefresh, contextSynchronized, openDevice);
}
if (!created)
throw new LWJGLException("Could not locate OpenAL library.");
+ }
+ private static void init(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized, boolean openDevice) throws LWJGLException {
try {
AL10.initNativeStubs();
ALC.initNativeStubs();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-20 09:26:47
|
Revision: 2673
http://svn.sourceforge.net/java-game-lib/?rev=2673&view=rev
Author: elias_naur
Date: 2006-11-20 01:26:44 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Windows: Dont use DirectInput for keyboard input. This fixes shifted typing.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-20 08:39:22 UTC (rev 2672)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-20 09:26:44 UTC (rev 2673)
@@ -54,7 +54,7 @@
private long cached_hwnd;
private WindowsMouse cached_mouse;
- private WindowsKeyboard cached_keyboard;
+// private WindowsKeyboard cached_keyboard;
private boolean has_grabbed;
public WindowsAWTInput(AWTGLCanvas canvas) throws LWJGLException {
@@ -73,14 +73,14 @@
super.destroyMouse();
}
- public synchronized void destroyKeyboard() {
+/* public synchronized void destroyKeyboard() {
if (cached_keyboard != null) {
cached_keyboard.destroy();
cached_keyboard = null;
}
super.destroyKeyboard();
}
-
+*/
public synchronized void processInput(PeerInfo peer_info) {
WindowsPeerInfo windows_peerinfo = (WindowsPeerInfo)peer_info;
long hwnd = windows_peerinfo.getHwnd();
@@ -92,12 +92,12 @@
if (cached_mouse != null) {
cached_mouse.destroy();
}
- if (cached_keyboard != null) {
+/* if (cached_keyboard != null) {
cached_keyboard.destroy();
- }
+ }*/
WindowsDirectInput dinput = WindowsDisplay.createDirectInput();
cached_mouse = new WindowsMouse(dinput, hwnd);
- cached_keyboard = new WindowsKeyboard(dinput, hwnd);
+// cached_keyboard = new WindowsKeyboard(dinput, hwnd);
}
if (isGrabbed() && getCanvas().getCursor() != blank_cursor) {
cached_cursor = getCanvas().getCursor();
@@ -128,12 +128,12 @@
private void grab(boolean grab) {
if (has_grabbed != grab) {
cached_mouse.grab(grab);
- cached_keyboard.grab(grab);
+// cached_keyboard.grab(grab);
has_grabbed = grab;
cached_mouse.flush();
- cached_keyboard.flush();
+// cached_keyboard.flush();
getMouseEventQueue().clearEvents();
- getKeyboardEventQueue().clearEvents();
+// getKeyboardEventQueue().clearEvents();
if (!grab) {
getCanvas().setCursor(cached_cursor);
}
@@ -167,7 +167,7 @@
super.readMouse(buffer);
}
- public synchronized void readKeyboard(ByteBuffer buffer) {
+/* public synchronized void readKeyboard(ByteBuffer buffer) {
if (isGrabbed()) {
if (cached_keyboard != null)
cached_keyboard.read(buffer);
@@ -181,5 +181,5 @@
cached_keyboard.poll(keyDownBuffer);
} else
super.pollKeyboard(keyDownBuffer);
- }
+ }*/
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-20 08:39:28
|
Revision: 2672
http://svn.sourceforge.net/java-game-lib/?rev=2672&view=rev
Author: elias_naur
Date: 2006-11-20 00:39:22 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Added AWTInputAdapter testing to applet/OpenGL.java
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java 2006-11-20 08:14:50 UTC (rev 2671)
+++ trunk/LWJGL/src/java/org/lwjgl/test/applet/OpenGL.java 2006-11-20 08:39:22 UTC (rev 2672)
@@ -36,9 +36,15 @@
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.AWTInputAdapter;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+
public class OpenGL extends AWTGLCanvas implements Test {
float angle = 0;
+ float x;
+ float y;
public OpenGL() throws LWJGLException {
}
@@ -47,15 +53,22 @@
GL11.glMatrixMode(GL11.GL_PROJECTION_MATRIX);
GL11.glLoadIdentity();
GL11.glOrtho(0, 640, 0, 480, 1, -1);
+ x = 320;
+ y = 240;
GL11.glMatrixMode(GL11.GL_MODELVIEW_MATRIX);
setVSyncEnabled(true);
+ try {
+ AWTInputAdapter.create(this);
+ } catch (LWJGLException e) {
+ e.printStackTrace();
+ }
}
public void paintGL() {
GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
GL11.glPushMatrix();
- GL11.glTranslatef(320, 240, 0.0f);
+ GL11.glTranslatef(x, y, 0.0f);
GL11.glRotatef(angle, 0, 0, 1.0f);
GL11.glBegin(GL11.GL_QUADS);
GL11.glVertex2i(-50, -50);
@@ -67,6 +80,47 @@
angle += 1;
+ if (Mouse.isCreated()) {
+ Mouse.poll();
+ while (Mouse.next()) {
+ x += Mouse.getEventDX();
+ y += Mouse.getEventDY();
+ }
+ }
+ if (Keyboard.isCreated()) {
+ Keyboard.poll();
+ }
+ while (Keyboard.isCreated() && Keyboard.next()) {
+ if (Keyboard.getEventKey() != Keyboard.KEY_NONE) {
+ String key_name = Keyboard.getKeyName(Keyboard.getEventKey());
+ if (Keyboard.getEventKeyState()) {
+ switch (Keyboard.getEventKey()) {
+ case Keyboard.KEY_H:
+ AWTInputAdapter.destroy();
+ break;
+ case Keyboard.KEY_G:
+ Mouse.setGrabbed(!Mouse.isGrabbed());
+ break;
+ default:
+ break;
+ }
+ System.out.println("Pressed: " + key_name);
+ } else
+ System.out.println("Released: " + key_name);
+ }
+ if (Keyboard.getEventCharacter() != Keyboard.CHAR_NONE)
+ System.out.println("Typed: " + Keyboard.getEventCharacter());
+ }
+ if (Keyboard.isCreated()) {
+ if (Keyboard.isKeyDown(Keyboard.KEY_UP))
+ y += 5;
+ else if (Keyboard.isKeyDown(Keyboard.KEY_DOWN))
+ y -= 5;
+ if (Keyboard.isKeyDown(Keyboard.KEY_LEFT))
+ x -= 5;
+ else if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT))
+ x += 5;
+ }
try {
swapBuffers();
if (isVisible())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-20 08:14:51
|
Revision: 2671
http://svn.sourceforge.net/java-game-lib/?rev=2671&view=rev
Author: elias_naur
Date: 2006-11-20 00:14:50 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Windows: Destroy the keyboard when we create a new one
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-20 08:04:56 UTC (rev 2670)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-20 08:14:50 UTC (rev 2671)
@@ -68,10 +68,19 @@
if (cached_mouse != null) {
grab(false);
cached_mouse.destroy();
+ cached_mouse = null;
}
super.destroyMouse();
}
+ public synchronized void destroyKeyboard() {
+ if (cached_keyboard != null) {
+ cached_keyboard.destroy();
+ cached_keyboard = null;
+ }
+ super.destroyKeyboard();
+ }
+
public synchronized void processInput(PeerInfo peer_info) {
WindowsPeerInfo windows_peerinfo = (WindowsPeerInfo)peer_info;
long hwnd = windows_peerinfo.getHwnd();
@@ -80,8 +89,12 @@
if (cached_mouse == null || hwnd != cached_hwnd) {
has_grabbed = false;
cached_hwnd = hwnd;
- if (cached_mouse != null)
+ if (cached_mouse != null) {
cached_mouse.destroy();
+ }
+ if (cached_keyboard != null) {
+ cached_keyboard.destroy();
+ }
WindowsDirectInput dinput = WindowsDisplay.createDirectInput();
cached_mouse = new WindowsMouse(dinput, hwnd);
cached_keyboard = new WindowsKeyboard(dinput, hwnd);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-20 08:04:57
|
Revision: 2670
http://svn.sourceforge.net/java-game-lib/?rev=2670&view=rev
Author: elias_naur
Date: 2006-11-20 00:04:56 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Twekaed tests
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java 2006-11-19 23:02:25 UTC (rev 2669)
+++ trunk/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java 2006-11-20 08:04:56 UTC (rev 2670)
@@ -148,6 +148,7 @@
int count = Keyboard.getNumKeyboardEvents();
while (Keyboard.next()) {
System.out.println("Checking key:" + Keyboard.getKeyName(Keyboard.getEventKey()));
+ System.out.println("Pressed:" + Keyboard.getEventKeyState());
System.out.println("Key character: " + Keyboard.getEventCharacter());
if (Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java 2006-11-19 23:02:25 UTC (rev 2669)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java 2006-11-20 08:04:56 UTC (rev 2670)
@@ -151,20 +151,25 @@
Keyboard.poll();
}
while (Keyboard.isCreated() && Keyboard.next()) {
- if (Keyboard.getEventKeyState()) {
- switch (Keyboard.getEventKey()) {
- case Keyboard.KEY_ESCAPE:
- System.exit(0);
- break;
- case Keyboard.KEY_H:
- AWTInputAdapter.destroy();
- break;
- case Keyboard.KEY_G:
- Mouse.setGrabbed(!Mouse.isGrabbed());
- break;
- default:
- break;
- }
+ if (Keyboard.getEventKey() != Keyboard.KEY_NONE) {
+ String key_name = Keyboard.getKeyName(Keyboard.getEventKey());
+ if (Keyboard.getEventKeyState()) {
+ switch (Keyboard.getEventKey()) {
+ case Keyboard.KEY_ESCAPE:
+ System.exit(0);
+ break;
+ case Keyboard.KEY_H:
+ AWTInputAdapter.destroy();
+ break;
+ case Keyboard.KEY_G:
+ Mouse.setGrabbed(!Mouse.isGrabbed());
+ break;
+ default:
+ break;
+ }
+ System.out.println("Pressed: " + key_name);
+ } else
+ System.out.println("Released: " + key_name);
}
if (Keyboard.getEventCharacter() != Keyboard.CHAR_NONE)
System.out.println("Typed: " + Keyboard.getEventCharacter());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-19 23:02:27
|
Revision: 2669
http://svn.sourceforge.net/java-game-lib/?rev=2669&view=rev
Author: elias_naur
Date: 2006-11-19 15:02:25 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Windows: Make sure AWTInputAdapter is not reporting events twice after a grab change
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2006-11-19 22:06:46 UTC (rev 2668)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2006-11-19 23:02:25 UTC (rev 2669)
@@ -59,10 +59,14 @@
this.robot = AWTUtil.createRobot(canvas);
}
- protected synchronized MouseEventQueue getMouseEventQueue() {
+ protected MouseEventQueue getMouseEventQueue() {
return mouse_queue;
}
+ protected KeyboardEventQueue getKeyboardEventQueue() {
+ return keyboard_queue;
+ }
+
public synchronized void grabMouse(boolean grab) {
this.grab = grab;
if (mouse_queue != null)
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-19 22:06:46 UTC (rev 2668)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-19 23:02:25 UTC (rev 2669)
@@ -115,9 +115,15 @@
private void grab(boolean grab) {
if (has_grabbed != grab) {
cached_mouse.grab(grab);
+ cached_keyboard.grab(grab);
has_grabbed = grab;
- if (!grab)
+ cached_mouse.flush();
+ cached_keyboard.flush();
+ getMouseEventQueue().clearEvents();
+ getKeyboardEventQueue().clearEvents();
+ if (!grab) {
getCanvas().setCursor(cached_cursor);
+ }
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java 2006-11-19 22:06:46 UTC (rev 2668)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java 2006-11-19 23:02:25 UTC (rev 2669)
@@ -47,6 +47,7 @@
final class WindowsKeyboard {
private final static int BUFFER_SIZE = 50;
+ private final long hwnd;
private final WindowsDirectInput dinput;
private final WindowsDirectInputDevice keyboard;
private final IntBuffer temp_data_buffer;
@@ -55,14 +56,17 @@
private final CharBuffer unicode_buffer;
private final ByteBuffer ascii_buffer;
+ private boolean grabbed;
+
public WindowsKeyboard(WindowsDirectInput dinput, long hwnd) throws LWJGLException {
+ this.hwnd = hwnd;
this.dinput = dinput;
try {
keyboard = dinput.createDevice(WindowsDirectInput.KEYBOARD_TYPE);
try {
- keyboard.setCooperateLevel(hwnd, WindowsDirectInputDevice.DISCL_NONEXCLUSIVE | WindowsDirectInputDevice.DISCL_FOREGROUND);
keyboard.setDataFormat(WindowsDirectInput.KEYBOARD_TYPE);
keyboard.setBufferSize(BUFFER_SIZE);
+ acquireNonExclusive();
} catch (LWJGLException e) {
keyboard.release();
throw e;
@@ -84,15 +88,48 @@
ascii_buffer = BufferUtils.createByteBuffer(2);
}
}
-
private static native boolean isWindowsNT();
+ private boolean acquire(int flags) {
+ try {
+ keyboard.setCooperateLevel(hwnd, flags);
+ keyboard.acquire();
+ return true;
+ } catch (LWJGLException e) {
+ LWJGLUtil.log("Failed to acquire keyboard: " + e);
+ return false;
+ }
+ }
+
+ private boolean acquireNonExclusive() {
+ return acquire(WindowsDirectInputDevice.DISCL_NONEXCLUSIVE | WindowsDirectInputDevice.DISCL_FOREGROUND) ||
+ acquire(WindowsDirectInputDevice.DISCL_NONEXCLUSIVE | WindowsDirectInputDevice.DISCL_BACKGROUND);
+ }
+
public void destroy() {
keyboard.unacquire();
keyboard.release();
dinput.release();
}
+ public void grab(boolean grab) {
+ if(grab) {
+ if (!grabbed) {
+ flush();
+ grabbed = true;
+ keyboard.unacquire();
+ if (!acquire(WindowsDirectInputDevice.DISCL_EXCLUSIVE | WindowsDirectInputDevice.DISCL_FOREGROUND))
+ LWJGLUtil.log("Failed to reset cooperative mode");
+ }
+ } else {
+ if (grabbed) {
+ grabbed = false;
+ keyboard.unacquire();
+ acquireNonExclusive();
+ }
+ }
+ }
+
public void poll(ByteBuffer keyDownBuffer) {
int ret = keyboard.acquire();
if (ret != WindowsDirectInput.DI_OK && ret != WindowsDirectInput.DI_NOEFFECT)
@@ -181,7 +218,12 @@
private static native int ToAscii(int wVirtKey, int wScanCode, ByteBuffer lpKeyState, ByteBuffer lpChar, int flags);
private static native int GetKeyboardState(ByteBuffer lpKeyState);
- public void read(ByteBuffer buffer) {
+ public void flush() {
+ processEvents();
+ temp_data_buffer.clear();
+ }
+
+ private void processEvents() {
int ret = keyboard.acquire();
if (ret != WindowsDirectInput.DI_OK && ret != WindowsDirectInput.DI_NOEFFECT)
return;
@@ -202,6 +244,10 @@
LWJGLUtil.log("Failed to read keyboard (0x" + Integer.toHexString(ret) + ")");
break;
}
+ }
+
+ public void read(ByteBuffer buffer) {
+ processEvents();
temp_data_buffer.flip();
translateData(temp_data_buffer, buffer);
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java 2006-11-19 22:06:46 UTC (rev 2668)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java 2006-11-19 23:02:25 UTC (rev 2669)
@@ -246,32 +246,42 @@
temp_data_buffer.clear();
ret = mouse.getDeviceData(temp_data_buffer);
- if (ret == WindowsDirectInput.DI_OK) {
- if (mouse_grabbed) {
- temp_data_buffer.flip();
- copyDXEvents(temp_data_buffer);
- }
- } else if (ret == WindowsDirectInput.DI_BUFFEROVERFLOW) {
- LWJGLUtil.log("Mouse buffer overflowed");
- } else if (ret == WindowsDirectInput.DIERR_INPUTLOST) {
- LWJGLUtil.log("Mouse input lost");
- } else if (ret == WindowsDirectInput.DIERR_NOTACQUIRED) {
- LWJGLUtil.log("Mouse not acquired");
- } else {
- LWJGLUtil.log("unknown mouse error (" + Integer.toHexString(ret) + ")");
+ switch (ret) {
+ case WindowsDirectInput.DI_OK:
+ break;
+ case WindowsDirectInput.DI_BUFFEROVERFLOW:
+ LWJGLUtil.log("Mouse buffer overflowed");
+ break;
+ case WindowsDirectInput.DIERR_INPUTLOST:
+ LWJGLUtil.log("Mouse input lost");
+ break;
+ case WindowsDirectInput.DIERR_NOTACQUIRED:
+ LWJGLUtil.log("Mouse not acquired");
+ break;
+ default:
+ LWJGLUtil.log("unknown mouse error (" + Integer.toHexString(ret) + ")");
+ break;
}
}
+ public final void flush() {
+ readDXBuffer();
+ temp_data_buffer.clear();
+ }
+
public void read(ByteBuffer buffer) {
readDXBuffer();
+ if (mouse_grabbed) {
+ temp_data_buffer.flip();
+ copyDXEvents(temp_data_buffer);
+ }
event_queue.copyEvents(buffer);
}
public void grab(boolean grab) {
if(grab) {
if (!mouse_grabbed) {
- // flush DX event buffer
- readDXBuffer();
+ flush();
mouse_grabbed = true;
mouse.unacquire();
if (!acquire(WindowsDirectInputDevice.DISCL_EXCLUSIVE | WindowsDirectInputDevice.DISCL_FOREGROUND))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-19 22:06:48
|
Revision: 2668
http://svn.sourceforge.net/java-game-lib/?rev=2668&view=rev
Author: elias_naur
Date: 2006-11-19 14:06:46 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Autogen changes from previous commit
Modified Paths:
--------------
trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java
Added Paths:
-----------
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c
Removed Paths:
-------------
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeeback.java
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeeback.c
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java 2006-11-19 22:01:56 UTC (rev 2667)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java 2006-11-19 22:06:46 UTC (rev 2668)
@@ -160,7 +160,7 @@
public final boolean GL_NV_texture_shader;
public final boolean GL_NV_texture_shader2;
public final boolean GL_NV_texture_shader3;
- public final boolean GL_NV_transform_feeback;
+ public final boolean GL_NV_transform_feedback;
public final boolean GL_NV_vertex_array_range;
public final boolean GL_NV_vertex_array_range2;
public final boolean GL_NV_vertex_program;
@@ -1073,17 +1073,17 @@
long NV_register_combiners_glGetFinalCombinerInputParameterivNV_pointer;
long NV_register_combiners2_glCombinerStageParameterfvNV_pointer;
long NV_register_combiners2_glGetCombinerStageParameterfvNV_pointer;
- long NV_transform_feeback_glBindBufferRangeNV_pointer;
- long NV_transform_feeback_glBindBufferOffsetNV_pointer;
- long NV_transform_feeback_glBindBufferBaseNV_pointer;
- long NV_transform_feeback_glTransformFeedbackAttribsNV_pointer;
- long NV_transform_feeback_glTransformFeedbackVaryingsNV_pointer;
- long NV_transform_feeback_glBeginTransformFeedbackNV_pointer;
- long NV_transform_feeback_glEndTransformFeedbackNV_pointer;
- long NV_transform_feeback_glGetVaryingLocationNV_pointer;
- long NV_transform_feeback_glGetActiveVaryingNV_pointer;
- long NV_transform_feeback_glActiveVaryingNV_pointer;
- long NV_transform_feeback_glGetTransformFeedbackVaryingNV_pointer;
+ long NV_transform_feedback_glBindBufferRangeNV_pointer;
+ long NV_transform_feedback_glBindBufferOffsetNV_pointer;
+ long NV_transform_feedback_glBindBufferBaseNV_pointer;
+ long NV_transform_feedback_glTransformFeedbackAttribsNV_pointer;
+ long NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer;
+ long NV_transform_feedback_glBeginTransformFeedbackNV_pointer;
+ long NV_transform_feedback_glEndTransformFeedbackNV_pointer;
+ long NV_transform_feedback_glGetVaryingLocationNV_pointer;
+ long NV_transform_feedback_glGetActiveVaryingNV_pointer;
+ long NV_transform_feedback_glActiveVaryingNV_pointer;
+ long NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer;
long NV_vertex_array_range_glVertexArrayRangeNV_pointer;
long NV_vertex_array_range_glFlushVertexArrayRangeNV_pointer;
long NV_vertex_array_range_glAllocateMemoryNV_pointer;
@@ -2344,19 +2344,19 @@
(NV_register_combiners2_glGetCombinerStageParameterfvNV_pointer = GLContext.getFunctionAddress("glGetCombinerStageParameterfvNV")) != 0;
}
- private boolean NV_transform_feeback_initNativeFunctionAddresses() {
+ private boolean NV_transform_feedback_initNativeFunctionAddresses() {
return
- (NV_transform_feeback_glBindBufferRangeNV_pointer = GLContext.getFunctionAddress("glBindBufferRangeNV")) != 0 &&
- (NV_transform_feeback_glBindBufferOffsetNV_pointer = GLContext.getFunctionAddress("glBindBufferOffsetNV")) != 0 &&
- (NV_transform_feeback_glBindBufferBaseNV_pointer = GLContext.getFunctionAddress("glBindBufferBaseNV")) != 0 &&
- (NV_transform_feeback_glTransformFeedbackAttribsNV_pointer = GLContext.getFunctionAddress("glTransformFeedbackAttribsNV")) != 0 &&
- (NV_transform_feeback_glTransformFeedbackVaryingsNV_pointer = GLContext.getFunctionAddress("glTransformFeedbackVaryingsNV")) != 0 &&
- (NV_transform_feeback_glBeginTransformFeedbackNV_pointer = GLContext.getFunctionAddress("glBeginTransformFeedbackNV")) != 0 &&
- (NV_transform_feeback_glEndTransformFeedbackNV_pointer = GLContext.getFunctionAddress("glEndTransformFeedbackNV")) != 0 &&
- (NV_transform_feeback_glGetVaryingLocationNV_pointer = GLContext.getFunctionAddress("glGetVaryingLocationNV")) != 0 &&
- (NV_transform_feeback_glGetActiveVaryingNV_pointer = GLContext.getFunctionAddress("glGetActiveVaryingNV")) != 0 &&
- (NV_transform_feeback_glActiveVaryingNV_pointer = GLContext.getFunctionAddress("glActiveVaryingNV")) != 0 &&
- (NV_transform_feeback_glGetTransformFeedbackVaryingNV_pointer = GLContext.getFunctionAddress("glGetTransformFeedbackVaryingNV")) != 0;
+ (NV_transform_feedback_glBindBufferRangeNV_pointer = GLContext.getFunctionAddress("glBindBufferRangeNV")) != 0 &&
+ (NV_transform_feedback_glBindBufferOffsetNV_pointer = GLContext.getFunctionAddress("glBindBufferOffsetNV")) != 0 &&
+ (NV_transform_feedback_glBindBufferBaseNV_pointer = GLContext.getFunctionAddress("glBindBufferBaseNV")) != 0 &&
+ (NV_transform_feedback_glTransformFeedbackAttribsNV_pointer = GLContext.getFunctionAddress("glTransformFeedbackAttribsNV")) != 0 &&
+ (NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer = GLContext.getFunctionAddress("glTransformFeedbackVaryingsNV")) != 0 &&
+ (NV_transform_feedback_glBeginTransformFeedbackNV_pointer = GLContext.getFunctionAddress("glBeginTransformFeedbackNV")) != 0 &&
+ (NV_transform_feedback_glEndTransformFeedbackNV_pointer = GLContext.getFunctionAddress("glEndTransformFeedbackNV")) != 0 &&
+ (NV_transform_feedback_glGetVaryingLocationNV_pointer = GLContext.getFunctionAddress("glGetVaryingLocationNV")) != 0 &&
+ (NV_transform_feedback_glGetActiveVaryingNV_pointer = GLContext.getFunctionAddress("glGetActiveVaryingNV")) != 0 &&
+ (NV_transform_feedback_glActiveVaryingNV_pointer = GLContext.getFunctionAddress("glActiveVaryingNV")) != 0 &&
+ (NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer = GLContext.getFunctionAddress("glGetTransformFeedbackVaryingNV")) != 0;
}
private boolean NV_vertex_array_range_initNativeFunctionAddresses() {
@@ -2586,8 +2586,8 @@
supported_extensions.remove("GL_NV_register_combiners");
if (supported_extensions.contains("GL_NV_register_combiners2") && !NV_register_combiners2_initNativeFunctionAddresses())
supported_extensions.remove("GL_NV_register_combiners2");
- if (supported_extensions.contains("GL_NV_transform_feeback") && !NV_transform_feeback_initNativeFunctionAddresses())
- supported_extensions.remove("GL_NV_transform_feeback");
+ if (supported_extensions.contains("GL_NV_transform_feedback") && !NV_transform_feedback_initNativeFunctionAddresses())
+ supported_extensions.remove("GL_NV_transform_feedback");
if (supported_extensions.contains("GL_NV_vertex_array_range") && !NV_vertex_array_range_initNativeFunctionAddresses())
supported_extensions.remove("GL_NV_vertex_array_range");
if (supported_extensions.contains("GL_NV_vertex_program") && !NV_vertex_program_initNativeFunctionAddresses())
@@ -2756,7 +2756,7 @@
this.GL_NV_texture_shader = supported_extensions.contains("GL_NV_texture_shader");
this.GL_NV_texture_shader2 = supported_extensions.contains("GL_NV_texture_shader2");
this.GL_NV_texture_shader3 = supported_extensions.contains("GL_NV_texture_shader3");
- this.GL_NV_transform_feeback = supported_extensions.contains("GL_NV_transform_feeback");
+ this.GL_NV_transform_feedback = supported_extensions.contains("GL_NV_transform_feedback");
this.GL_NV_vertex_array_range = supported_extensions.contains("GL_NV_vertex_array_range");
this.GL_NV_vertex_array_range2 = supported_extensions.contains("GL_NV_vertex_array_range2");
this.GL_NV_vertex_program = supported_extensions.contains("GL_NV_vertex_program")
Deleted: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeeback.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeeback.java 2006-11-19 22:01:56 UTC (rev 2667)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeeback.java 2006-11-19 22:06:46 UTC (rev 2668)
@@ -1,181 +0,0 @@
-/* MACHINE GENERATED FILE, DO NOT EDIT */
-
-package org.lwjgl.opengl;
-
-import org.lwjgl.LWJGLException;
-import org.lwjgl.BufferChecks;
-import java.nio.*;
-
-public final class NVTransformFeeback {
- /**
- * 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 NVTransformFeeback() {
- }
-
-
- public static void glBindBufferRangeNV(int target, int index, int buffer, long offset, long size) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.NV_transform_feeback_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_feeback_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_feeback_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_feeback_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_feeback_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_feeback_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_feeback_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_feeback_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_feeback_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_feeback_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_feeback_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);
-}
Added: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java (rev 0)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeedback.java 2006-11-19 22:06:46 UTC (rev 2668)
@@ -0,0 +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);
+}
Deleted: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeeback.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeeback.c 2006-11-19 22:01:56 UTC (rev 2667)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeeback.c 2006-11-19 22:06:46 UTC (rev 2668)
@@ -1,82 +0,0 @@
-/* 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_NVTransformFeeback_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_NVTransformFeeback_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_NVTransformFeeback_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_NVTransformFeeback_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_NVTransformFeeback_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_NVTransformFeeback_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_NVTransformFeeback_nglEndTransformFeedbackNV(JNIEnv *env, jclass clazz, jlong function_pointer) {
- glEndTransformFeedbackNVPROC glEndTransformFeedbackNV = (glEndTransformFeedbackNVPROC)((intptr_t)function_pointer);
- glEndTransformFeedbackNV();
-}
-
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_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_NVTransformFeeback_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_NVTransformFeeback_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_NVTransformFeeback_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);
-}
-
Added: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c (rev 0)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeedback.c 2006-11-19 22:06:46 UTC (rev 2668)
@@ -0,0 +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);
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-19 22:01:58
|
Revision: 2667
http://svn.sourceforge.net/java-game-lib/?rev=2667&view=rev
Author: elias_naur
Date: 2006-11-19 14:01:56 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Renamed NV_transform_feeback.java to NV_transform_feedback.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java
Removed Paths:
-------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java
Deleted: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java 2006-11-19 21:49:10 UTC (rev 2666)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java 2006-11-19 22:01:56 UTC (rev 2667)
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.lwjgl.opengl;
-
-import org.lwjgl.util.generator.*;
-
-import java.nio.IntBuffer;
-import java.nio.ByteBuffer;
-
-public interface NV_transform_feeback {
-
- /**
- * Accepted by the <target> parameters of BindBuffer, BufferData,
- * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
- * GetBufferPointerv, BindBufferRangeNV, BindBufferOffsetNV and
- * BindBufferBaseNV:
- */
- int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8C8E;
-
- /**
- * Accepted by the <param> parameter of GetIntegerIndexedvEXT and
- * GetBooleanIndexedvEXT:
- */
- int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8C84;
- int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8C85;
- 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:
- */
- int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F;
-
- /**
- * Accepted by the <bufferMode> parameter of TransformFeedbackAttribsNV and
- * TransformFeedbackVaryingsNV:
- */
- int GL_INTERLEAVED_ATTRIBS_NV = 0x8C8C;
- int GL_SEPARATE_ATTRIBS_NV = 0x8C8D;
-
- /**
- * Accepted by the <target> parameter of BeginQuery, EndQuery, and
- * GetQueryiv:
- */
- int GL_PRIMITIVES_GENERATED_NV = 0x8C87;
- 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:
- */
- int GL_RASTERIZER_DISCARD_NV = 0x8C89;
-
- /**
- * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
- * and GetFloatv:
- */
- int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8C8A;
- int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8C8B;
- int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8C80;
- int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8C7E;
-
- /** Accepted by the <pname> parameter of GetProgramiv: */
- int GL_ACTIVE_VARYINGS_NV = 0x8C81;
- int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8C82;
- int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8C83;
-
- /**
- * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
- * GetFloatv, and GetProgramiv:
- */
- int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8C7F;
-
- /** Accepted by the <attribs> parameter of TransformFeedbackAttribsNV: */
- int GL_BACK_PRIMARY_COLOR_NV = 0x8C77;
- int GL_BACK_SECONDARY_COLOR_NV = 0x8C78;
- int GL_TEXTURE_COORD_NV = 0x8C79;
- int GL_CLIP_DISTANCE_NV = 0x8C7A;
- int GL_VERTEX_ID_NV = 0x8C7B;
- int GL_PRIMITIVE_ID_NV = 0x8C7C;
- int GL_GENERIC_ATTRIB_NV = 0x8C7D;
-
- void glBindBufferRangeNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size);
-
- void glBindBufferOffsetNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset);
-
- void glBindBufferBaseNV(@GLenum int target, @GLuint int index, @GLuint int buffer);
-
- void glTransformFeedbackAttribsNV(@AutoSize("attribs") @GLsizei int count, @Const IntBuffer attribs, @GLenum int bufferMode);
-
- void glTransformFeedbackVaryingsNV(@GLuint int program, @AutoSize("locations") @GLsizei int count, @Const IntBuffer locations, @GLenum int bufferMode);
-
- void glBeginTransformFeedbackNV(@GLenum int primitiveMode);
-
- void glEndTransformFeedbackNV();
-
- int glGetVaryingLocationNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
-
- void glGetActiveVaryingNV(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int bufSize,
- @Check("1") @GLsizei IntBuffer length,
- @Check("1") @GLsizei IntBuffer size,
- @Check("1") @GLenum IntBuffer type, @GLchar ByteBuffer name);
-
- void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
-
- void glGetTransformFeedbackVaryingNV(@GLuint int program, @GLuint int index, @Check("1") IntBuffer location);
-
-}
\ No newline at end of file
Copied: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java (from rev 2666, trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feeback.java)
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java 2006-11-19 22:01:56 UTC (rev 2667)
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.IntBuffer;
+import java.nio.ByteBuffer;
+
+public interface NV_transform_feedback {
+
+ /**
+ * Accepted by the <target> parameters of BindBuffer, BufferData,
+ * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+ * GetBufferPointerv, BindBufferRangeNV, BindBufferOffsetNV and
+ * BindBufferBaseNV:
+ */
+ int GL_TRANSFORM_FEEDBACK_BUFFER_NV = 0x8C8E;
+
+ /**
+ * Accepted by the <param> parameter of GetIntegerIndexedvEXT and
+ * GetBooleanIndexedvEXT:
+ */
+ int GL_TRANSFORM_FEEDBACK_BUFFER_START_NV = 0x8C84;
+ int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV = 0x8C85;
+ 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:
+ */
+ int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV = 0x8C8F;
+
+ /**
+ * Accepted by the <bufferMode> parameter of TransformFeedbackAttribsNV and
+ * TransformFeedbackVaryingsNV:
+ */
+ int GL_INTERLEAVED_ATTRIBS_NV = 0x8C8C;
+ int GL_SEPARATE_ATTRIBS_NV = 0x8C8D;
+
+ /**
+ * Accepted by the <target> parameter of BeginQuery, EndQuery, and
+ * GetQueryiv:
+ */
+ int GL_PRIMITIVES_GENERATED_NV = 0x8C87;
+ 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:
+ */
+ int GL_RASTERIZER_DISCARD_NV = 0x8C89;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
+ * and GetFloatv:
+ */
+ int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV = 0x8C8A;
+ int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV = 0x8C8B;
+ int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV = 0x8C80;
+ int GL_TRANSFORM_FEEDBACK_ATTRIBS_NV = 0x8C7E;
+
+ /** Accepted by the <pname> parameter of GetProgramiv: */
+ int GL_ACTIVE_VARYINGS_NV = 0x8C81;
+ int GL_ACTIVE_VARYING_MAX_LENGTH_NV = 0x8C82;
+ int GL_TRANSFORM_FEEDBACK_VARYINGS_NV = 0x8C83;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
+ * GetFloatv, and GetProgramiv:
+ */
+ int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV = 0x8C7F;
+
+ /** Accepted by the <attribs> parameter of TransformFeedbackAttribsNV: */
+ int GL_BACK_PRIMARY_COLOR_NV = 0x8C77;
+ int GL_BACK_SECONDARY_COLOR_NV = 0x8C78;
+ int GL_TEXTURE_COORD_NV = 0x8C79;
+ int GL_CLIP_DISTANCE_NV = 0x8C7A;
+ int GL_VERTEX_ID_NV = 0x8C7B;
+ int GL_PRIMITIVE_ID_NV = 0x8C7C;
+ int GL_GENERIC_ATTRIB_NV = 0x8C7D;
+
+ void glBindBufferRangeNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size);
+
+ void glBindBufferOffsetNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset);
+
+ void glBindBufferBaseNV(@GLenum int target, @GLuint int index, @GLuint int buffer);
+
+ void glTransformFeedbackAttribsNV(@AutoSize("attribs") @GLsizei int count, @Const IntBuffer attribs, @GLenum int bufferMode);
+
+ void glTransformFeedbackVaryingsNV(@GLuint int program, @AutoSize("locations") @GLsizei int count, @Const IntBuffer locations, @GLenum int bufferMode);
+
+ void glBeginTransformFeedbackNV(@GLenum int primitiveMode);
+
+ void glEndTransformFeedbackNV();
+
+ int glGetVaryingLocationNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
+
+ void glGetActiveVaryingNV(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int bufSize,
+ @Check("1") @GLsizei IntBuffer length,
+ @Check("1") @GLsizei IntBuffer size,
+ @Check("1") @GLenum IntBuffer type, @GLchar ByteBuffer name);
+
+ void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
+
+ void glGetTransformFeedbackVaryingNV(@GLuint int program, @GLuint int index, @Check("1") IntBuffer location);
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-19 21:49:11
|
Revision: 2666
http://svn.sourceforge.net/java-game-lib/?rev=2666&view=rev
Author: elias_naur
Date: 2006-11-19 13:49:10 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
AWTInputAdapter: Destroy Keyboard/Mouse before destroying the adapter
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java 2006-11-19 21:41:34 UTC (rev 2665)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java 2006-11-19 21:49:10 UTC (rev 2666)
@@ -90,10 +90,10 @@
public static synchronized void destroy() {
if (awt_input != null) {
+ Mouse.destroy();
+ Keyboard.destroy();
awt_input.destroy();
awt_input = null;
- Mouse.destroy();
- Keyboard.destroy();
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-19 21:41:37
|
Revision: 2665
http://svn.sourceforge.net/java-game-lib/?rev=2665&view=rev
Author: elias_naur
Date: 2006-11-19 13:41:34 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Make sure that Mouse.destroy ungrabs the cursor
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2006-11-19 21:15:51 UTC (rev 2664)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java 2006-11-19 21:41:34 UTC (rev 2665)
@@ -296,7 +296,7 @@
created = false;
buttons = null;
coord_buffer = null;
-
+
implementation.destroyMouse();
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2006-11-19 21:15:51 UTC (rev 2664)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2006-11-19 21:41:34 UTC (rev 2665)
@@ -84,10 +84,6 @@
public synchronized void destroy() {
canvas.setInput(null);
canvas = null;
- if (mouse_queue != null)
- mouse_queue.unregister();
- if (keyboard_queue != null)
- keyboard_queue.unregister();
}
public final int getWidth() {
@@ -115,8 +111,11 @@
return new MouseEventQueue(getCanvas());
}
- public void destroyMouse() {
- mouse_queue.unregister();
+ public synchronized void destroyMouse() {
+ if (mouse_queue != null) {
+ mouse_queue.unregister();
+ mouse_queue = null;
+ }
}
public int getNativeCursorCapabilities() {
@@ -145,8 +144,10 @@
}
public synchronized void destroyKeyboard() {
- if (keyboard_queue != null)
+ if (keyboard_queue != null) {
keyboard_queue.unregister();
+ keyboard_queue = null;
+ }
}
public Object createCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) throws LWJGLException {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java 2006-11-19 21:15:51 UTC (rev 2664)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java 2006-11-19 21:41:34 UTC (rev 2665)
@@ -137,6 +137,11 @@
LinuxDisplay.unlockAWT();
}
}
+
+ public void destroyMouse() {
+ ungrabInputLocked();
+ super.destroyMouse();
+ }
private void checkFocus() {
if (getCanvas().isFocusOwner()) {
@@ -148,7 +153,7 @@
}
private boolean shouldGrab() {
- return !input_released && isGrabbed();
+ return !input_released && isGrabbed() && getMouseEventQueue() != null;
}
private void update() {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2006-11-19 21:15:51 UTC (rev 2664)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2006-11-19 21:41:34 UTC (rev 2665)
@@ -348,7 +348,7 @@
}
private boolean shouldGrab() {
- return !input_released && grab;
+ return !input_released && grab && mouse != null;
}
private void updatePointerGrab() {
@@ -715,6 +715,7 @@
public void destroyMouse() {
mouse = null;
+ updateInputGrab();
}
public void pollMouse(IntBuffer coord_buffer, ByteBuffer buttons) {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2006-11-19 21:15:51 UTC (rev 2664)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2006-11-19 21:41:34 UTC (rev 2665)
@@ -194,7 +194,7 @@
private static native void nWarpCursor(long display, long window, int x, int y);
private void handlePointerMotion(boolean grab, boolean warp_pointer, long millis, long root_window, int x_root, int y_root, int x, int y) {
- doHandlePointerMotion(grab, warp_pointer, root_window, x_root, y_root, x, y, millis*1000000);
+ doHandlePointerMotion(grab, warp_pointer, root_window, x_root, y_root, x, y, millis*1000000);
}
private void handleButton(boolean grab, int button, byte state, long nanos) {
@@ -256,7 +256,7 @@
}
}
- private void resetCursor(int x, int y) {
+ private void resetCursor(int x, int y) {
last_x = x;
last_y = transformY(y);
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java 2006-11-19 21:15:51 UTC (rev 2664)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java 2006-11-19 21:41:34 UTC (rev 2665)
@@ -60,4 +60,10 @@
((MacOSXMouseEventQueue)getMouseEventQueue()).warpCursor();
had_focus = has_focus;
}
+
+ public synchronized void destroyMouse() {
+ if (getMouseEventQueue() != null)
+ getMouseEventQueue().setGrabbed(false);
+ super.destroyMouse();
+ }
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2006-11-19 21:15:51 UTC (rev 2664)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2006-11-19 21:41:34 UTC (rev 2665)
@@ -299,8 +299,10 @@
}
public void destroyMouse() {
- if (mouse_queue != null)
+ if (mouse_queue != null) {
+ mouse_queue.setGrabbed(false);
mouse_queue.unregister();
+ }
this.mouse_queue = null;
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-19 21:15:51 UTC (rev 2664)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-19 21:41:34 UTC (rev 2665)
@@ -64,12 +64,12 @@
blank_cursor = AWTUtil.createCursor(w, h, 0, 0, 1, BufferUtils.createIntBuffer(w*h), null);
}
- public synchronized void destroy() {
- super.destroy();
+ public synchronized void destroyMouse() {
if (cached_mouse != null) {
grab(false);
cached_mouse.destroy();
}
+ super.destroyMouse();
}
public synchronized void processInput(PeerInfo peer_info) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-19 21:16:02
|
Revision: 2664
http://svn.sourceforge.net/java-game-lib/?rev=2664&view=rev
Author: elias_naur
Date: 2006-11-19 13:15:51 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
AWTInputAdapter: unregister event listeners on destroy()
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2006-11-19 16:24:18 UTC (rev 2663)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java 2006-11-19 21:15:51 UTC (rev 2664)
@@ -84,6 +84,10 @@
public synchronized void destroy() {
canvas.setInput(null);
canvas = null;
+ if (mouse_queue != null)
+ mouse_queue.unregister();
+ if (keyboard_queue != null)
+ keyboard_queue.unregister();
}
public final int getWidth() {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java 2006-11-19 16:24:18 UTC (rev 2663)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java 2006-11-19 21:15:51 UTC (rev 2664)
@@ -60,7 +60,4 @@
((MacOSXMouseEventQueue)getMouseEventQueue()).warpCursor();
had_focus = has_focus;
}
-
- public void destroy() {
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-19 16:24:21
|
Revision: 2663
http://svn.sourceforge.net/java-game-lib/?rev=2663&view=rev
Author: elias_naur
Date: 2006-11-19 08:24:18 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
AWTInputAdapter.destroy() now destroys the Keyboard and Mouse to mimic the behaviour of Display.destroy() more closely.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java 2006-11-19 13:33:45 UTC (rev 2662)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java 2006-11-19 16:24:18 UTC (rev 2663)
@@ -92,6 +92,8 @@
if (awt_input != null) {
awt_input.destroy();
awt_input = null;
+ Mouse.destroy();
+ Keyboard.destroy();
}
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java 2006-11-19 13:33:45 UTC (rev 2662)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java 2006-11-19 16:24:18 UTC (rev 2663)
@@ -140,18 +140,25 @@
+ (fps / (timeUsed / 1000f)));
fps = 0;
}
- Mouse.poll();
- while (Mouse.next()) {
- view_roty += Mouse.getEventDX()*.1;
- view_rotx -= Mouse.getEventDY()*.1;
+ if (Mouse.isCreated()) {
+ Mouse.poll();
+ while (Mouse.next()) {
+ view_roty += Mouse.getEventDX()*.1;
+ view_rotx -= Mouse.getEventDY()*.1;
+ }
}
- Keyboard.poll();
- while (Keyboard.next()) {
+ if (Keyboard.isCreated()) {
+ Keyboard.poll();
+ }
+ while (Keyboard.isCreated() && Keyboard.next()) {
if (Keyboard.getEventKeyState()) {
switch (Keyboard.getEventKey()) {
case Keyboard.KEY_ESCAPE:
System.exit(0);
break;
+ case Keyboard.KEY_H:
+ AWTInputAdapter.destroy();
+ break;
case Keyboard.KEY_G:
Mouse.setGrabbed(!Mouse.isGrabbed());
break;
@@ -162,14 +169,16 @@
if (Keyboard.getEventCharacter() != Keyboard.CHAR_NONE)
System.out.println("Typed: " + Keyboard.getEventCharacter());
}
- if (Keyboard.isKeyDown(Keyboard.KEY_UP))
- view_rotx -= .1;
- else if (Keyboard.isKeyDown(Keyboard.KEY_DOWN))
- view_rotx += .1;
- if (Keyboard.isKeyDown(Keyboard.KEY_LEFT))
- view_roty -= .1;
- else if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT))
- view_roty += .1;
+ if (Keyboard.isCreated()) {
+ if (Keyboard.isKeyDown(Keyboard.KEY_UP))
+ view_rotx -= .1;
+ else if (Keyboard.isKeyDown(Keyboard.KEY_DOWN))
+ view_rotx += .1;
+ if (Keyboard.isKeyDown(Keyboard.KEY_LEFT))
+ view_roty -= .1;
+ else if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT))
+ view_roty += .1;
+ }
}
});
addWindowListener(new WindowAdapter() {
@@ -225,7 +234,7 @@
GL11.glMatrixMode(GL11.GL_PROJECTION);
- System.err.println("Use the arrow keys and the mouse to rotate the gears. Press 'G' to toggle mouse grabbing.");
+ System.err.println("Use the arrow keys and the mouse to rotate the gears. Press 'G' to toggle mouse grabbing. Press 'H' to destroy the AWTInputAdapter.");
System.err.println("GL_VENDOR: " + GL11.glGetString(GL11.GL_VENDOR));
System.err.println("GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER));
System.err.println("GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-19 13:33:49
|
Revision: 2662
http://svn.sourceforge.net/java-game-lib/?rev=2662&view=rev
Author: elias_naur
Date: 2006-11-19 05:33:45 -0800 (Sun, 19 Nov 2006)
Log Message:
-----------
Made all GL functions only query ContextCapabilities.getCapabilities() once. Now all GLCheck checks will take the ContextCapabilities instance as an argument instead of querying for it. Inspired by MatthiasM, who just don't seem to be content with LWJGL performance, ever ;)
Modified Paths:
--------------
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBColorBufferFloat.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBDrawBuffers.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBImaging.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBMatrixPalette.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBMultisample.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBMultitexture.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBPointParameters.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBProgram.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBShaderObjects.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTransposeMatrix.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBVertexBlend.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/ARBWindowPos.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIDrawBuffers.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIElementArray.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIEnvmapBumpmap.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIFragmentShader.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIMapObjectBuffer.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIPnTriangles.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATISeparateStencil.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIVertexArrayObject.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIVertexAttribArrayObject.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/ATIVertexStreams.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBindableUniform.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendColor.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendEquationSeparate.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendFuncSeparate.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTBlendMinmax.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTCompiledVertexArray.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTDepthBoundsTest.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTDrawBuffers2.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTDrawInstanced.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTDrawRangeElements.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTFogCoord.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTFramebufferBlit.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTFramebufferMultisample.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTFramebufferObject.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTFramebufferSRGB.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTGeometryShader4.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTGpuProgramParameters.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTGpuShader4.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTMultiDrawArrays.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTPackedFloat.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTPalettedTexture.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTPointParameters.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTSecondaryColor.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTStencilClearTag.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTStencilTwoSide.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTextureArray.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTextureBufferObject.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTextureCompressionLATC.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTextureCompressionRGTC.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTextureInteger.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTextureSharedExponent.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexShader.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTVertexWeighting.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL11.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL12.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL14.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/GL21.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVDepthBufferFloat.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVEvaluators.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVFence.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVFragmentProgram.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVFramebufferMultisampleCoverage.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVGeometryProgram4.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVGpuProgram4.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVHalfFloat.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVOcclusionQuery.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVParameterBufferObject.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVPixelDataRange.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVPointSprite.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVPrimitiveRestart.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVProgram.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVRegisterCombiners.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVRegisterCombiners2.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVTransformFeeback.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexArrayRange.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/NVVertexProgram.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/SGISGenerateMipmap.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/SGISTextureLOD.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBindableUniform.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendColor.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTBlendMinmax.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTDrawBuffers2.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTDrawInstanced.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTGeometryShader4.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTGpuProgramParameters.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTGpuShader4.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTextureArray.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTextureBufferObject.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTextureInteger.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL21.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVDepthBufferFloat.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVFramebufferMultisampleCoverage.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVGeometryProgram4.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVGpuProgram4.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVParameterBufferObject.c
trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVTransformFeeback.c
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java 2006-11-19 12:48:57 UTC (rev 2661)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBBufferObject.java 2006-11-19 13:33:45 UTC (rev 2662)
@@ -36,14 +36,16 @@
public static void glBindBufferARB(int target, int buffer) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBindBufferARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBindBufferARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglBindBufferARB(target, buffer, function_pointer);
}
private static native void nglBindBufferARB(int target, int buffer, long function_pointer);
public static void glDeleteBuffersARB(IntBuffer buffers) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glDeleteBuffersARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glDeleteBuffersARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(buffers);
nglDeleteBuffersARB((buffers.remaining()), buffers, buffers.position(), function_pointer);
@@ -51,7 +53,8 @@
private static native void nglDeleteBuffersARB(int n, IntBuffer buffers, int buffers_position, long function_pointer);
public static void glGenBuffersARB(IntBuffer buffers) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGenBuffersARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glGenBuffersARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(buffers);
nglGenBuffersARB((buffers.remaining()), buffers, buffers.position(), function_pointer);
@@ -59,7 +62,8 @@
private static native void nglGenBuffersARB(int n, IntBuffer buffers, int buffers_position, long function_pointer);
public static boolean glIsBufferARB(int buffer) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glIsBufferARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glIsBufferARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
boolean __result = nglIsBufferARB(buffer, function_pointer);
return __result;
@@ -67,36 +71,42 @@
private static native boolean nglIsBufferARB(int buffer, long function_pointer);
public static void glBufferDataARB(int target, long size, int usage) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglBufferDataARB(target, size, null, 0, usage, function_pointer);
}
public static void glBufferDataARB(int target, ByteBuffer data, int usage) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferDataARB(target, (data.remaining()), data, data.position(), usage, function_pointer);
}
public static void glBufferDataARB(int target, DoubleBuffer data, int usage) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferDataARB(target, (data.remaining() << 3), data, data.position() << 3, usage, function_pointer);
}
public static void glBufferDataARB(int target, FloatBuffer data, int usage) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferDataARB(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer);
}
public static void glBufferDataARB(int target, IntBuffer data, int usage) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferDataARB(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer);
}
public static void glBufferDataARB(int target, ShortBuffer data, int usage) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferDataARB(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer);
@@ -104,31 +114,36 @@
private static native void nglBufferDataARB(int target, long size, Buffer data, int data_position, int usage, long function_pointer);
public static void glBufferSubDataARB(int target, long offset, ByteBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer);
}
public static void glBufferSubDataARB(int target, long offset, DoubleBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferSubDataARB(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer);
}
public static void glBufferSubDataARB(int target, long offset, FloatBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
}
public static void glBufferSubDataARB(int target, long offset, IntBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
}
public static void glBufferSubDataARB(int target, long offset, ShortBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
@@ -136,31 +151,36 @@
private static native void nglBufferSubDataARB(int target, long offset, long size, Buffer data, int data_position, long function_pointer);
public static void glGetBufferSubDataARB(int target, long offset, ByteBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glGetBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglGetBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer);
}
public static void glGetBufferSubDataARB(int target, long offset, DoubleBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glGetBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglGetBufferSubDataARB(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer);
}
public static void glGetBufferSubDataARB(int target, long offset, FloatBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glGetBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
}
public static void glGetBufferSubDataARB(int target, long offset, IntBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glGetBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
}
public static void glGetBufferSubDataARB(int target, long offset, ShortBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glGetBufferSubDataARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(data);
nglGetBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
@@ -179,7 +199,8 @@
* @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) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glMapBufferARB_pointer;
+ 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);
@@ -189,7 +210,8 @@
private static native java.nio.ByteBuffer nglMapBufferARB(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
public static boolean glUnmapBufferARB(int target) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glUnmapBufferARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glUnmapBufferARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
boolean __result = nglUnmapBufferARB(target, function_pointer);
return __result;
@@ -197,7 +219,8 @@
private static native boolean nglUnmapBufferARB(int target, long function_pointer);
public static void glGetBufferParameterARB(int target, int pname, IntBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferParameterivARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_buffer_object_glGetBufferParameterivARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglGetBufferParameterivARB(target, pname, params, params.position(), function_pointer);
@@ -205,7 +228,8 @@
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) {
- long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferPointervARB_pointer;
+ 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);
return __result;
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBColorBufferFloat.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBColorBufferFloat.java 2006-11-19 12:48:57 UTC (rev 2661)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBColorBufferFloat.java 2006-11-19 13:33:45 UTC (rev 2662)
@@ -32,7 +32,8 @@
* Accepted as a bit set in the GLX_RENDER_TYPE variable
*/
public static void glClampColorARB(int target, int clamp) {
- long function_pointer = GLContext.getCapabilities().ARB_color_buffer_float_glClampColorARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_color_buffer_float_glClampColorARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglClampColorARB(target, clamp, function_pointer);
}
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBDrawBuffers.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBDrawBuffers.java 2006-11-19 12:48:57 UTC (rev 2661)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBDrawBuffers.java 2006-11-19 13:33:45 UTC (rev 2662)
@@ -34,7 +34,8 @@
public static void glDrawBuffersARB(IntBuffer buffers) {
- long function_pointer = GLContext.getCapabilities().ARB_draw_buffers_glDrawBuffersARB_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_draw_buffers_glDrawBuffersARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(buffers);
nglDrawBuffersARB((buffers.remaining()), buffers, buffers.position(), function_pointer);
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBImaging.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBImaging.java 2006-11-19 12:48:57 UTC (rev 2661)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBImaging.java 2006-11-19 13:33:45 UTC (rev 2662)
@@ -88,67 +88,76 @@
public static void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(data, 256);
nglColorTable(target, internalFormat, width, format, type, data, data.position(), function_pointer);
}
public static void glColorTable(int target, int internalFormat, int width, int format, int type, DoubleBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(data, 256);
nglColorTable(target, internalFormat, width, format, type, data, data.position() << 3, function_pointer);
}
public static void glColorTable(int target, int internalFormat, int width, int format, int type, FloatBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(data, 256);
nglColorTable(target, internalFormat, width, format, type, data, data.position() << 2, function_pointer);
}
private static native void nglColorTable(int target, int internalFormat, int width, int format, int type, Buffer data, int data_position, long function_pointer);
public static void glColorTable(int target, int internalFormat, int width, int format, int type, long data_buffer_offset) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOenabled();
+ GLChecks.ensureUnpackPBOenabled(caps);
nglColorTableBO(target, internalFormat, width, format, type, data_buffer_offset, function_pointer);
}
private static native void nglColorTableBO(int target, int internalFormat, int width, int format, int type, long data_buffer_offset, long function_pointer);
public static void glColorSubTable(int target, int start, int count, int format, int type, ByteBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorSubTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(data, 256);
nglColorSubTable(target, start, count, format, type, data, data.position(), function_pointer);
}
public static void glColorSubTable(int target, int start, int count, int format, int type, DoubleBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorSubTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(data, 256);
nglColorSubTable(target, start, count, format, type, data, data.position() << 3, function_pointer);
}
public static void glColorSubTable(int target, int start, int count, int format, int type, FloatBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorSubTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(data, 256);
nglColorSubTable(target, start, count, format, type, data, data.position() << 2, function_pointer);
}
private static native void nglColorSubTable(int target, int start, int count, int format, int type, Buffer data, int data_position, long function_pointer);
public static void glColorSubTable(int target, int start, int count, int format, int type, long data_buffer_offset) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorSubTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOenabled();
+ GLChecks.ensureUnpackPBOenabled(caps);
nglColorSubTableBO(target, start, count, format, type, data_buffer_offset, function_pointer);
}
private static native void nglColorSubTableBO(int target, int start, int count, int format, int type, long data_buffer_offset, long function_pointer);
public static void glColorTableParameter(int target, int pname, IntBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTableParameteriv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorTableParameteriv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglColorTableParameteriv(target, pname, params, params.position(), function_pointer);
@@ -156,7 +165,8 @@
private static native void nglColorTableParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
public static void glColorTableParameter(int target, int pname, FloatBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTableParameterfv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glColorTableParameterfv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglColorTableParameterfv(target, pname, params, params.position(), function_pointer);
@@ -164,33 +174,38 @@
private static native void nglColorTableParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer);
public static void glCopyColorSubTable(int target, int start, int x, int y, int width) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glCopyColorSubTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glCopyColorSubTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglCopyColorSubTable(target, start, x, y, width, function_pointer);
}
private static native void nglCopyColorSubTable(int target, int start, int x, int y, int width, long function_pointer);
public static void glCopyColorTable(int target, int internalformat, int x, int y, int width) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glCopyColorTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glCopyColorTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglCopyColorTable(target, internalformat, x, y, width, function_pointer);
}
private static native void nglCopyColorTable(int target, int internalformat, int x, int y, int width, long function_pointer);
public static void glGetColorTable(int target, int format, int type, ByteBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetColorTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(data, 256);
nglGetColorTable(target, format, type, data, data.position(), function_pointer);
}
public static void glGetColorTable(int target, int format, int type, DoubleBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetColorTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(data, 256);
nglGetColorTable(target, format, type, data, data.position() << 3, function_pointer);
}
public static void glGetColorTable(int target, int format, int type, FloatBuffer data) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetColorTable_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(data, 256);
nglGetColorTable(target, format, type, data, data.position() << 2, function_pointer);
@@ -198,7 +213,8 @@
private static native void nglGetColorTable(int target, int format, int type, Buffer data, int data_position, long function_pointer);
public static void glGetColorTableParameter(int target, int pname, IntBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTableParameteriv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetColorTableParameteriv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglGetColorTableParameteriv(target, pname, params, params.position(), function_pointer);
@@ -206,7 +222,8 @@
private static native void nglGetColorTableParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
public static void glGetColorTableParameter(int target, int pname, FloatBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTableParameterfv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetColorTableParameterfv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglGetColorTableParameterfv(target, pname, params, params.position(), function_pointer);
@@ -214,79 +231,90 @@
private static native void nglGetColorTableParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer);
public static void glBlendEquation(int mode) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glBlendEquation_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glBlendEquation_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglBlendEquation(mode, function_pointer);
}
private static native void nglBlendEquation(int mode, long function_pointer);
public static void glBlendColor(float red, float green, float blue, float alpha) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glBlendColor_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glBlendColor_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglBlendColor(red, green, blue, alpha, function_pointer);
}
private static native void nglBlendColor(float red, float green, float blue, float alpha, long function_pointer);
public static void glHistogram(int target, int width, int internalformat, boolean sink) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glHistogram_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glHistogram_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglHistogram(target, width, internalformat, sink, function_pointer);
}
private static native void nglHistogram(int target, int width, int internalformat, boolean sink, long function_pointer);
public static void glResetHistogram(int target) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glResetHistogram_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glResetHistogram_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglResetHistogram(target, function_pointer);
}
private static native void nglResetHistogram(int target, long function_pointer);
public static void glGetHistogram(int target, boolean reset, int format, int type, ByteBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetHistogram_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 256);
nglGetHistogram(target, reset, format, type, values, values.position(), function_pointer);
}
public static void glGetHistogram(int target, boolean reset, int format, int type, DoubleBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetHistogram_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 256);
nglGetHistogram(target, reset, format, type, values, values.position() << 3, function_pointer);
}
public static void glGetHistogram(int target, boolean reset, int format, int type, FloatBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetHistogram_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 256);
nglGetHistogram(target, reset, format, type, values, values.position() << 2, function_pointer);
}
public static void glGetHistogram(int target, boolean reset, int format, int type, IntBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetHistogram_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 256);
nglGetHistogram(target, reset, format, type, values, values.position() << 2, function_pointer);
}
public static void glGetHistogram(int target, boolean reset, int format, int type, ShortBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetHistogram_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 256);
nglGetHistogram(target, reset, format, type, values, values.position() << 1, function_pointer);
}
private static native void nglGetHistogram(int target, boolean reset, int format, int type, Buffer values, int values_position, long function_pointer);
public static void glGetHistogram(int target, boolean reset, int format, int type, long values_buffer_offset) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetHistogram_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOenabled();
+ GLChecks.ensurePackPBOenabled(caps);
nglGetHistogramBO(target, reset, format, type, values_buffer_offset, function_pointer);
}
private static native void nglGetHistogramBO(int target, boolean reset, int format, int type, long values_buffer_offset, long function_pointer);
public static void glGetHistogramParameter(int target, int pname, FloatBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogramParameterfv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetHistogramParameterfv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 256);
nglGetHistogramParameterfv(target, pname, params, params.position(), function_pointer);
@@ -294,7 +322,8 @@
private static native void nglGetHistogramParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer);
public static void glGetHistogramParameter(int target, int pname, IntBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogramParameteriv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetHistogramParameteriv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 256);
nglGetHistogramParameteriv(target, pname, params, params.position(), function_pointer);
@@ -302,65 +331,74 @@
private static native void nglGetHistogramParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
public static void glMinmax(int target, int internalformat, boolean sink) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glMinmax_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glMinmax_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglMinmax(target, internalformat, sink, function_pointer);
}
private static native void nglMinmax(int target, int internalformat, boolean sink, long function_pointer);
public static void glResetMinmax(int target) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glResetMinmax_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glResetMinmax_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglResetMinmax(target, function_pointer);
}
private static native void nglResetMinmax(int target, long function_pointer);
public static void glGetMinmax(int target, boolean reset, int format, int types, ByteBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetMinmax_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 4);
nglGetMinmax(target, reset, format, types, values, values.position(), function_pointer);
}
public static void glGetMinmax(int target, boolean reset, int format, int types, DoubleBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetMinmax_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 4);
nglGetMinmax(target, reset, format, types, values, values.position() << 3, function_pointer);
}
public static void glGetMinmax(int target, boolean reset, int format, int types, FloatBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetMinmax_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 4);
nglGetMinmax(target, reset, format, types, values, values.position() << 2, function_pointer);
}
public static void glGetMinmax(int target, boolean reset, int format, int types, IntBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetMinmax_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 4);
nglGetMinmax(target, reset, format, types, values, values.position() << 2, function_pointer);
}
public static void glGetMinmax(int target, boolean reset, int format, int types, ShortBuffer values) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetMinmax_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
BufferChecks.checkBuffer(values, 4);
nglGetMinmax(target, reset, format, types, values, values.position() << 1, function_pointer);
}
private static native void nglGetMinmax(int target, boolean reset, int format, int types, Buffer values, int values_position, long function_pointer);
public static void glGetMinmax(int target, boolean reset, int format, int types, long values_buffer_offset) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetMinmax_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOenabled();
+ GLChecks.ensurePackPBOenabled(caps);
nglGetMinmaxBO(target, reset, format, types, values_buffer_offset, function_pointer);
}
private static native void nglGetMinmaxBO(int target, boolean reset, int format, int types, long values_buffer_offset, long function_pointer);
public static void glGetMinmaxParameter(int target, int pname, FloatBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmaxParameterfv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetMinmaxParameterfv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglGetMinmaxParameterfv(target, pname, params, params.position(), function_pointer);
@@ -368,7 +406,8 @@
private static native void nglGetMinmaxParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer);
public static void glGetMinmaxParameter(int target, int pname, IntBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmaxParameteriv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetMinmaxParameteriv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglGetMinmaxParameteriv(target, pname, params, params.position(), function_pointer);
@@ -376,88 +415,100 @@
private static native void nglGetMinmaxParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(image, GLChecks.calculateImageStorage(image, format, type, width, 1, 1));
nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position(), function_pointer);
}
public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, DoubleBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(image, GLChecks.calculateImageStorage(image, format, type, width, 1, 1));
nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 3, function_pointer);
}
public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, FloatBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(image, GLChecks.calculateImageStorage(image, format, type, width, 1, 1));
nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 2, function_pointer);
}
public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, IntBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(image, GLChecks.calculateImageStorage(image, format, type, width, 1, 1));
nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 2, function_pointer);
}
public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(image, GLChecks.calculateImageStorage(image, format, type, width, 1, 1));
nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 1, function_pointer);
}
private static native void nglConvolutionFilter1D(int target, int internalformat, int width, int format, int type, Buffer image, int image_position, long function_pointer);
public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, long image_buffer_offset) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOenabled();
+ GLChecks.ensureUnpackPBOenabled(caps);
nglConvolutionFilter1DBO(target, internalformat, width, format, type, image_buffer_offset, function_pointer);
}
private static native void nglConvolutionFilter1DBO(int target, int internalformat, int width, int format, int type, long image_buffer_offset, long function_pointer);
public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(image, GLChecks.calculateImageStorage(image, format, type, width, height, 1));
nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position(), function_pointer);
}
public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(image, GLChecks.calculateImageStorage(image, format, type, width, height, 1));
nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 2, function_pointer);
}
public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled();
+ GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkBuffer(image, GLChecks.calculateImageStorage(image, format, type, width, height, 1));
nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 1, function_pointer);
}
private static native void nglConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image, int image_position, long function_pointer);
public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, long image_buffer_offset) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionFilter2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOenabled();
+ GLChecks.ensureUnpackPBOenabled(caps);
nglConvolutionFilter2DBO(target, internalformat, width, height, format, type, image_buffer_offset, function_pointer);
}
private static native void nglConvolutionFilter2DBO(int target, int internalformat, int width, int height, int format, int type, long image_buffer_offset, long function_pointer);
public static void glConvolutionParameterf(int target, int pname, float params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionParameterf_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionParameterf_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglConvolutionParameterf(target, pname, params, function_pointer);
}
private static native void nglConvolutionParameterf(int target, int pname, float params, long function_pointer);
public static void glConvolutionParameter(int target, int pname, FloatBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionParameterfv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionParameterfv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglConvolutionParameterfv(target, pname, params, params.position(), function_pointer);
@@ -465,14 +516,16 @@
private static native void nglConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer);
public static void glConvolutionParameteri(int target, int pname, int params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionParameteri_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionParameteri_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglConvolutionParameteri(target, pname, params, function_pointer);
}
private static native void nglConvolutionParameteri(int target, int pname, int params, long function_pointer);
public static void glConvolutionParameter(int target, int pname, IntBuffer params) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionParameteriv_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glConvolutionParameteriv_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(params, 4);
nglConvolutionParameteriv(target, pname, params, params.position(), function_pointer);
@@ -480,65 +533,74 @@
private static native void nglConvolutionParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
public static void glCopyConvolutionFilter1D(int target, int internalformat, int x, int y, int width) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glCopyConvolutionFilter1D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glCopyConvolutionFilter1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglCopyConvolutionFilter1D(target, internalformat, x, y, width, function_pointer);
}
private static native void nglCopyConvolutionFilter1D(int target, int internalformat, int x, int y, int width, long function_pointer);
public static void glCopyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glCopyConvolutionFilter2D_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glCopyConvolutionFilter2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglCopyConvolutionFilter2D(target, internalformat, x, y, width, height, function_pointer);
}
private static native void nglCopyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height, long function_pointer);
public static void glGetConvolutionFilter(int target, int format, int type, ByteBuffer image) {
- long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer;
+ ContextCapabilities caps = GLContext.getCapabilities();
+ long function_pointer = caps.ARB_imaging_glGetConvolutionFilter_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled();
+ GLChecks.ensurePackPBOdisabled(caps);
Buffe...
[truncated message content] |
