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
|
|
From: <ma...@us...> - 2012-02-06 20:35:31
|
Revision: 3741
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3741&view=rev
Author: matzon
Date: 2012-02-06 20:35:25 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
applied dr_evil's maximized patch
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 2012-02-06 19:26:21 UTC (rev 3740)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-02-06 20:35:25 UTC (rev 3741)
@@ -125,6 +125,7 @@
private static final int SW_SHOWMINNOACTIVE = 7;
private static final int SW_SHOWDEFAULT = 10;
private static final int SW_RESTORE = 9;
+ private static final int SW_MAXIMIZE = 3;
private static final int ICON_SMALL = 0;
private static final int ICON_BIG = 1;
@@ -176,10 +177,11 @@
private boolean mode_set;
private boolean isMinimized;
private boolean isFocused;
- private boolean did_maximize;
+ private boolean redoMakeContextCurrent;
private boolean inAppActivate;
private boolean resized;
private boolean resizable;
+ private boolean maximized;
private int width;
private int height;
@@ -202,7 +204,8 @@
is_dirty = false;
isMinimized = false;
isFocused = false;
- did_maximize = false;
+ redoMakeContextCurrent = false;
+ maximized = false;
this.parent = parent;
hasParent = parent != null;
long parent_hwnd = parent != null ? getHwnd(parent) : 0;
@@ -327,11 +330,15 @@
restoreDisplayMode();
}
if (parent == null) {
- showWindow(getHwnd(), SW_RESTORE);
+ if(maximized) {
+ showWindow(getHwnd(), SW_MAXIMIZE);
+ } else {
+ showWindow(getHwnd(), SW_RESTORE);
+ }
setForegroundWindow(getHwnd());
setFocus(getHwnd());
}
- did_maximize = true;
+ redoMakeContextCurrent = true;
if (Display.isFullscreen())
updateClipping();
} else if (Display.isFullscreen()) {
@@ -485,8 +492,8 @@
if (parent != null && parent.isFocusOwner()) {
setFocus(getHwnd());
}
- if (did_maximize) {
- did_maximize = false;
+ if (redoMakeContextCurrent) {
+ redoMakeContextCurrent = false;
/**
* WORKAROUND:
* Making the context current (redundantly) when the window
@@ -867,6 +874,7 @@
switch ((int)wParam) {
case SIZE_RESTORED:
case SIZE_MAXIMIZED:
+ maximized = ((int)wParam) == SIZE_MAXIMIZED;
resized = true;
updateWidthAndHeight();
setMinimized(false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-02-06 19:26:28
|
Revision: 3740
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3740&view=rev
Author: spasi
Date: 2012-02-06 19:26:21 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
Added support for AMD_media_ops2.
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_media_ops2.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_media_ops2.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_media_ops2.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/AMD_media_ops2.java 2012-02-06 19:26:21 UTC (rev 3740)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2010 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.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface AMD_media_ops2 {
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-02-01 22:51:06
|
Revision: 3739
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3739&view=rev
Author: matzon
Date: 2012-02-01 22:50:59 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
updated fix for resizable
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 2012-02-01 21:33:45 UTC (rev 3738)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-02-01 22:50:59 UTC (rev 3739)
@@ -207,6 +207,7 @@
hasParent = parent != null;
long parent_hwnd = parent != null ? getHwnd(parent) : 0;
this.hwnd = nCreateWindow(x, y, mode.getWidth(), mode.getHeight(), Display.isFullscreen() || isUndecorated(), parent != null, parent_hwnd);
+ this.resizable=false;
if (hwnd == 0) {
throw new LWJGLException("Failed to create window");
}
@@ -372,7 +373,6 @@
if (mode_set) {
mode_set = false;
nResetDisplayMode();
- setResizable(this.resizable);
}
resetCursorClipping();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-02-01 21:33:52
|
Revision: 3738
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3738&view=rev
Author: matzon
Date: 2012-02-01 21:33:45 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
applying suggested fix for resize issue
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 2012-01-31 23:25:44 UTC (rev 3737)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-02-01 21:33:45 UTC (rev 3738)
@@ -372,6 +372,7 @@
if (mode_set) {
mode_set = false;
nResetDisplayMode();
+ setResizable(this.resizable);
}
resetCursorClipping();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-01-31 23:25:50
|
Revision: 3737
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3737&view=rev
Author: kappa1
Date: 2012-01-31 23:25:44 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
removed a tiny bit of dead debug code
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2012-01-31 23:24:28 UTC (rev 3736)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2012-01-31 23:25:44 UTC (rev 3737)
@@ -76,7 +76,7 @@
private int accum_dx;
private int accum_dy;
private int accum_dz;
- private byte[] buttons;// = new byte[NUM_BUTTONS];
+ private byte[] buttons;
private EventQueue event_queue;
private long last_event_nanos;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-01-31 23:24:35
|
Revision: 3736
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3736&view=rev
Author: kappa1
Date: 2012-01-31 23:24:28 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Linux Mouse: added support for using more than 3 buttons on a mouse, supports mice with upto 256 buttons.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxMouse.c
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2012-01-29 20:35:22 UTC (rev 3735)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java 2012-01-31 23:24:28 UTC (rev 3736)
@@ -43,17 +43,23 @@
import org.lwjgl.input.Mouse;
final class LinuxMouse {
- private static final int NUM_BUTTONS = 3;
private static final int POINTER_WARP_BORDER = 10;
// scale the mouse wheel according to DirectInput
private static final int WHEEL_SCALE = 120;
+ private int button_count;
+
/* X11 constants */
private static final int Button1 = 1;
private static final int Button2 = 2;
private static final int Button3 = 3;
private static final int Button4 = 4;
private static final int Button5 = 5;
+
+ private static final int Button6 = 6; // wheel tilt left *rare*
+ private static final int Button7 = 7; // wheel tilt right *rare*
+ private static final int Button8 = 8; // back button
+ private static final int Button9 = 9; // forward button
private static final int ButtonPress = 4;
private static final int ButtonRelease = 5;
@@ -70,7 +76,7 @@
private int accum_dx;
private int accum_dy;
private int accum_dz;
- private byte[] buttons = new byte[NUM_BUTTONS];
+ private byte[] buttons;// = new byte[NUM_BUTTONS];
private EventQueue event_queue;
private long last_event_nanos;
@@ -79,6 +85,8 @@
this.window = window;
this.input_window = input_window;
this.warp_atom = LinuxDisplay.nInternAtom(display, "_LWJGL", false);
+ button_count = nGetButtonCount(display);
+ buttons = new byte[button_count];
reset(false, false);
}
@@ -189,6 +197,8 @@
}
private static native int nGetWindowHeight(long display, long window);
private static native int nGetWindowWidth(long display, long window);
+
+ private static native int nGetButtonCount(long display);
private static native long nQueryPointer(long display, long window, IntBuffer result);
@@ -213,7 +223,23 @@
case Button3:
button_num = (byte)1;
break;
+ case Button6:
+ button_num = (byte)5;
+ break;
+ case Button7:
+ button_num = (byte)6;
+ break;
+ case Button8:
+ button_num = (byte)3; // back button
+ break;
+ case Button9:
+ button_num = (byte)4; // forward button
+ break;
default:
+ if (button > Button9 && button <= button_count) {
+ button_num = (byte)(button-1);
+ break;
+ }
return;
}
buttons[button_num] = state;
Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxMouse.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxMouse.c 2012-01-29 20:35:22 UTC (rev 3735)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxMouse.c 2012-01-31 23:24:28 UTC (rev 3736)
@@ -103,3 +103,16 @@
warp_event.xclient.data.l[1] = y;
XSendEvent(disp, win, False, 0, &warp_event);
}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxMouse_nGetButtonCount(JNIEnv *env, jclass unused, jlong display_ptr) {
+ Display *disp = (Display *)(intptr_t)display_ptr;
+
+ int count = 256;
+
+ unsigned char * pointer_map = malloc(sizeof(unsigned char) * count);
+ count = XGetPointerMapping(disp, pointer_map, count);
+
+ free(pointer_map);
+
+ return count;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-29 20:35:29
|
Revision: 3735
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3735&view=rev
Author: matzon
Date: 2012-01-29 20:35:22 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
limit mouse buttons to 5, since we can't read more at this time
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java 2012-01-29 20:26:13 UTC (rev 3734)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java 2012-01-29 20:35:22 UTC (rev 3735)
@@ -65,7 +65,7 @@
WindowsMouse(long hwnd) throws LWJGLException {
this.hwnd = hwnd;
- this.mouse_button_count = WindowsDisplay.getSystemMetrics(WindowsDisplay.SM_CMOUSEBUTTONS);
+ this.mouse_button_count = Math.min(5, WindowsDisplay.getSystemMetrics(WindowsDisplay.SM_CMOUSEBUTTONS));
this.has_wheel = WindowsDisplay.getSystemMetrics(WindowsDisplay.SM_MOUSEWHEELPRESENT) != 0;
this.blank_cursor = createBlankCursor();
this.button_states = new byte[mouse_button_count];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-29 20:26:19
|
Revision: 3734
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3734&view=rev
Author: matzon
Date: 2012-01-29 20:26:13 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
support for 5 buttons on windows
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 2012-01-29 19:06:13 UTC (rev 3733)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-01-29 20:26:13 UTC (rev 3734)
@@ -63,6 +63,9 @@
private static final int WM_MBUTTONDOWN = 0x0207;
private static final int WM_MBUTTONUP = 0x0208;
private static final int WM_MBUTTONDBLCLK = 0x0209;
+ private static final int WM_XBUTTONDOWN = 0x020B;
+ private static final int WM_XBUTTONUP = 0x020C;
+ private static final int WM_XBUTTONDBLCLK = 0x020D;
private static final int WM_MOUSEWHEEL = 0x020A;
private static final int WM_CAPTURECHANGED = 0x0215;
private static final int WM_MOUSELEAVE = 0x02A3;
@@ -146,8 +149,12 @@
private static final int WS_MAXIMIZEBOX = 0x00010000;
private static final int HTCLIENT = 0x01;
+
+ private static final int MK_XBUTTON1 = 0x0020;
+ private static final int MK_XBUTTON2 = 0x0040;
+ private static final int XBUTTON1 = 0x0001;
+ private static final int XBUTTON2 = 0x0002;
-
private static WindowsDisplay current_display;
private static boolean cursor_clipped;
@@ -924,6 +931,20 @@
case WM_MBUTTONUP:
handleMouseButton(2, 0, millis);
return 0;
+ case WM_XBUTTONUP:
+ if((wParam >> 16) == XBUTTON1) {
+ handleMouseButton(3, 0, millis);
+ } else {
+ handleMouseButton(4, 0, millis);
+ }
+ return 1;
+ case WM_XBUTTONDOWN:
+ if((wParam & 0xFF) == MK_XBUTTON1) {
+ handleMouseButton(3, 1, millis);
+ } else {
+ handleMouseButton(4, 1, millis);
+ }
+ return 1;
case WM_SYSCHAR:
case WM_CHAR:
handleChar(wParam, lParam, millis);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-01-29 19:06:19
|
Revision: 3733
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3733&view=rev
Author: spasi
Date: 2012-01-29 19:06:13 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Removed @Check("1") from BufferData functions.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-28 19:35:16 UTC (rev 3732)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-29 19:06:13 UTC (rev 3733)
@@ -83,7 +83,7 @@
@GenerateAutos
void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB long size,
- @Check("1")
+ @Check
@Const
@GLbyte
@GLshort
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-28 19:35:16 UTC (rev 3732)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-29 19:06:13 UTC (rev 3733)
@@ -862,7 +862,7 @@
@Dependent("OpenGL15")
@GenerateAutos
void glNamedBufferDataEXT(@GLuint int buffer, @AutoSize("data") @GLsizeiptr long size,
- @Check("1")
+ @Check
@Const
@GLbyte
@GLshort
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-28 19:35:16 UTC (rev 3732)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-29 19:06:13 UTC (rev 3733)
@@ -109,7 +109,7 @@
@GenerateAutos
void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size,
- @Check("1")
+ @Check
@Const
@GLbyte
@GLshort
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-28 19:35:16 UTC (rev 3732)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-29 19:06:13 UTC (rev 3733)
@@ -480,7 +480,7 @@
@GenerateAutos
void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size,
- @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage);
+ @Check @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage);
void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
@Check @Const @GLbyte @GLshort @GLint @GLfloat Buffer data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-01-28 19:35:23
|
Revision: 3732
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3732&view=rev
Author: spasi
Date: 2012-01-28 19:35:16 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
Added AMD_stencil_operation_extended.
Reverted @Check("1") from SubData BO functions.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_stencil_operation_extended.java 2012-01-28 19:35:16 UTC (rev 3732)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2002-2012 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.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+public interface AMD_stencil_operation_extended {
+
+ /**
+ * Accepted by the <sfail>, <dpfail> and <dppass> parameters of StencilOp
+ * and StencilOpSeparate:
+ */
+ int GL_SET_AMD = 0x874A,
+ GL_AND = 0x1501,
+ GL_XOR = 0x1506,
+ GL_OR = 0x1507,
+ GL_NOR = 0x1508,
+ GL_EQUIV = 0x1509,
+ GL_NAND = 0x150E,
+ GL_REPLACE_VALUE_AMD = 0x874B;
+
+ /**
+ * Accepted by the <param> parameter of GetIntegerv, GetFloatv, GetBooleanv
+ * GetDoublev and GetInteger64v:
+ */
+ int GL_STENCIL_OP_VALUE_AMD = 0x874C,
+ GL_STENCIL_BACK_OP_VALUE_AMD = 0x874D;
+
+ void glStencilOpValueAMD(@GLenum int face, @GLuint int value);
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-23 21:30:46 UTC (rev 3731)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-28 19:35:16 UTC (rev 3732)
@@ -92,7 +92,7 @@
@GLdouble Buffer data, @GLenum int usage);
void glBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size,
- @Check("1")
+ @Check
@Const
@GLbyte
@GLshort
@@ -102,7 +102,7 @@
void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size,
@OutParameter
- @Check("1")
+ @Check
@GLbyte
@GLshort
@GLint
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-23 21:30:46 UTC (rev 3731)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-28 19:35:16 UTC (rev 3732)
@@ -872,7 +872,7 @@
@Dependent("OpenGL15")
void glNamedBufferSubDataEXT(@GLuint int buffer, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
- @Check("1")
+ @Check
@Const
@GLbyte
@GLshort
@@ -930,7 +930,7 @@
@Dependent("OpenGL15")
void glGetNamedBufferSubDataEXT(@GLuint int buffer, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
@OutParameter
- @Check("1")
+ @Check
@GLbyte
@GLshort
@GLint
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-23 21:30:46 UTC (rev 3731)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-28 19:35:16 UTC (rev 3732)
@@ -118,7 +118,7 @@
@GLdouble Buffer data, @GLenum int usage);
void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
- @Check("1")
+ @Check
@Const
@GLbyte
@GLshort
@@ -128,7 +128,7 @@
void glGetBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
@OutParameter
- @Check("1")
+ @Check
@GLbyte
@GLshort
@GLint
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-23 21:30:46 UTC (rev 3731)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-28 19:35:16 UTC (rev 3732)
@@ -483,7 +483,7 @@
@Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage);
void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
- @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data);
+ @Check @Const @GLbyte @GLshort @GLint @GLfloat Buffer data);
@GLenum
int glCheckFramebufferStatus(@GLenum int target);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-23 21:30:53
|
Revision: 3731
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3731&view=rev
Author: matzon
Date: 2012-01-23 21:30:46 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
bumping to 2.8.4 and adding changelogs
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/src/java/org/lwjgl/Sys.java
trunk/LWJGL/www/changelogs/full-changelog.txt
Added Paths:
-----------
trunk/LWJGL/www/changelogs/2.8.3-changelog.txt
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2012-01-23 21:05:39 UTC (rev 3730)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2012-01-23 21:30:46 UTC (rev 3731)
@@ -12,7 +12,7 @@
<property name="lwjgl.docs" location="doc" />
<property name="lwjgl.temp" location="temp" />
<property name="lwjgl.res" location="res" />
- <property name="lwjgl.version" value="2.8.3" />
+ <property name="lwjgl.version" value="2.8.4" />
<property name="lwjgl.web" location="www" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2012-01-23 21:05:39 UTC (rev 3730)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2012-01-23 21:30:46 UTC (rev 3731)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "2.8.3";
+ private static final String VERSION = "2.8.4";
private static final String POSTFIX64BIT = "64";
Added: trunk/LWJGL/www/changelogs/2.8.3-changelog.txt
===================================================================
--- trunk/LWJGL/www/changelogs/2.8.3-changelog.txt (rev 0)
+++ trunk/LWJGL/www/changelogs/2.8.3-changelog.txt 2012-01-23 21:30:46 UTC (rev 3731)
@@ -0,0 +1,252 @@
+2012-01-22 20:16 kappa1
+
+ * src/java/org/lwjgl/opengl/LinuxDisplay.java: Small tweak to the
+ Linux Display.isActive() fix.
+
+2012-01-22 18:02 kappa1
+
+ * src/java/org/lwjgl/opengl/LinuxDisplay.java: fix for
+ Display.isActive() so that it works as it should on Linux when
+ using Display.setParent()
+
+2012-01-18 12:19 spasi
+
+ * src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+ src/templates/org/lwjgl/opengl/EXT_direct_state_access.java,
+ src/templates/org/lwjgl/opengl/GL15.java,
+ src/templates/org/lwjgl/opengles/GLES20.java: Require at least 1
+ element remaining in BO data params.
+
+2012-01-17 21:05 kappa1
+
+ * src/java/org/lwjgl/util/applet/AppletLoader.java: prod nightly
+ server to rebuild LWJGL.
+
+2012-01-16 22:18 kappa1
+
+ * src/java/org/lwjgl/MacOSXSysImplementation.java,
+ src/java/org/lwjgl/opengl/AWTSurfaceLock.java,
+ src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java: Add extra
+ checks so CALayer's only run on OS X 10.6+, Bump OS X native
+ version
+
+2012-01-13 00:53 kappa1
+
+ * platform_build/macosx_ant/build.xml: Weakly link the AppKit
+ framework in an attempt to allow 10.5 compatibility again.
+
+2012-01-13 00:40 kappa1
+
+ * src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m: OS X
+ slight tweak to MacOSXCanvasPeerInfo in prep to make it
+ compatible for 10.5 again
+
+2012-01-11 20:46 matzon
+
+ * src/java/org/lwjgl/WindowsSysImplementation.java,
+ src/java/org/lwjgl/opengl/WindowsDisplay.java: adding
+ WS_MAXIMIZEBOX patch for windows and bumping native version
+
+2012-01-06 11:52 spasi
+
+ * src/templates/org/lwjgl/opencl/INTEL_printf.java: Added
+ INTEL_printf.
+
+2012-01-05 11:24 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_performance_monitor.java,
+ src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+ src/templates/org/lwjgl/opengl/ARB_sync.java,
+ src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+ src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java,
+ src/templates/org/lwjgl/opengles/EXT_debug_label.java,
+ src/templates/org/lwjgl/opengles/EXT_debug_marker.java,
+ src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java,
+ src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java,
+ src/templates/org/lwjgl/opengles/EXT_robustness.java,
+ src/templates/org/lwjgl/opengles/EXT_sRGB.java,
+ src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java,
+ src/templates/org/lwjgl/opengles/EXT_texture_rg.java,
+ src/templates/org/lwjgl/opengles/EXT_texture_storage.java,
+ src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java:
+ Added new OpenGL ES extensions.
+
+2012-01-02 22:06 matzon
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java: Applying
+ WM_SETCURSOR patch to fix issue with cursor
+
+2012-01-02 22:03 matzon
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java: undoing commit of
+ r3717
+
+2012-01-02 21:59 matzon
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java: Applied
+ WM_SETCURSOR to fix issue with cursor
+
+2011-12-21 14:34 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java:
+ Fixed a problem with categories.
+
+ Categories are now extracted from site.xml. A default category is
+ created if no site.xml is found or if some features are not
+ mapped to any other category.
+
+2011-12-20 19:06 spasi
+
+ * src/templates/org/lwjgl/opencl/CL12.java: Added @Optional on
+ clSetPrintfCallback for the AMD CL 1.2 preview driver.
+
+2011-12-20 17:16 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_pinned_memory.java: Updated
+ AMD_pinned_memory based on official spec.
+
+2011-12-20 11:04 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/build-updatesite.xml,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java:
+ StandalonePublisher directly creates jars, no need for additional
+ "jarring".
+
+ - added main method to StandalonePublisher creating
+ artifact.xml/jar and content.xml/jar from given (old) Eclise
+ update site.
+ - when compressed is set to true, artifact.jar and content.jar
+ are created directly. Removed jar task in build script, as these
+ are no longer necessary
+
+2011-12-15 19:00 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/READ.ME,
+ eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/build-updatesite.xml,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java:
+ Fixed problems in update site build.
+
+ Update site is now build including Eclipse p2 metadata
+ (content.jar and artifact.jar). These files are required by some
+ tools, such as Tycho (a maven plugin making p2 update sites
+ available as maven repositories, see http://eclipse.org/tycho).
+
+2011-12-15 17:40 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/build-updatesite.xml: fixed typo
+ in update site build script, added publisher task
+
+2011-12-15 17:32 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java:
+ Added new ant task creating p2 metadata file for update site.
+
+2011-12-06 22:46 matzon
+
+ * eclipse-update/org.lwjgl.build/build-updatesite.xml: updating
+ update site build script to use pre-packaged zip file in dist,
+ updating signjar to not use keypass
+
+2011-12-06 22:42 matzon
+
+ * build.xml: adding eclipse update site to main build file
+
+2011-12-05 21:49 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/build-updatesite.xml: signing
+ information are interactively retrieved similar to applet build
+
+2011-12-05 12:41 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/READ.ME,
+ eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/build-updatesite.xml,
+ eclipse-update/org.lwjgl.build/build.xml,
+ eclipse-update/org.lwjgl.build/buildEclipseClasses.xml,
+ eclipse-update/org.lwjgl.build/lwjgl-archives,
+ eclipse-update/org.lwjgl.build/plugin-classes,
+ eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.info.zip,
+ eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.tools.zip,
+ eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.zip:
+ Added new Eclipse update site build script to be imported from
+ main LWJGL build script.
+ See org.lwjgl.build/README for details.
+
+ Removed old build script depending on pre-build LWJGL archives.
+
+2011-12-03 11:10 spasi
+
+ * src/templates/org/lwjgl/opengl/NV_transform_feedback.java: Fixed
+ glTransformFeedbackAttribsNV count argument.
+
+2011-11-28 16:40 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/build.xml: bug fix in Eclipes
+ update site build:
+ native libraries are not copied from skeleton (where they are
+ required for development purposes) anymore
+
+2011-11-28 16:23 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/.classpath,
+ eclipse-update/org.lwjgl.build/META-INF/MANIFEST.MF,
+ eclipse-update/org.lwjgl.build/build.xml,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/NormalizeVersion.java,
+ eclipse-update/org.lwjgl.build/test/java/org/lwjgl/ant/NormalizeVersionTest.java:
+ Fixed a bug in the update site build script.
+
+ Wrong class name of LWJGL plugin activator was specified
+ (org.lwjgl.eclipse.Activator, but correct
+ is org.lwjgl.Activator).
+
+ Now, the current date/time string is added as a qualifier to the
+ LWJGL version, e.g., org.lwjgl_2.8.2.v20111128-1653 instead of
+ org.lwjgl_2.8.2. This simplifies testing and discouples LWJGL
+ versions from plugin versions.
+
+2011-11-17 21:41 kappa1
+
+ * src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+ fix uncaught null pointer exception
+
+2011-11-16 14:36 spasi
+
+ * platform_build/build-generator.xml,
+ src/java/org/lwjgl/opencl/CLBuildProgramCallback.java,
+ src/java/org/lwjgl/opencl/CLChecks.java,
+ src/java/org/lwjgl/opencl/CLCompileProgramCallback.java,
+ src/java/org/lwjgl/opencl/CLContext.java,
+ src/java/org/lwjgl/opencl/CLLinkProgramCallback.java,
+ src/java/org/lwjgl/opencl/CLPrintfCallback.java,
+ src/java/org/lwjgl/opencl/CLProgramCallback.java,
+ src/java/org/lwjgl/opencl/CallbackUtil.java,
+ src/java/org/lwjgl/opencl/InfoUtilFactory.java,
+ src/java/org/lwjgl/util/generator/Utils.java,
+ src/java/org/lwjgl/util/generator/opencl/CLPDCapabilitiesGenerator.java,
+ src/native/common/extcl.h, src/native/common/extcl_types.h,
+ src/native/common/org_lwjgl_opencl_CallbackUtil.c,
+ src/templates/org/lwjgl/opencl/CL10.java,
+ src/templates/org/lwjgl/opencl/CL11.java,
+ src/templates/org/lwjgl/opencl/CL12.java,
+ src/templates/org/lwjgl/opencl/CL12GL.java,
+ src/templates/org/lwjgl/opencl/EXT_device_fission.java,
+ src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengl/GL41.java: Added support for
+ OpenCL 1.2 [UNTESTED]
+
+2011-11-13 21:21 matzon
+
+ * www/changelogs/2.8.1-changelog.txt,
+ www/changelogs/2.8.2-changelog.txt,
+ www/changelogs/full-changelog.txt: adding changelogs
+
+2011-11-13 21:20 matzon
+
+ * platform_build/build-definitions.xml,
+ src/java/org/lwjgl/Sys.java: bumping to 2.8.3
\ No newline at end of file
Modified: trunk/LWJGL/www/changelogs/full-changelog.txt
===================================================================
--- trunk/LWJGL/www/changelogs/full-changelog.txt 2012-01-23 21:05:39 UTC (rev 3730)
+++ trunk/LWJGL/www/changelogs/full-changelog.txt 2012-01-23 21:30:46 UTC (rev 3731)
@@ -1,3 +1,256 @@
+2012-01-22 20:16 kappa1
+
+ * src/java/org/lwjgl/opengl/LinuxDisplay.java: Small tweak to the
+ Linux Display.isActive() fix.
+
+2012-01-22 18:02 kappa1
+
+ * src/java/org/lwjgl/opengl/LinuxDisplay.java: fix for
+ Display.isActive() so that it works as it should on Linux when
+ using Display.setParent()
+
+2012-01-18 12:19 spasi
+
+ * src/templates/org/lwjgl/opengl/ARB_buffer_object.java,
+ src/templates/org/lwjgl/opengl/EXT_direct_state_access.java,
+ src/templates/org/lwjgl/opengl/GL15.java,
+ src/templates/org/lwjgl/opengles/GLES20.java: Require at least 1
+ element remaining in BO data params.
+
+2012-01-17 21:05 kappa1
+
+ * src/java/org/lwjgl/util/applet/AppletLoader.java: prod nightly
+ server to rebuild LWJGL.
+
+2012-01-16 22:18 kappa1
+
+ * src/java/org/lwjgl/MacOSXSysImplementation.java,
+ src/java/org/lwjgl/opengl/AWTSurfaceLock.java,
+ src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java: Add extra
+ checks so CALayer's only run on OS X 10.6+, Bump OS X native
+ version
+
+2012-01-13 00:53 kappa1
+
+ * platform_build/macosx_ant/build.xml: Weakly link the AppKit
+ framework in an attempt to allow 10.5 compatibility again.
+
+2012-01-13 00:40 kappa1
+
+ * src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m: OS X
+ slight tweak to MacOSXCanvasPeerInfo in prep to make it
+ compatible for 10.5 again
+
+2012-01-11 20:46 matzon
+
+ * src/java/org/lwjgl/WindowsSysImplementation.java,
+ src/java/org/lwjgl/opengl/WindowsDisplay.java: adding
+ WS_MAXIMIZEBOX patch for windows and bumping native version
+
+2012-01-06 11:52 spasi
+
+ * src/templates/org/lwjgl/opencl/INTEL_printf.java: Added
+ INTEL_printf.
+
+2012-01-05 11:24 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_performance_monitor.java,
+ src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java,
+ src/templates/org/lwjgl/opengl/ARB_sync.java,
+ src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java,
+ src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java,
+ src/templates/org/lwjgl/opengles/EXT_debug_label.java,
+ src/templates/org/lwjgl/opengles/EXT_debug_marker.java,
+ src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java,
+ src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java,
+ src/templates/org/lwjgl/opengles/EXT_robustness.java,
+ src/templates/org/lwjgl/opengles/EXT_sRGB.java,
+ src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java,
+ src/templates/org/lwjgl/opengles/EXT_texture_rg.java,
+ src/templates/org/lwjgl/opengles/EXT_texture_storage.java,
+ src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java:
+ Added new OpenGL ES extensions.
+
+2012-01-02 22:06 matzon
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java: Applying
+ WM_SETCURSOR patch to fix issue with cursor
+
+2012-01-02 22:03 matzon
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java: undoing commit of
+ r3717
+
+2012-01-02 21:59 matzon
+
+ * src/java/org/lwjgl/opengl/WindowsDisplay.java: Applied
+ WM_SETCURSOR to fix issue with cursor
+
+2011-12-21 14:34 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java:
+ Fixed a problem with categories.
+
+ Categories are now extracted from site.xml. A default category is
+ created if no site.xml is found or if some features are not
+ mapped to any other category.
+
+2011-12-20 19:06 spasi
+
+ * src/templates/org/lwjgl/opencl/CL12.java: Added @Optional on
+ clSetPrintfCallback for the AMD CL 1.2 preview driver.
+
+2011-12-20 17:16 spasi
+
+ * src/templates/org/lwjgl/opengl/AMD_pinned_memory.java: Updated
+ AMD_pinned_memory based on official spec.
+
+2011-12-20 11:04 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/build-updatesite.xml,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java:
+ StandalonePublisher directly creates jars, no need for additional
+ "jarring".
+
+ - added main method to StandalonePublisher creating
+ artifact.xml/jar and content.xml/jar from given (old) Eclise
+ update site.
+ - when compressed is set to true, artifact.jar and content.jar
+ are created directly. Removed jar task in build script, as these
+ are no longer necessary
+
+2011-12-15 19:00 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/READ.ME,
+ eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/build-updatesite.xml,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java:
+ Fixed problems in update site build.
+
+ Update site is now build including Eclipse p2 metadata
+ (content.jar and artifact.jar). These files are required by some
+ tools, such as Tycho (a maven plugin making p2 update sites
+ available as maven repositories, see http://eclipse.org/tycho).
+
+2011-12-15 17:40 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/build-updatesite.xml: fixed typo
+ in update site build script, added publisher task
+
+2011-12-15 17:32 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/StandalonePublisher.java:
+ Added new ant task creating p2 metadata file for update site.
+
+2011-12-06 22:46 matzon
+
+ * eclipse-update/org.lwjgl.build/build-updatesite.xml: updating
+ update site build script to use pre-packaged zip file in dist,
+ updating signjar to not use keypass
+
+2011-12-06 22:42 matzon
+
+ * build.xml: adding eclipse update site to main build file
+
+2011-12-05 21:49 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/build-updatesite.xml: signing
+ information are interactively retrieved similar to applet build
+
+2011-12-05 12:41 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/READ.ME,
+ eclipse-update/org.lwjgl.build/anttasks.jar,
+ eclipse-update/org.lwjgl.build/build-updatesite.xml,
+ eclipse-update/org.lwjgl.build/build.xml,
+ eclipse-update/org.lwjgl.build/buildEclipseClasses.xml,
+ eclipse-update/org.lwjgl.build/lwjgl-archives,
+ eclipse-update/org.lwjgl.build/plugin-classes,
+ eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.info.zip,
+ eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.tools.zip,
+ eclipse-update/org.lwjgl.build/plugin-classes/org.lwjgl.zip:
+ Added new Eclipse update site build script to be imported from
+ main LWJGL build script.
+ See org.lwjgl.build/README for details.
+
+ Removed old build script depending on pre-build LWJGL archives.
+
+2011-12-03 11:10 spasi
+
+ * src/templates/org/lwjgl/opengl/NV_transform_feedback.java: Fixed
+ glTransformFeedbackAttribsNV count argument.
+
+2011-11-28 16:40 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/build.xml: bug fix in Eclipes
+ update site build:
+ native libraries are not copied from skeleton (where they are
+ required for development purposes) anymore
+
+2011-11-28 16:23 jpilgrim
+
+ * eclipse-update/org.lwjgl.build/.classpath,
+ eclipse-update/org.lwjgl.build/META-INF/MANIFEST.MF,
+ eclipse-update/org.lwjgl.build/build.xml,
+ eclipse-update/org.lwjgl.build/src/java/org/lwjgl/ant/NormalizeVersion.java,
+ eclipse-update/org.lwjgl.build/test/java/org/lwjgl/ant/NormalizeVersionTest.java:
+ Fixed a bug in the update site build script.
+
+ Wrong class name of LWJGL plugin activator was specified
+ (org.lwjgl.eclipse.Activator, but correct
+ is org.lwjgl.Activator).
+
+ Now, the current date/time string is added as a qualifier to the
+ LWJGL version, e.g., org.lwjgl_2.8.2.v20111128-1653 instead of
+ org.lwjgl_2.8.2. This simplifies testing and discouples LWJGL
+ versions from plugin versions.
+
+2011-11-17 21:41 kappa1
+
+ * src/java/org/lwjgl/util/applet/AppletLoader.java: AppletLoader:
+ fix uncaught null pointer exception
+
+2011-11-16 14:36 spasi
+
+ * platform_build/build-generator.xml,
+ src/java/org/lwjgl/opencl/CLBuildProgramCallback.java,
+ src/java/org/lwjgl/opencl/CLChecks.java,
+ src/java/org/lwjgl/opencl/CLCompileProgramCallback.java,
+ src/java/org/lwjgl/opencl/CLContext.java,
+ src/java/org/lwjgl/opencl/CLLinkProgramCallback.java,
+ src/java/org/lwjgl/opencl/CLPrintfCallback.java,
+ src/java/org/lwjgl/opencl/CLProgramCallback.java,
+ src/java/org/lwjgl/opencl/CallbackUtil.java,
+ src/java/org/lwjgl/opencl/InfoUtilFactory.java,
+ src/java/org/lwjgl/util/generator/Utils.java,
+ src/java/org/lwjgl/util/generator/opencl/CLPDCapabilitiesGenerator.java,
+ src/native/common/extcl.h, src/native/common/extcl_types.h,
+ src/native/common/org_lwjgl_opencl_CallbackUtil.c,
+ src/templates/org/lwjgl/opencl/CL10.java,
+ src/templates/org/lwjgl/opencl/CL11.java,
+ src/templates/org/lwjgl/opencl/CL12.java,
+ src/templates/org/lwjgl/opencl/CL12GL.java,
+ src/templates/org/lwjgl/opencl/EXT_device_fission.java,
+ src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java,
+ src/templates/org/lwjgl/opengl/GL41.java: Added support for
+ OpenCL 1.2 [UNTESTED]
+
+2011-11-13 21:21 matzon
+
+ * www/changelogs/2.8.1-changelog.txt,
+ www/changelogs/2.8.2-changelog.txt,
+ www/changelogs/full-changelog.txt: adding changelogs
+
+2011-11-13 21:20 matzon
+
+ * platform_build/build-definitions.xml,
+ src/java/org/lwjgl/Sys.java: bumping to 2.8.3
+
2011-11-12 21:50 kappa1
* src/java/org/lwjgl/MacOSXSysImplementation.java: bump native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-23 21:05:45
|
Revision: 3730
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3730&view=rev
Author: matzon
Date: 2012-01-23 21:05:39 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
tagging 2.8.3
Added Paths:
-----------
tags/lwjgl2.8.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-01-22 20:16:47
|
Revision: 3729
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3729&view=rev
Author: kappa1
Date: 2012-01-22 20:16:41 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Small tweak to the Linux Display.isActive() fix.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2012-01-22 18:02:34 UTC (rev 3728)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2012-01-22 20:16:41 UTC (rev 3729)
@@ -800,10 +800,10 @@
relayEventToParent(event_buffer, KeyPressMask);
break;
case LinuxEvent.ButtonPress:
- if (xembedded) relayEventToParent(event_buffer, KeyPressMask);
+ if (xembedded || !focused) relayEventToParent(event_buffer, KeyPressMask);
break;
case LinuxEvent.ButtonRelease:
- if (xembedded) relayEventToParent(event_buffer, KeyPressMask);
+ if (xembedded || !focused) relayEventToParent(event_buffer, KeyPressMask);
break;
default:
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-01-22 18:02:41
|
Revision: 3728
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3728&view=rev
Author: kappa1
Date: 2012-01-22 18:02:34 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
fix for Display.isActive() so that it works as it should on Linux when using Display.setParent()
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2012-01-18 12:19:52 UTC (rev 3727)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2012-01-22 18:02:34 UTC (rev 3728)
@@ -800,10 +800,10 @@
relayEventToParent(event_buffer, KeyPressMask);
break;
case LinuxEvent.ButtonPress:
- relayEventToParent(event_buffer, KeyPressMask);
+ if (xembedded) relayEventToParent(event_buffer, KeyPressMask);
break;
case LinuxEvent.ButtonRelease:
- relayEventToParent(event_buffer, KeyPressMask);
+ if (xembedded) relayEventToParent(event_buffer, KeyPressMask);
break;
default:
break;
@@ -1038,7 +1038,7 @@
}
private void setFocused(boolean got_focus, int focus_detail) {
- if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot || parent != null)
+ if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot || xembedded)
return;
focused = got_focus;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-01-18 12:19:58
|
Revision: 3727
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3727&view=rev
Author: spasi
Date: 2012-01-18 12:19:52 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Require at least 1 element remaining in BO data params.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-17 21:05:13 UTC (rev 3726)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java 2012-01-18 12:19:52 UTC (rev 3727)
@@ -83,6 +83,7 @@
@GenerateAutos
void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB long size,
+ @Check("1")
@Const
@GLbyte
@GLshort
@@ -91,7 +92,7 @@
@GLdouble Buffer data, @GLenum int usage);
void glBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size,
- @Check
+ @Check("1")
@Const
@GLbyte
@GLshort
@@ -101,7 +102,7 @@
void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size,
@OutParameter
- @Check
+ @Check("1")
@GLbyte
@GLshort
@GLint
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-17 21:05:13 UTC (rev 3726)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java 2012-01-18 12:19:52 UTC (rev 3727)
@@ -862,6 +862,7 @@
@Dependent("OpenGL15")
@GenerateAutos
void glNamedBufferDataEXT(@GLuint int buffer, @AutoSize("data") @GLsizeiptr long size,
+ @Check("1")
@Const
@GLbyte
@GLshort
@@ -871,7 +872,7 @@
@Dependent("OpenGL15")
void glNamedBufferSubDataEXT(@GLuint int buffer, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
- @Check
+ @Check("1")
@Const
@GLbyte
@GLshort
@@ -929,7 +930,7 @@
@Dependent("OpenGL15")
void glGetNamedBufferSubDataEXT(@GLuint int buffer, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
@OutParameter
- @Check
+ @Check("1")
@GLbyte
@GLshort
@GLint
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-17 21:05:13 UTC (rev 3726)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java 2012-01-18 12:19:52 UTC (rev 3727)
@@ -109,6 +109,7 @@
@GenerateAutos
void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size,
+ @Check("1")
@Const
@GLbyte
@GLshort
@@ -117,7 +118,7 @@
@GLdouble Buffer data, @GLenum int usage);
void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
- @Check
+ @Check("1")
@Const
@GLbyte
@GLshort
@@ -127,7 +128,7 @@
void glGetBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
@OutParameter
- @Check
+ @Check("1")
@GLbyte
@GLshort
@GLint
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-17 21:05:13 UTC (rev 3726)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/GLES20.java 2012-01-18 12:19:52 UTC (rev 3727)
@@ -480,10 +480,10 @@
@GenerateAutos
void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size,
- @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage);
+ @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data, @GLenum int usage);
void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size,
- @Check @Const @GLbyte @GLshort @GLint @GLfloat Buffer data);
+ @Check("1") @Const @GLbyte @GLshort @GLint @GLfloat Buffer data);
@GLenum
int glCheckFramebufferStatus(@GLenum int target);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-01-17 21:05:23
|
Revision: 3726
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3726&view=rev
Author: kappa1
Date: 2012-01-17 21:05:13 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
prod nightly server to rebuild LWJGL.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2012-01-16 22:18:31 UTC (rev 3725)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2012-01-17 21:05:13 UTC (rev 3726)
@@ -141,7 +141,7 @@
* <li>al_logo - [String Path of of the logo resource to paint while loading.<i>Default: "appletlogo.gif"</i>.</li>
* <li>al_progressbar - [String] Path of the progressbar resource to paint on top of the logo, width clipped by percentage.<i>Default: "appletprogress.gif"</i>.</li>
* <p>
- * <li>lwjgl_arguments - </li> [String] used to pass the hidden LWJGL parameters to LWJGL e.g. ("-Dorg.lwjgl.input.Mouse.allowNegativeMouseCoords=true -Dorg.lwjgl.util.Debug=true").</li>
+ * <li>lwjgl_arguments - </li> [String] used to pass LWJGL parameters to LWJGL e.g. ("-Dorg.lwjgl.input.Mouse.allowNegativeMouseCoords=true -Dorg.lwjgl.util.Debug=true").</li>
* </ul>
* </p>
* @author kappaOne <one...@gm...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-01-16 22:18:37
|
Revision: 3725
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3725&view=rev
Author: kappa1
Date: 2012-01-16 22:18:31 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Add extra checks so CALayer's only run on OS X 10.6+, Bump OS X native version
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
Modified: trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2012-01-13 00:53:43 UTC (rev 3724)
+++ trunk/LWJGL/src/java/org/lwjgl/MacOSXSysImplementation.java 2012-01-16 22:18:31 UTC (rev 3725)
@@ -42,7 +42,7 @@
* $Id$
*/
final class MacOSXSysImplementation extends J2SESysImplementation {
- private static final int JNI_VERSION = 22;
+ private static final int JNI_VERSION = 23;
static {
// Make sure AWT is properly initialized. This avoids hangs on Mac OS X 10.3
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java 2012-01-13 00:53:43 UTC (rev 3724)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java 2012-01-16 22:18:31 UTC (rev 3725)
@@ -83,7 +83,7 @@
// due to performance..
// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
- final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && isApplet(component);
+ final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && isApplet(component) && LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 6);
if (firstLockSucceeded)
return lockAndInitHandle(lock_buffer, component, allowCALayer);
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java 2012-01-13 00:53:43 UTC (rev 3724)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java 2012-01-16 22:18:31 UTC (rev 3725)
@@ -35,6 +35,7 @@
import java.nio.ByteBuffer;
import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
/**
*
@@ -51,7 +52,7 @@
protected void initHandle(Canvas component) throws LWJGLException {
// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
- final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && awt_surface.isApplet(component);
+ final boolean allowCALayer = ((Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas) && awt_surface.isApplet(component) && LWJGLUtil.isMacOSXEqualsOrBetterThan(10, 6);
nInitHandle(awt_surface.lockAndGetHandle(component), getHandle(), allowCALayer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-01-13 00:53:50
|
Revision: 3724
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3724&view=rev
Author: kappa1
Date: 2012-01-13 00:53:43 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
Weakly link the AppKit framework in an attempt to allow 10.5 compatibility again.
Modified Paths:
--------------
trunk/LWJGL/platform_build/macosx_ant/build.xml
Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml 2012-01-13 00:40:43 UTC (rev 3723)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml 2012-01-13 00:53:43 UTC (rev 3724)
@@ -35,7 +35,7 @@
<target name="link">
<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
- <arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -framework JavaNativeFoundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
+ <arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -weak_framework AppKit -framework JavaVM -framework Carbon -framework OpenGL -framework QuartzCore -framework JavaNativeFoundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks"/>
<fileset dir="${objdir}" includes="*.o"/>
</apply>
<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ka...@us...> - 2012-01-13 00:40:50
|
Revision: 3723
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3723&view=rev
Author: kappa1
Date: 2012-01-13 00:40:43 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
OS X slight tweak to MacOSXCanvasPeerInfo in prep to make it compatible for 10.5 again
Modified Paths:
--------------
trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
Modified: trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m
===================================================================
--- trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m 2012-01-11 20:46:57 UTC (rev 3722)
+++ trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m 2012-01-13 00:40:43 UTC (rev 3723)
@@ -48,21 +48,6 @@
#include "context.h"
#include "common_tools.h"
-// forward declaration
-@interface PBufferGLLayer : NSOpenGLLayer {
- MacOSXPeerInfo *peer_info;
- GLuint textureID;
-}
-
-- (MacOSXPeerInfo*) peer_info;
-- (GLuint) textureID;
-
-- (void) setPeer_info: (MacOSXPeerInfo*)input;
-- (void) setTextureID: (GLuint)input;
-
-@end
-
-// forward declaration
@interface AttachLayerOnMainThread : NSObject {
MacOSXPeerInfo *peer_info;
JAWT_MacOSXDrawingSurfaceInfo *macosx_dsi;
@@ -134,6 +119,19 @@
[pool release];
}
+@interface PBufferGLLayer : NSOpenGLLayer {
+ MacOSXPeerInfo *peer_info;
+ GLuint textureID;
+}
+
+- (MacOSXPeerInfo*) peer_info;
+- (GLuint) textureID;
+
+- (void) setPeer_info: (MacOSXPeerInfo*)input;
+- (void) setTextureID: (GLuint)input;
+
+@end
+
// Object class to CALayer on AppKit Thread
@implementation AttachLayerOnMainThread
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-11 20:47:08
|
Revision: 3722
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3722&view=rev
Author: matzon
Date: 2012-01-11 20:46:57 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
adding WS_MAXIMIZEBOX patch for windows and bumping native version
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2012-01-06 11:52:48 UTC (rev 3721)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java 2012-01-11 20:46:57 UTC (rev 3722)
@@ -46,7 +46,7 @@
* $Id$
*/
final class WindowsSysImplementation extends DefaultSysImplementation {
- private static final int JNI_VERSION = 23;
+ private static final int JNI_VERSION = 24;
static {
Sys.initialize();
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-01-06 11:52:48 UTC (rev 3721)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-01-11 20:46:57 UTC (rev 3722)
@@ -143,6 +143,7 @@
private static final int GWL_EXSTYLE = -20;
private static final int WS_THICKFRAME = 0x00040000;
+ private static final int WS_MAXIMIZEBOX = 0x00010000;
private static final int HTCLIENT = 0x01;
@@ -858,6 +859,8 @@
switch ((int)wParam) {
case SIZE_RESTORED:
case SIZE_MAXIMIZED:
+ resized = true;
+ updateWidthAndHeight();
setMinimized(false);
break;
case SIZE_MINIMIZED:
@@ -1011,9 +1014,9 @@
// update frame style
if(resizable) {
- setWindowLongPtr(hwnd, GWL_STYLE, style |= WS_THICKFRAME);
+ setWindowLongPtr(hwnd, GWL_STYLE, style |= (WS_THICKFRAME | WS_MAXIMIZEBOX));
} else {
- setWindowLongPtr(hwnd, GWL_STYLE, style &= ~WS_THICKFRAME);
+ setWindowLongPtr(hwnd, GWL_STYLE, style &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX));
}
// from the existing client rect, determine the new window rect
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-01-06 11:52:54
|
Revision: 3721
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3721&view=rev
Author: spasi
Date: 2012-01-06 11:52:48 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
Added INTEL_printf.
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opencl/INTEL_printf.java
Added: trunk/LWJGL/src/templates/org/lwjgl/opencl/INTEL_printf.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opencl/INTEL_printf.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opencl/INTEL_printf.java 2012-01-06 11:52:48 UTC (rev 3721)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2010 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.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface INTEL_printf {
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2012-01-05 11:24:22
|
Revision: 3720
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3720&view=rev
Author: spasi
Date: 2012-01-05 11:24:13 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Added new OpenGL ES extensions.
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_label.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_marker.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_robustness.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_sRGB.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_rg.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_storage.java
trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-01-02 22:06:12 UTC (rev 3719)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/AMD_performance_monitor.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -32,7 +32,6 @@
package org.lwjgl.opengl;
import org.lwjgl.util.generator.*;
-import org.lwjgl.util.generator.Alternate;
import org.lwjgl.util.generator.opengl.*;
import java.nio.ByteBuffer;
@@ -41,53 +40,52 @@
public interface AMD_performance_monitor {
/** Accepted by the <pame> parameter of GetPerfMonitorCounterInfoAMD */
- int GL_COUNTER_TYPE_AMD = 0x8BC0;
- int GL_COUNTER_RANGE_AMD = 0x8BC1;
+ int GL_COUNTER_TYPE_AMD = 0x8BC0,
+ GL_COUNTER_RANGE_AMD = 0x8BC1;
/**
* Returned as a valid value in <data> parameter of
* GetPerfMonitorCounterInfoAMD if <pname> = COUNTER_TYPE_AMD
*/
- int GL_UNSIGNED_INT = 0x1405;
- int GL_FLOAT = 0x1406;
- int GL_UNSIGNED_INT64_AMD = 0x8BC2;
- int GL_PERCENTAGE_AMD = 0x8BC3;
+ int GL_UNSIGNED_INT = 0x1405,
+ GL_FLOAT = 0x1406,
+ GL_UNSIGNED_INT64_AMD = 0x8BC2,
+ GL_PERCENTAGE_AMD = 0x8BC3;
/** Accepted by the <pname> parameter of GetPerfMonitorCounterDataAMD */
+ int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4,
+ GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5,
+ GL_PERFMON_RESULT_AMD = 0x8BC6;
- int GL_PERFMON_RESULT_AVAILABLE_AMD = 0x8BC4;
- int GL_PERFMON_RESULT_SIZE_AMD = 0x8BC5;
- int GL_PERFMON_RESULT_AMD = 0x8BC6;
-
void glGetPerfMonitorGroupsAMD(@OutParameter @Check(value = "1", canBeNull = true) @GLint IntBuffer numGroups,
@AutoSize("groups") @GLsizei int groupsSize, @GLuint IntBuffer groups);
void glGetPerfMonitorCountersAMD(@GLuint int group,
@OutParameter @Check(value = "1") @GLint IntBuffer numCounters,
@OutParameter @Check(value = "1") @GLint IntBuffer maxActiveCounters,
- @AutoSize("counters") @GLsizei int countersSize,
- @GLuint IntBuffer counters);
+ @AutoSize(value = "counters", canBeNull = true) @GLsizei int countersSize,
+ @Check(canBeNull = true) @GLuint IntBuffer counters);
void glGetPerfMonitorGroupStringAMD(@GLuint int group,
- @AutoSize("groupString") @GLsizei int bufSize,
+ @AutoSize(value = "groupString", canBeNull = true) @GLsizei int bufSize,
@OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
- @OutParameter @GLchar ByteBuffer groupString);
+ @Check(canBeNull = true) @OutParameter @GLchar ByteBuffer groupString);
@Alternate("glGetPerfMonitorGroupStringAMD")
@GLreturn(value = "groupString", maxLength = "bufSize")
void glGetPerfMonitorGroupStringAMD2(@GLuint int group, @GLsizei int bufSize,
- @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(groupString_length)") IntBuffer length,
- @OutParameter @GLchar ByteBuffer groupString);
+ @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(groupString_length)") IntBuffer length,
+ @OutParameter @GLchar ByteBuffer groupString);
- void glGetPerfMonitorCounterStringAMD(@GLuint int group, @GLuint int counter, @AutoSize("counterString") @GLsizei int bufSize,
+ void glGetPerfMonitorCounterStringAMD(@GLuint int group, @GLuint int counter, @AutoSize(value = "counterString", canBeNull = true) @GLsizei int bufSize,
@OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,
- @OutParameter @GLchar ByteBuffer counterString);
+ @Check(canBeNull = true) @OutParameter @GLchar ByteBuffer counterString);
@Alternate("glGetPerfMonitorCounterStringAMD")
@GLreturn(value = "counterString", maxLength = "bufSize")
void glGetPerfMonitorCounterStringAMD2(@GLuint int group, @GLuint int counter, @GLsizei int bufSize,
- @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(counterString_length)") IntBuffer length,
- @OutParameter @GLchar ByteBuffer counterString);
+ @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(counterString_length)") IntBuffer length,
+ @OutParameter @GLchar ByteBuffer counterString);
void glGetPerfMonitorCounterInfoAMD(@GLuint int group, @GLuint int counter, @GLenum int pname, @Check(value = "16") @GLvoid ByteBuffer data);
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java 2012-01-02 22:06:12 UTC (rev 3719)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -345,7 +345,7 @@
@Alternate("glGetProgramPipelineInfoLog")
@GLreturn(value = "infoLog", maxLength = "bufSize")
void glGetProgramPipelineInfoLog2(@GLuint int pipeline, @GLsizei int bufSize,
- @OutParameter @GLsizei @Constant("infoLog_length, 0") IntBuffer length,
+ @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(infoLog_length)") IntBuffer length,
@OutParameter @GLchar ByteBuffer infoLog);
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-01-02 22:06:12 UTC (rev 3719)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -89,7 +89,7 @@
@Alternate("glGetActiveSubroutineUniformName")
@GLreturn(value = "name", maxLength = "bufsize")
void glGetActiveSubroutineUniformName2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLsizei int bufsize,
- @OutParameter @Constant("name_length, 0") @GLsizei IntBuffer length,
+ @OutParameter @Constant("MemoryUtil.getAddress0(name_length)") @GLsizei IntBuffer length,
@OutParameter @GLchar ByteBuffer name);
@Reuse("GL40")
@@ -101,7 +101,7 @@
@Alternate("glGetActiveSubroutineName")
@GLreturn(value = "name", maxLength = "bufsize")
void glGetActiveSubroutineName2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLsizei int bufsize,
- @OutParameter @Constant("name_length, 0") @GLsizei IntBuffer length,
+ @OutParameter @Constant("MemoryUtil.getAddress0(name_length)") @GLsizei IntBuffer length,
@OutParameter @GLchar ByteBuffer name);
@Reuse("GL40")
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-01-02 22:06:12 UTC (rev 3719)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -111,6 +111,6 @@
@GLreturn("values")
@StripPostfix("values")
void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
- @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
+ @OutParameter @GLsizei @Constant("0L") IntBuffer length,
@OutParameter IntBuffer values);
}
\ No newline at end of file
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2012-01-02 22:06:12 UTC (rev 3719)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -136,7 +136,7 @@
@Alternate("glGetActiveUniformName")
@GLreturn(value = "uniformName", maxLength = "bufSize")
void glGetActiveUniformName2(@GLuint int program, @GLuint int uniformIndex, @GLsizei int bufSize,
- @OutParameter @GLsizei @Constant("uniformName_length, 0") IntBuffer length,
+ @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(uniformName_length)") IntBuffer length,
@OutParameter @GLchar ByteBuffer uniformName);
@Reuse("GL31")
@@ -169,7 +169,7 @@
@Alternate("glGetActiveUniformBlockName")
@GLreturn(value = "uniformBlockName", maxLength = "bufSize")
void glGetActiveUniformBlockName2(@GLuint int program, @GLuint int uniformBlockIndex, @GLsizei int bufSize,
- @OutParameter @GLsizei @Constant("uniformBlockName_length, 0") IntBuffer length,
+ @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(uniformBlockName_length)") IntBuffer length,
@OutParameter @GLchar ByteBuffer uniformBlockName);
@Reuse("GL30")
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_color_buffer_half_float.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+public interface EXT_color_buffer_half_float {
+
+ /**
+ * Accepted by the <internalformat> parameter of RenderbufferStorage and
+ * RenderbufferStorageMultisampleAPPLE:
+ */
+ int GL_RGBA16F_EXT = 0x881A,
+ GL_RGB16F_EXT = 0x881B,
+ GL_RG16F_EXT = 0x822F,
+ GL_R16F_EXT = 0x822D;
+
+ /** Accepted by the <pname> parameter of GetFramebufferAttachmentParameteriv: */
+ int GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT = 0x8211;
+
+ /** Returned in <params> by GetFramebufferAttachmentParameteriv: */
+ int GL_UNSIGNED_NORMALIZED_EXT = 0x8C17;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_label.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_label.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_label.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+import org.lwjgl.util.generator.*;
+import org.lwjgl.util.generator.opengl.*;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface EXT_debug_label {
+
+ /**
+ * Accepted by the <type> parameter of LabelObjectEXT and
+ * GetObjectLabelEXT:
+ */
+ int GL_BUFFER_OBJECT_EXT = 0x9151,
+ GL_SHADER_OBJECT_EXT = 0x8B48,
+ GL_PROGRAM_OBJECT_EXT = 0x8B40,
+ GL_VERTEX_ARRAY_OBJECT_EXT = 0x9154,
+ GL_QUERY_OBJECT_EXT = 0x9153,
+ GL_PROGRAM_PIPELINE_OBJECT_EXT = 0x8A4F;
+
+ void glLabelObjectEXT(@GLenum int type, @GLuint int object,
+ @AutoSize("label") @GLsizei int length,
+ @Const @GLchar ByteBuffer label);
+
+ @Alternate("glLabelObjectEXT")
+ void glLabelObjectEXT(@GLenum int type, @GLuint int object,
+ @Constant("label.length()") @GLsizei int length,
+ CharSequence label);
+
+ void glGetObjectLabelEXT(@GLenum int type, @GLuint int object,
+ @AutoSize(value = "label", canBeNull = true) @GLsizei int bufSize,
+ @Check(value = "1", canBeNull = true) @OutParameter @GLsizei IntBuffer length,
+ @Check(canBeNull = true) @OutParameter @GLchar ByteBuffer label);
+
+ @Alternate("glGetObjectLabelEXT")
+ @GLreturn(value = "label", maxLength = "bufSize")
+ void glGetObjectLabelEXT2(@GLenum int type, @GLuint int object,
+ @GLsizei int bufSize,
+ @Constant("MemoryUtil.getAddress0(label_length)") @OutParameter @GLsizei IntBuffer length,
+ @OutParameter @GLchar ByteBuffer label);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_marker.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_marker.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_debug_marker.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+import org.lwjgl.util.generator.Alternate;
+import org.lwjgl.util.generator.AutoSize;
+import org.lwjgl.util.generator.Const;
+import org.lwjgl.util.generator.Constant;
+import org.lwjgl.util.generator.opengl.GLchar;
+import org.lwjgl.util.generator.opengl.GLsizei;
+
+import java.nio.ByteBuffer;
+
+public interface EXT_debug_marker {
+
+ void glInsertEventMarkerEXT(@AutoSize("marker") @GLsizei int length, @Const @GLchar ByteBuffer marker);
+
+ @Alternate("glInsertEventMarkerEXT")
+ void glInsertEventMarkerEXT(@Constant("marker.length()") @GLsizei int length, CharSequence marker);
+
+ void glPushGroupMarkerEXT(@AutoSize("marker") @GLsizei int length, @Const @GLchar ByteBuffer marker);
+
+ @Alternate("glPushGroupMarkerEXT")
+ void glPushGroupMarkerEXT(@Constant("marker.length()") @GLsizei int length, CharSequence marker);
+
+ void glPopGroupMarkerEXT();
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_multisampled_render_to_texture.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+import org.lwjgl.util.generator.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLsizei;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+public interface EXT_multisampled_render_to_texture {
+
+ /** Accepted by the <pname> parameter of GetRenderbufferParameteriv: */
+ int GL_RENDERBUFFER_SAMPLES_EXT = 0x9133;
+
+ /** Returned by CheckFramebufferStatus: */
+ int GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT = 0x9134;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+ * and GetFloatv:
+ */
+ int GL_MAX_SAMPLES_EXT = 0x9135;
+
+ /** Accepted by the <pname> parameter of GetFramebufferAttachmentParameteriv: */
+ int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT = 0x8D6C;
+
+ void glRenderbufferStorageMultisampleEXT(
+ @GLenum int target, @GLsizei int samples,
+ @GLenum int internalformat,
+ @GLsizei int width, @GLsizei int height);
+
+ void glFramebufferTexture2DMultisampleEXT(
+ @GLenum int target, @GLenum int attachment,
+ @GLenum int textarget, @GLuint int texture,
+ int level, @GLsizei int samples);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+import org.lwjgl.util.generator.*;
+import org.lwjgl.util.generator.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLreturn;
+import org.lwjgl.util.generator.opengl.GLsizei;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+import java.nio.IntBuffer;
+
+public interface EXT_occlusion_query_boolean {
+
+ /**
+ * Accepted by the <target> parameter of BeginQueryEXT, EndQueryEXT,
+ * and GetQueryivEXT:
+ */
+ int GL_ANY_SAMPLES_PASSED_EXT = 0x8C2F,
+ GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT = 0x8D6A;
+
+ /** Accepted by the <pname> parameter of GetQueryivEXT: */
+ int GL_CURRENT_QUERY_EXT = 0x8865;
+
+ /**
+ * Accepted by the <pname> parameter of GetQueryObjectivEXT and
+ * GetQueryObjectuivEXT:
+ */
+ int GL_QUERY_RESULT_EXT = 0x8866,
+ GL_QUERY_RESULT_AVAILABLE_EXT = 0x8867;
+
+ void glGenQueriesEXT(@AutoSize("ids") @GLsizei int n, @OutParameter @GLuint IntBuffer ids);
+
+ @Alternate("glGenQueriesEXT")
+ @GLreturn("ids")
+ void glGenQueriesEXT2(@Constant("1") @GLsizei int n, @OutParameter @GLuint IntBuffer ids);
+
+ void glDeleteQueriesEXT(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids);
+
+ @Alternate("glDeleteQueriesEXT")
+ void glDeleteQueriesEXT(@Constant("1") @GLsizei int n, @Constant(value = "APIUtil.getInt(id)", keepParam = true) int id);
+
+ boolean glIsQueryEXT(@GLuint int id);
+
+ void glBeginQueryEXT(@GLenum int target, @GLuint int id);
+
+ void glEndQueryEXT(@GLenum int target);
+
+ @StripPostfix("params")
+ void glGetQueryivEXT(@GLenum int target, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
+
+ @Alternate("glGetQueryivEXT")
+ @GLreturn("params")
+ @StripPostfix("params")
+ void glGetQueryivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
+
+ @StripPostfix("params")
+ void glGetQueryObjectuivEXT(@GLuint int id, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
+
+ @Alternate("glGetQueryObjectuivEXT")
+ @GLreturn("params")
+ @StripPostfix(value = "params", postfix = "v")
+ void glGetQueryObjectuivEXT2(@GLuint int id, @GLenum int pname, @OutParameter IntBuffer params);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_robustness.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_robustness.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_robustness.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+import org.lwjgl.util.generator.AutoSize;
+import org.lwjgl.util.generator.OutParameter;
+import org.lwjgl.util.generator.StripPostfix;
+import org.lwjgl.util.generator.opengl.*;
+
+import java.nio.Buffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+
+public interface EXT_robustness {
+
+ /** Returned by GetGraphicsResetStatusEXT: */
+ int GL_NO_ERROR = 0x0000,
+ GL_GUILTY_CONTEXT_RESET_EXT = 0x8253,
+ GL_INNOCENT_CONTEXT_RESET_EXT = 0x8254,
+ GL_UNKNOWN_CONTEXT_RESET_EXT = 0x8255;
+
+ /**
+ * Accepted by the <value> parameter of GetBooleanv, GetIntegerv,
+ * and GetFloatv:
+ */
+ int GL_CONTEXT_ROBUST_ACCESS_EXT = 0x90F3,
+ GL_RESET_NOTIFICATION_STRATEGY_EXT = 0x8256;
+
+ /**
+ * Returned by GetIntegerv and related simple queries when <value> is
+ * RESET_NOTIFICATION_STRATEGY_EXT :
+ */
+ int GL_LOSE_CONTEXT_ON_RESET_EXT = 0x8252,
+ GL_NO_RESET_NOTIFICATION_EXT = 0x8261;
+
+ @GLenum
+ int glGetGraphicsResetStatusEXT();
+
+ void glReadnPixelsEXT(int x, int y, @GLsizei int width, @GLsizei int height,
+ @GLenum int format, @GLenum int type, @AutoSize("data") @GLsizei int bufSize,
+ @OutParameter @GLbyte @GLshort @GLint @GLfloat Buffer data);
+
+ @StripPostfix("params")
+ void glGetnUniformfvEXT(@GLuint int program, int location, @AutoSize("params") @GLsizei int bufSize, @OutParameter FloatBuffer params);
+
+ @StripPostfix("params")
+ void glGetnUniformivEXT(@GLuint int program, int location, @AutoSize("params") @GLsizei int bufSize, @OutParameter IntBuffer params);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_sRGB.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_sRGB.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_sRGB.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+public interface EXT_sRGB {
+
+ /**
+ * Accepted by the <format> and <internalformat> parameter of TexImage2D, and
+ * TexImage3DOES. These are also accepted by <format> parameter of
+ * TexSubImage2D and TexSubImage3DOES:
+ */
+ int GL_SRGB_EXT = 0x8C40,
+ GL_SRGB_ALPHA_EXT = 0x8C42;
+
+ /** Accepted by the <internalformat> parameter of RenderbufferStorage: */
+ int GL_SRGB8_ALPHA8_EXT = 0x8C43;
+
+ /** Accepted by the <pname> parameter of GetFramebufferAttachmentParameteriv: */
+ int GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT = 0x8210;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2002-2008 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.opengles;
+
+import org.lwjgl.util.generator.*;
+import org.lwjgl.util.generator.opengl.*;
+
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+
+public interface EXT_separate_shader_objects {
+
+ /** Accepted by <stages> parameter to UseProgramStagesEXT: */
+ int GL_VERTEX_SHADER_BIT_EXT = 0x00000001,
+ GL_FRAGMENT_SHADER_BIT_EXT = 0x00000002,
+ GL_ALL_SHADER_BITS_EXT = 0xFFFFFFFF;
+
+ /**
+ * Accepted by the <pname> parameter of ProgramParameteriEXT and
+ * GetProgramiv:
+ */
+ int GL_PROGRAM_SEPARABLE_EXT = 0x8258;
+
+ /** Accepted by <type> parameter to GetProgramPipelineivEXT: */
+ int GL_ACTIVE_PROGRAM_EXT = 0x8259;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, and
+ * GetFloatv:
+ */
+ int GL_PROGRAM_PIPELINE_BINDING_EXT = 0x825A;
+
+ void glUseProgramStagesEXT(@GLuint int pipeline, @GLbitfield int stages, @GLuint int program);
+
+ void glActiveShaderProgramEXT(@GLuint int pipeline, @GLuint int program);
+
+ /** Single null-terminated source code string. */
+ @StripPostfix(value = "string", postfix = "v")
+ @GLuint
+ int glCreateShaderProgramvEXT(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated @Check @Const @Indirect @GLchar ByteBuffer string);
+
+ /** Multiple null-terminated source code strings, one after the other. */
+ @Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true)
+ @StripPostfix(value = "strings", postfix = "v")
+ @GLuint
+ int glCreateShaderProgramvEXT2(@GLenum int type, @GLsizei int count, @NullTerminated("count") @Check @Const @Indirect @GLchar @PointerArray("count") ByteBuffer strings);
+
+ @Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true)
+ @StripPostfix(value = "strings", postfix = "v")
+ @GLuint
+ int glCreateShaderProgramvEXT3(@GLenum int type, @Constant("strings.length") @GLsizei int count, @NullTerminated @Check("1") @PointerArray(value = "count") @Const @NativeType("GLchar") ByteBuffer[] strings);
+
+ @Alternate("glCreateShaderProgramvEXT")
+ @StripPostfix(value = "string", postfix = "v")
+ @GLuint
+ int glCreateShaderProgramvEXT(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated CharSequence string);
+
+ @Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true, skipNative = true)
+ @StripPostfix(value = "strings", postfix = "v")
+ @GLuint
+ int glCreateShaderProgramvEXT2(@GLenum int type, @Constant("strings.length") @GLsizei int count,
+ @Const @NullTerminated @PointerArray(value = "count") CharSequence[] strings);
+
+ void glBindProgramPipelineEXT(@GLuint int pipeline);
+
+ void glDeleteProgramPipelinesEXT(@AutoSize("pipelines") @GLsizei int n, @Const @GLuint IntBuffer pipelines);
+
+ @Alternate("glDeleteProgramPipelinesEXT")
+ void glDeleteProgramPipelinesEXT(@Constant("1") @GLsizei int n, @Constant(value = "APIUtil.getInt(pipeline)", keepParam = true) int pipeline);
+
+ void glGenProgramPipelinesEXT(@AutoSize("pipelines") @GLsizei int n, @OutParameter @GLuint IntBuffer pipelines);
+
+ @Alternate("glGenProgramPipelinesEXT")
+ @GLreturn("pipelines")
+ void glGenProgramPipelinesEXT2(@Constant("1") @GLsizei int n, @OutParameter @GLuint IntBuffer pipelines);
+
+ boolean glIsProgramPipelineEXT(@GLuint int pipeline);
+
+ void glProgramParameteriEXT(@GLuint int program, @GLenum int pname, int value);
+
+ @StripPostfix("params")
+ void glGetProgramPipelineivEXT(@GLuint int pipeline, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
+
+ @Alternate("glGetProgramPipelineivEXT")
+ @GLreturn("params")
+ @StripPostfix("params")
+ void glGetProgramPipelineivEXT2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params);
+
+ void glProgramUniform1iEXT(@GLuint int program, int location, int v0);
+
+ void glProgramUniform2iEXT(@GLuint int program, int location, int v0, int v1);
+
+ void glProgramUniform3iEXT(@GLuint int program, int location, int v0, int v1, int v2);
+
+ void glProgramUniform4iEXT(@GLuint int program, int location, int v0, int v1, int v2, int v3);
+
+ void glProgramUniform1fEXT(@GLuint int program, int location, float v0);
+
+ void glProgramUniform2fEXT(@GLuint int program, int location, float v0, float v1);
+
+ void glProgramUniform3fEXT(@GLuint int program, int location, float v0, float v1, float v2);
+
+ void glProgramUniform4fEXT(@GLuint int program, int location, float v0, float v1, float v2, float v3);
+
+ @StripPostfix("value")
+ void glProgramUniform1ivEXT(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const IntBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniform2ivEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 1") @GLsizei int count, @Const IntBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniform3ivEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " / 3") @GLsizei int count, @Const IntBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniform4ivEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, @Const IntBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniform1fvEXT(@GLuint int program, int location, @AutoSize("value") @GLsizei int count, @Const FloatBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniform2fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 1") @GLsizei int count, @Const FloatBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniform3fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " / 3") @GLsizei int count, @Const FloatBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniform4fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, @Const FloatBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniformMatrix2fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 2") @GLsizei int count, boolean transpose, @Const FloatBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniformMatrix3fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " / (3 * 3)") @GLsizei int count, boolean transpose, @Const FloatBuffer value);
+
+ @StripPostfix("value")
+ void glProgramUniformMatrix4fvEXT(@GLuint int program, int location, @AutoSize(value = "value", expression = " >> 4") @GLsizei int count, boolean transpose, @Const FloatBuffer value);
+
+ void glValidateProgramPipelineEXT(@GLuint int pipeline);
+
+ void glGetProgramPipelineInfoLogEXT(@GLuint int pipeline, @AutoSize("infoLog") @GLsizei int bufSize,
+ @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+ @OutParameter @GLchar ByteBuffer infoLog);
+
+ @Alternate("glGetProgramPipelineInfoLogEXT")
+ @GLreturn(value = "infoLog", maxLength = "bufSize")
+ void glGetProgramPipelineInfoLogEXT2(@GLuint int pipeline, @GLsizei int bufSize,
+ @OutParameter @GLsizei @Constant("MemoryUtil.getAddress0(infoLog_length)") IntBuffer length,
+ @OutParameter @GLchar ByteBuffer infoLog);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_shadow_samplers.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2002-2008 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.opengles;
+
+public interface EXT_shadow_samplers {
+
+ /**
+ * Accepted by the <pname> parameter of TexParameterf, TexParameteri,
+ * TexParameterfv, TexParameteriv, GetTexParameterfv, and GetTexParameteriv:
+ */
+ int GL_TEXTURE_COMPARE_MODE_EXT = 0x884C,
+ GL_TEXTURE_COMPARE_FUNC_EXT = 0x884D;
+
+ /**
+ * Accepted by the <param> parameter of TexParameterf, TexParameteri,
+ * TexParameterfv, and TexParameteriv when the <pname> parameter is
+ * TEXTURE_COMPARE_MODE_EXT:
+ */
+ int GL_COMPARE_REF_TO_TEXTURE_EXT = 0x884E;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_rg.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_rg.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_rg.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2002-2008 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.opengles;
+
+public interface EXT_texture_rg {
+
+ /**
+ * Accepted by the <internalformat> parameter of TexImage2D and CopyTexImage2D,
+ * and the <format> parameter of TexImage2D, TexSubImage2D, and ReadPixels:
+ */
+ int GL_RED_EXT = 0x1903,
+ GL_RG_EXT = 0x8227;
+
+ /**
+ * Accepted by the <internalformat> parameter of RenderbufferStorage and
+ * RenderbufferStorageMultisampleAPPLE:
+ */
+ int GL_R8_EXT = 0x8229,
+ GL_RG8_EXT = 0x822B;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_storage.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_storage.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/EXT_texture_storage.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2002-2011 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.opengles;
+
+import org.lwjgl.util.generator.opengl.GLenum;
+import org.lwjgl.util.generator.opengl.GLsizei;
+import org.lwjgl.util.generator.opengl.GLuint;
+
+public interface EXT_texture_storage {
+
+ /** Accepted by the <value> parameter of GetTexParameter{if}v: */
+
+ int GL_TEXTURE_IMMUTABLE_FORMAT_EXT = 0x912F;
+ /**
+ * Accepted by the <internalformat> parameter of TexStorage* when
+ * implemented on OpenGL ES:
+ */
+ int GL_ALPHA8_EXT = 0x803C,
+ GL_LUMINANCE8_EXT = 0x8040,
+ GL_LUMINANCE8_ALPHA8_EXT = 0x8045,
+ GL_RGBA32F_EXT = 0x8814,
+ GL_RGB32F_EXT = 0x8815,
+ GL_ALPHA32F_EXT = 0x8816,
+ GL_LUMINANCE32F_EXT = 0x8818,
+ GL_LUMINANCE_ALPHA32F_EXT = 0x8819,
+ GL_RGBA16F_EXT = 0x881A,
+ GL_RGB16F_EXT = 0x881B,
+ GL_ALPHA16F_EXT = 0x881C,
+ GL_LUMINANCE16F_EXT = 0x881E,
+ GL_LUMINANCE_ALPHA16F_EXT = 0x881F,
+ GL_RGB10_A2_EXT = 0x8059,
+ GL_RGB10_EXT = 0x8052,
+ GL_BGRA8_EXT = 0x93A1;
+
+ void glTexStorage1DEXT(@GLenum int target, @GLsizei int levels,
+ @GLenum int internalformat,
+ @GLsizei int width);
+
+ void glTexStorage2DEXT(@GLenum int target, @GLsizei int levels,
+ @GLenum int internalformat,
+ @GLsizei int width, @GLsizei int height);
+
+ void glTexStorage3DEXT(@GLenum int target, @GLsizei int levels,
+ @GLenum int internalformat,
+ @GLsizei int width, @GLsizei int height, @GLsizei int depth);
+
+ void glTextureStorage1DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels,
+ @GLenum int internalformat,
+ @GLsizei int width);
+
+ void glTextureStorage2DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels,
+ @GLenum int internalformat,
+ @GLsizei int width, @GLsizei int height);
+
+ void glTextureStorage3DEXT(@GLuint int texture, @GLenum int target, @GLsizei int levels,
+ @GLenum int internalformat,
+ @GLsizei int width, @GLsizei int height, @GLsizei int depth);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengles/NV_EGL_stream_consumer_external.java 2012-01-05 11:24:13 UTC (rev 3720)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2002-2008 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.opengles;
+
+public interface NV_EGL_stream_consumer_external {
+
+ /** Accepted as a target in the <target> parameter of BindTexture: */
+ int GL_TEXTURE_EXTERNAL_OES = 0x8D65;
+
+ /** Returned in the <type> parameter of GetActiveUniform: */
+ int GL_SAMPLER_EXTERNAL_OES = 0x8D66;
+
+ /** Accepted as <value> in GetIntegerv() and GetFloatv() queries: */
+ int GL_TEXTURE_BINDING_EXTERNAL_OES = 0x8D67;
+
+ /** Accepted as <value> in GetTexParameter*() queries: */
+ int GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES = 0x8D68;
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-02 22:06:19
|
Revision: 3719
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3719&view=rev
Author: matzon
Date: 2012-01-02 22:06:12 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Applying WM_SETCURSOR patch to fix issue with cursor
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 2012-01-02 22:03:53 UTC (rev 3718)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-01-02 22:06:12 UTC (rev 3719)
@@ -76,6 +76,7 @@
private static final int WM_SYSCHAR = 262;
private static final int WM_CHAR = 258;
private static final int WM_SETICON = 0x0080;
+ private static final int WM_SETCURSOR = 0x0020;
private static final int WM_QUIT = 0x0012;
private static final int WM_SYSCOMMAND = 0x0112;
@@ -142,6 +143,8 @@
private static final int GWL_EXSTYLE = -20;
private static final int WS_THICKFRAME = 0x00040000;
+
+ private static final int HTCLIENT = 0x01;
private static WindowsDisplay current_display;
@@ -870,6 +873,16 @@
resized = true;
updateWidthAndHeight();
return defWindowProc(hwnd, msg, wParam, lParam);
+ case WM_SETCURSOR:
+ if((lParam & 0xFFFF) == HTCLIENT) {
+ // if the cursor is inside the client area, reset it
+ // to the current LWJGL-cursor
+ updateCursor();
+ return -1; //TRUE
+ } else {
+ // let Windows handle cursors outside the client area for resizing, etc.
+ return defWindowProc(hwnd, msg, wParam, lParam);
+ }
case WM_KILLFOCUS:
appActivate(false);
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-02 22:04:00
|
Revision: 3718
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3718&view=rev
Author: matzon
Date: 2012-01-02 22:03:53 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
undoing commit of r3717
Revision Links:
--------------
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3717&view=rev
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 2012-01-02 21:59:20 UTC (rev 3717)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-01-02 22:03:53 UTC (rev 3718)
@@ -69,8 +69,6 @@
private static final int WM_ENTERSIZEMOVE = 0x0231;
private static final int WM_EXITSIZEMOVE = 0x0232;
private static final int WM_SIZING = 0x0214;
- private static final int WM_MOVING = 0x0216;
-
private static final int WM_KEYDOWN = 256;
private static final int WM_KEYUP = 257;
private static final int WM_SYSKEYUP = 261;
@@ -78,7 +76,6 @@
private static final int WM_SYSCHAR = 262;
private static final int WM_CHAR = 258;
private static final int WM_SETICON = 0x0080;
- private static final int WM_SETCURSOR = 0x0020;
private static final int WM_QUIT = 0x0012;
private static final int WM_SYSCOMMAND = 0x0112;
@@ -145,8 +142,6 @@
private static final int GWL_EXSTYLE = -20;
private static final int WS_THICKFRAME = 0x00040000;
-
- private static final int HTCLIENT = 0x01;
private static WindowsDisplay current_display;
@@ -871,24 +866,10 @@
return defWindowProc(hwnd, msg, wParam, lParam);
case WM_EXITSIZEMOVE:
return defWindowProc(hwnd, msg, wParam, lParam);
- case WM_MOVING:
- Display.callReshapeCallbackAndSwap();
- return defWindowProc(hwnd, msg, wParam, lParam);
case WM_SIZING:
resized = true;
updateWidthAndHeight();
- Display.callReshapeCallbackAndSwap();
return defWindowProc(hwnd, msg, wParam, lParam);
- case WM_SETCURSOR:
- if((lParam & 0xFFFF) == HTCLIENT) {
- // if the cursor is inside the client area, reset it
- // to the current LWJGL-cursor
- updateCursor();
- return -1; //TRUE
- } else {
- // let Windows handle cursors outside the client area for resizing, etc.
- return defWindowProc(hwnd, msg, wParam, lParam);
- }
case WM_KILLFOCUS:
appActivate(false);
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-01-02 21:59:27
|
Revision: 3717
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3717&view=rev
Author: matzon
Date: 2012-01-02 21:59:20 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Applied WM_SETCURSOR to fix issue with cursor
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 2011-12-21 14:34:39 UTC (rev 3716)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java 2012-01-02 21:59:20 UTC (rev 3717)
@@ -69,6 +69,8 @@
private static final int WM_ENTERSIZEMOVE = 0x0231;
private static final int WM_EXITSIZEMOVE = 0x0232;
private static final int WM_SIZING = 0x0214;
+ private static final int WM_MOVING = 0x0216;
+
private static final int WM_KEYDOWN = 256;
private static final int WM_KEYUP = 257;
private static final int WM_SYSKEYUP = 261;
@@ -76,6 +78,7 @@
private static final int WM_SYSCHAR = 262;
private static final int WM_CHAR = 258;
private static final int WM_SETICON = 0x0080;
+ private static final int WM_SETCURSOR = 0x0020;
private static final int WM_QUIT = 0x0012;
private static final int WM_SYSCOMMAND = 0x0112;
@@ -142,6 +145,8 @@
private static final int GWL_EXSTYLE = -20;
private static final int WS_THICKFRAME = 0x00040000;
+
+ private static final int HTCLIENT = 0x01;
private static WindowsDisplay current_display;
@@ -866,10 +871,24 @@
return defWindowProc(hwnd, msg, wParam, lParam);
case WM_EXITSIZEMOVE:
return defWindowProc(hwnd, msg, wParam, lParam);
+ case WM_MOVING:
+ Display.callReshapeCallbackAndSwap();
+ return defWindowProc(hwnd, msg, wParam, lParam);
case WM_SIZING:
resized = true;
updateWidthAndHeight();
+ Display.callReshapeCallbackAndSwap();
return defWindowProc(hwnd, msg, wParam, lParam);
+ case WM_SETCURSOR:
+ if((lParam & 0xFFFF) == HTCLIENT) {
+ // if the cursor is inside the client area, reset it
+ // to the current LWJGL-cursor
+ updateCursor();
+ return -1; //TRUE
+ } else {
+ // let Windows handle cursors outside the client area for resizing, etc.
+ return defWindowProc(hwnd, msg, wParam, lParam);
+ }
case WM_KILLFOCUS:
appActivate(false);
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1095 messages has been excluded from this view by a project administrator.
