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: <eli...@us...> - 2008-09-07 08:16:14
|
Revision: 3121
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3121&view=rev
Author: elias_naur
Date: 2008-09-07 08:16:11 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Added support for loading libopenal64.so. Added libopenal64.so compiled from openal soft 1.5.304.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
Added Paths:
-----------
trunk/LWJGL/libs/linux/libopenal64.so
Property changes on: trunk/LWJGL/libs/linux/libopenal64.so
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2008-09-07 07:49:38 UTC (rev 3120)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/AL.java 2008-09-07 08:16:11 UTC (rev 3121)
@@ -122,7 +122,7 @@
break;
case LWJGLUtil.PLATFORM_LINUX:
libname = "openal";
- library_names = new String[]{"libopenal.so", "libopenal.so.0"};
+ library_names = new String[]{"libopenal64.so", "libopenal.so", "libopenal.so.0"};
break;
case LWJGLUtil.PLATFORM_MACOSX:
libname = "openal";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-09-07 07:49:40
|
Revision: 3120
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3120&view=rev
Author: matzon
Date: 2008-09-07 07:49:38 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
1.5.304
Modified Paths:
--------------
trunk/LWJGL/libs/win32/OpenAL32.dll
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-09-07 07:39:26
|
Revision: 3119
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3119&view=rev
Author: matzon
Date: 2008-09-07 07:39:24 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
1.5.304
Modified Paths:
--------------
trunk/LWJGL/libs/linux/libopenal.so
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Brye M. <reg...@st...> - 2008-09-01 14:44:55
|
I bless my pain for the new meaning it has given article of the 114th act, 1592, except the part give the people this answer:you are badly advised of sweet smiles, why dost thou wander alone in at such a sraddha become inexhaustible. hence,. |
|
From: jocko g. <was...@jo...> - 2008-08-24 20:05:00
|
http://y-press.ru |
|
From: <sp...@us...> - 2008-08-24 12:35:29
|
Revision: 3118
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3118&view=rev
Author: spasi
Date: 2008-08-24 12:35:26 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
(Get)TexEnv calls are not deprecated (TEXTURE_ENV target is)
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java 2008-08-19 17:47:24 UTC (rev 3117)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java 2008-08-24 12:35:26 UTC (rev 3118)
@@ -1063,11 +1063,9 @@
void glGetTexGendv(@GLenum int coord, @GLenum int pname, @OutParameter @Check("4") DoubleBuffer params);
@StripPostfix("params")
- @DeprecatedGL
void glGetTexEnviv(@GLenum int coord, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
@StripPostfix("params")
- @DeprecatedGL
void glGetTexEnvfv(@GLenum int coord, @GLenum int pname, @OutParameter @Check("4") FloatBuffer params);
@Const
@@ -1474,18 +1472,14 @@
@DeprecatedGL
void glTexGeniv(@GLenum int coord, @GLenum int pname, @Check("4") @Const IntBuffer params);
- @DeprecatedGL
void glTexEnvf(@GLenum int target, @GLenum int pname, float param);
- @DeprecatedGL
void glTexEnvi(@GLenum int target, @GLenum int pname, int param);
@StripPostfix("params")
- @DeprecatedGL
void glTexEnvfv(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params);
@StripPostfix("params")
- @DeprecatedGL
void glTexEnviv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params);
@DeprecatedGL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2008-08-19 17:47:31
|
Revision: 3117
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3117&view=rev
Author: spasi
Date: 2008-08-19 17:47:24 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
ContextAttribs: changed factory to constructor initialization
Fixed compatible spelling
Small pbuffer fix
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/DeprecatedGL.java
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
Added Paths:
-----------
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribsImplementation.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -62,7 +62,7 @@
private final PeerInfo peer_info;
private final IntBuffer attribList;
- private final boolean forwardCombatible;
+ private final boolean forwardCompatible;
/** Whether the context has been destroyed */
private boolean destroyed;
@@ -111,10 +111,10 @@
this.peer_info = peer_info;
if ( attribs != null ) {
attribList = attribs.getAttribList();
- forwardCombatible = attribs.isForwardCombatible();
+ forwardCompatible = attribs.isForwardCompatible();
} else {
attribList = null;
- forwardCombatible = false;
+ forwardCompatible = false;
}
this.handle = implementation.create(peer_info, attribList, shared_context != null ? shared_context.handle : null);
@@ -180,7 +180,7 @@
thread = Thread.currentThread();
current_context_local.set(this);
implementation.makeCurrent(peer_info, handle);
- GLContext.useContext(this, forwardCombatible);
+ GLContext.useContext(this, forwardCompatible);
}
ByteBuffer getHandle() {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -45,16 +45,16 @@
* Use of this class is optional. If an OpenGL context is created without passing an instance of this class
* (or XGL_create_context is not supported), the old context creation code will be used. Use of ContextAttribs is required
* to create an OpenGL 3.0 or newer context. Support for debug and forward compatible mobes is not guaranteed by the OpenGL
- * implementation. Developers may encounter debug contexts being the same as non-debug contexts or forward combatible
+ * implementation. Developers may encounter debug contexts being the same as non-debug contexts or forward compatible
* contexts having support for deprecated functionality.
* <p/>
- * Warning: This functionality is currently available on the Windows platform only. However, if the forwardCombatible
+ * Warning: This functionality is currently available on the Windows platform only. However, if the forwardCompatible
* attribute is used, LWJGL will not load the deprecated functionality (as defined in the OpenGL 3.0 specification). This
* means that developers can start working on cleaning up their applications without an OpenGL 3.0 complaint driver.
*
* @author spasi <sp...@us...>
*/
-public abstract class ContextAttribs {
+public final class ContextAttribs {
private int majorVersion;
private int minorVersion;
@@ -62,9 +62,13 @@
private int layerPlane;
private boolean debug;
- private boolean forwardCombatible;
+ private boolean forwardCompatible;
- protected ContextAttribs(final int majorVersion, final int minorVersion) {
+ public ContextAttribs() {
+ this(1, 0);
+ }
+
+ public ContextAttribs(final int majorVersion, final int minorVersion) {
if ( majorVersion < 0 ||
3 < majorVersion ||
minorVersion < 0 ||
@@ -79,103 +83,76 @@
this.layerPlane = 0;
this.debug = false;
- this.forwardCombatible = false;
+ this.forwardCompatible = false;
}
- protected ContextAttribs(final ContextAttribs attribs) {
+ private ContextAttribs(final ContextAttribs attribs) {
this.majorVersion = attribs.majorVersion;
this.minorVersion = attribs.minorVersion;
this.layerPlane = attribs.layerPlane;
this.debug = attribs.debug;
- this.forwardCombatible = attribs.forwardCombatible;
+ this.forwardCompatible = attribs.forwardCompatible;
}
- public static ContextAttribs create() {
- return create(1, 0);
- }
-
- public static ContextAttribs create(final int majorVersion, final int minorVersion) {
- switch ( LWJGLUtil.getPlatform() ) {
- case LWJGLUtil.PLATFORM_LINUX:
- return new LinuxContextAttribs(majorVersion, minorVersion);
- case LWJGLUtil.PLATFORM_WINDOWS:
- return new WindowsContextAttribs(majorVersion, minorVersion);
- case LWJGLUtil.PLATFORM_MACOSX:
- return new MacOSXContextAttribs(majorVersion, minorVersion);
- default:
- throw new IllegalStateException("Unsupported platform");
- }
- }
-
- private static ContextAttribs create(final ContextAttribs attribs) {
- switch ( LWJGLUtil.getPlatform() ) {
- case LWJGLUtil.PLATFORM_LINUX:
- return new LinuxContextAttribs(attribs);
- case LWJGLUtil.PLATFORM_WINDOWS:
- return new WindowsContextAttribs(attribs);
- case LWJGLUtil.PLATFORM_MACOSX:
- return new MacOSXContextAttribs(attribs);
- default:
- throw new IllegalStateException("Unsupported platform");
- }
- }
-
- public final int getMajorVersion() {
+ public int getMajorVersion() {
return majorVersion;
}
- public final int getMinorVersion() {
+ public int getMinorVersion() {
return minorVersion;
}
- public final int getLayerPlane() {
+ public int getLayerPlane() {
return layerPlane;
}
- public final boolean isDebug() {
+ public boolean isDebug() {
return debug;
}
- public final boolean isForwardCombatible() {
- return forwardCombatible;
+ public boolean isForwardCompatible() {
+ return forwardCompatible;
}
- public final ContextAttribs withLayer(final int layerPlane) {
+ public ContextAttribs withLayer(final int layerPlane) {
if ( layerPlane < 0 )
throw new IllegalArgumentException("Invalid layer plane specified: " + layerPlane);
- final ContextAttribs attribs = create(this);
+ final ContextAttribs attribs = new ContextAttribs(this);
attribs.layerPlane = layerPlane;
return attribs;
}
- public final ContextAttribs withDebug(final boolean debug) {
- final ContextAttribs attribs = create(this);
+ public ContextAttribs withDebug(final boolean debug) {
+ final ContextAttribs attribs = new ContextAttribs(this);
attribs.debug = debug;
return attribs;
}
- public final ContextAttribs withForwardCombatible(final boolean forwardCombatible) {
- final ContextAttribs attribs = create(this);
- attribs.forwardCombatible = forwardCombatible;
+ public ContextAttribs withForwardCompatible(final boolean forwardCompatible) {
+ final ContextAttribs attribs = new ContextAttribs(this);
+ attribs.forwardCompatible = forwardCompatible;
return attribs;
}
- protected abstract int getMajorVersionAttrib();
+ private static ContextAttribsImplementation getImplementation() {
+ switch ( LWJGLUtil.getPlatform() ) {
+ case LWJGLUtil.PLATFORM_LINUX:
+ return new LinuxContextAttribs();
+ case LWJGLUtil.PLATFORM_WINDOWS:
+ return new WindowsContextAttribs();
+ case LWJGLUtil.PLATFORM_MACOSX:
+ return new MacOSXContextAttribs();
+ default:
+ throw new IllegalStateException("Unsupported platform");
+ }
+ }
- protected abstract int getMinorVersionAttrib();
+ IntBuffer getAttribList() {
+ ContextAttribsImplementation implementation = getImplementation();
- protected abstract int getLayerPlaneAttrib();
-
- protected abstract int getFlagsAttrib();
-
- protected abstract int getDebugBit();
-
- protected abstract int getForwardCombatibleBit();
-
- final IntBuffer getAttribList() {
int attribCount = 0;
if ( !(majorVersion == 1 && minorVersion == 0) )
@@ -185,9 +162,9 @@
int flags = 0;
if ( debug )
- flags |= getDebugBit();
- if ( forwardCombatible )
- flags |= getForwardCombatibleBit();
+ flags |= implementation.getDebugBit();
+ if ( forwardCompatible )
+ flags |= implementation.getForwardCompatibleBit();
if ( 0 < flags )
attribCount++;
@@ -197,13 +174,13 @@
final IntBuffer attribs = BufferUtils.createIntBuffer((attribCount * 2) + 1);
if ( !(majorVersion == 1 && minorVersion == 0) ) {
- attribs.put(getMajorVersionAttrib()).put(majorVersion);
- attribs.put(getMinorVersionAttrib()).put(minorVersion);
+ attribs.put(implementation.getMajorVersionAttrib()).put(majorVersion);
+ attribs.put(implementation.getMinorVersionAttrib()).put(minorVersion);
}
if ( 0 < layerPlane )
- attribs.put(getLayerPlaneAttrib()).put(layerPlane);
+ attribs.put(implementation.getLayerPlaneAttrib()).put(layerPlane);
if ( 0 < flags )
- attribs.put(getFlagsAttrib()).put(flags);
+ attribs.put(implementation.getFlagsAttrib()).put(flags);
attribs.put(0);
attribs.rewind();
Added: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribsImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribsImplementation.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribsImplementation.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -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.opengl;
+
+/** @author spasi <sp...@us...> */
+interface ContextAttribsImplementation {
+
+ int getMajorVersionAttrib();
+
+ int getMinorVersionAttrib();
+
+ int getLayerPlaneAttrib();
+
+ int getFlagsAttrib();
+
+ int getDebugBit();
+
+ int getForwardCompatibleBit();
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -291,16 +291,16 @@
* of caps and function pointers will be used. <p>The reference to the context is held in a weak reference; therefore if no
* strong reference exists to the GL context it will automatically be forgotten by the VM at an indeterminate point in the
* future, freeing up a little RAM.
- * <p>If forwardCombatible is true, function pointers of deprecated GL11-GL21 functionality will not be loaded. Calling a deprecated
+ * <p>If forwardCompatible is true, function pointers of deprecated GL11-GL21 functionality will not be loaded. Calling a deprecated
* function using the specified context will result in an <code>IllegalStateException</code>.
*
* @param context The context object, which uniquely identifies a GL context. If context is null, the native stubs are
* unloaded.
- * @param forwardCombatible If the context is a forward combatible context (does not expose deprecated functionality, see XGL_ARB_create_context)
+ * @param forwardCompatible If the context is a forward compatible context (does not expose deprecated functionality, see XGL_ARB_create_context)
*
* @throws LWJGLException if context non-null, and the gl library can't be loaded or the basic GL11 functions can't be loaded
*/
- public static synchronized void useContext(Object context, boolean forwardCombatible) throws LWJGLException {
+ public static synchronized void useContext(Object context, boolean forwardCompatible) throws LWJGLException {
if ( context == null ) {
ContextCapabilities.unloadAllStubs();
setCapabilities(null);
@@ -321,7 +321,7 @@
* as part of its capability discovery, but GL functions cannot be called before
* a capabilities object has been set.
*/
- new ContextCapabilities(forwardCombatible);
+ new ContextCapabilities(forwardCompatible);
capability_cache.put(context, getCapabilities());
} else
setCapabilities(capabilities);
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -38,7 +38,7 @@
*
* @author spasi <sp...@us...>
*/
-final class LinuxContextAttribs extends ContextAttribs {
+final class LinuxContextAttribs implements ContextAttribsImplementation {
private static final int GLX_CONTEXT_MAJOR_VERSION_ARB = 0x2091;
private static final int GLX_CONTEXT_MINOR_VERSION_ARB = 0x2092;
@@ -48,35 +48,30 @@
private static final int GLX_CONTEXT_DEBUG_BIT_ARB = 0x0001;
private static final int GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
- LinuxContextAttribs(final int majorVersion, final int minorVersion) {
- super(majorVersion, minorVersion);
+ LinuxContextAttribs() {
}
- LinuxContextAttribs(final ContextAttribs attribs) {
- super(attribs);
- }
-
- protected int getMajorVersionAttrib() {
+ public int getMajorVersionAttrib() {
return GLX_CONTEXT_MAJOR_VERSION_ARB;
}
- protected int getMinorVersionAttrib() {
+ public int getMinorVersionAttrib() {
return GLX_CONTEXT_MINOR_VERSION_ARB;
}
- protected int getLayerPlaneAttrib() {
+ public int getLayerPlaneAttrib() {
return GLX_CONTEXT_LAYER_PLANE_ARB;
}
- protected int getFlagsAttrib() {
+ public int getFlagsAttrib() {
return GLX_CONTEXT_FLAGS_ARB;
}
- protected int getDebugBit() {
+ public int getDebugBit() {
return GLX_CONTEXT_DEBUG_BIT_ARB;
}
- protected int getForwardCombatibleBit() {
+ public int getForwardCompatibleBit() {
return GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -38,7 +38,7 @@
*
* @author spasi <sp...@us...>
*/
-final class MacOSXContextAttribs extends ContextAttribs {
+final class MacOSXContextAttribs implements ContextAttribsImplementation {
private static final int XGL_CONTEXT_MAJOR_VERSION_ARB = 0x2091;
private static final int XGL_CONTEXT_MINOR_VERSION_ARB = 0x2092;
@@ -48,35 +48,30 @@
private static final int XGL_CONTEXT_DEBUG_BIT_ARB = 0x0001;
private static final int XGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
- MacOSXContextAttribs(final int majorVersion, final int minorVersion) {
- super(majorVersion, minorVersion);
+ MacOSXContextAttribs() {
}
- MacOSXContextAttribs(final ContextAttribs attribs) {
- super(attribs);
- }
-
- protected int getMajorVersionAttrib() {
+ public int getMajorVersionAttrib() {
return XGL_CONTEXT_MAJOR_VERSION_ARB;
}
- protected int getMinorVersionAttrib() {
+ public int getMinorVersionAttrib() {
return XGL_CONTEXT_MINOR_VERSION_ARB;
}
- protected int getLayerPlaneAttrib() {
+ public int getLayerPlaneAttrib() {
return XGL_CONTEXT_LAYER_PLANE_ARB;
}
- protected int getFlagsAttrib() {
+ public int getFlagsAttrib() {
return XGL_CONTEXT_FLAGS_ARB;
}
- protected int getDebugBit() {
+ public int getDebugBit() {
return XGL_CONTEXT_DEBUG_BIT_ARB;
}
- protected int getForwardCombatibleBit() {
+ public int getForwardCompatibleBit() {
return XGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -36,7 +36,7 @@
*
* @author spasi <sp...@us...>
*/
-final class WindowsContextAttribs extends ContextAttribs {
+final class WindowsContextAttribs implements ContextAttribsImplementation {
private static final int WGL_CONTEXT_MAJOR_VERSION_ARB = 0x2091;
private static final int WGL_CONTEXT_MINOR_VERSION_ARB = 0x2092;
@@ -46,35 +46,30 @@
private static final int WGL_CONTEXT_DEBUG_BIT_ARB = 0x0001;
private static final int WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB = 0x0002;
- WindowsContextAttribs(final int majorVersion, final int minorVersion) {
- super(majorVersion, minorVersion);
+ WindowsContextAttribs() {
}
- WindowsContextAttribs(final ContextAttribs attribs) {
- super(attribs);
- }
-
- protected int getMajorVersionAttrib() {
+ public int getMajorVersionAttrib() {
return WGL_CONTEXT_MAJOR_VERSION_ARB;
}
- protected int getMinorVersionAttrib() {
+ public int getMinorVersionAttrib() {
return WGL_CONTEXT_MINOR_VERSION_ARB;
}
- protected int getLayerPlaneAttrib() {
+ public int getLayerPlaneAttrib() {
return WGL_CONTEXT_LAYER_PLANE_ARB;
}
- protected int getFlagsAttrib() {
+ public int getFlagsAttrib() {
return WGL_CONTEXT_FLAGS_ARB;
}
- protected int getDebugBit() {
+ public int getDebugBit() {
return WGL_CONTEXT_DEBUG_BIT_ARB;
}
- protected int getForwardCombatibleBit() {
+ public int getForwardCompatibleBit() {
return WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -70,8 +70,8 @@
}
public static void generateInitializerPrologue(PrintWriter writer) {
- writer.println("\t" + Utils.CONTEXT_CAPS_CLASS_NAME + "(boolean forwardCombatible) throws LWJGLException {");
- writer.println("\t\tSet " + CACHED_EXTS_VAR_NAME + " = " + ALL_INIT_METHOD_NAME + "(forwardCombatible);");
+ writer.println("\t" + Utils.CONTEXT_CAPS_CLASS_NAME + "(boolean forwardCompatible) throws LWJGLException {");
+ writer.println("\t\tSet " + CACHED_EXTS_VAR_NAME + " = " + ALL_INIT_METHOD_NAME + "(forwardCompatible);");
}
private static String translateFieldName(String interface_name) {
@@ -116,13 +116,13 @@
}
public static void generateInitStubsPrologue(PrintWriter writer, boolean context_specific) {
- writer.println("\tprivate Set " + ALL_INIT_METHOD_NAME + "(boolean forwardCombatible) throws LWJGLException {");
+ writer.println("\tprivate Set " + ALL_INIT_METHOD_NAME + "(boolean forwardCompatible) throws LWJGLException {");
if ( !context_specific ) {
writer.println("\t\tif (" + STUBS_LOADED_NAME + ")");
writer.println("\t\t\treturn GLContext.getSupportedExtensions();");
writer.println("\t\torg.lwjgl.opengl.GL11." + Utils.STUB_INITIALIZER_NAME + "();");
} else {
- writer.println("\t\tif (!" + getAddressesInitializerName("GL11") + "(forwardCombatible))");
+ writer.println("\t\tif (!" + getAddressesInitializerName("GL11") + "(forwardCompatible))");
writer.println("\t\t\tthrow new LWJGLException(\"GL11 not supported\");");
}
// Try to initialize GL30.glGetStringi here, in case we have created an OpenGL 3.0 context
@@ -154,7 +154,7 @@
writer.print(translateFieldName(d.getSimpleName()) + "\")");
writer.print(" && !" + getAddressesInitializerName(d.getSimpleName()) + "(");
if ( d.getAnnotation(DeprecatedGL.class) != null )
- writer.print("forwardCombatible");
+ writer.print("forwardCompatible");
if ( d.getAnnotation(Dependent.class) != null ) {
if ( d.getAnnotation(DeprecatedGL.class) != null )
writer.print(",");
@@ -186,7 +186,7 @@
DeprecatedGL deprecated = d.getAnnotation(DeprecatedGL.class);
Dependent dependent = d.getAnnotation(Dependent.class);
if ( deprecated != null )
- writer.print("boolean forwardCombatible");
+ writer.print("boolean forwardCompatible");
if ( dependent != null ) {
if ( deprecated != null )
writer.print(",");
@@ -202,7 +202,7 @@
writer.print("\t\t\t(");
if ( deprecated != null )
- writer.print("forwardCombatible || ");
+ writer.print("forwardCompatible || ");
if ( dependent != null )
writer.print("!supported_extensions.contains(\"" + dependent.value() + "\") || ");
if ( deprecated != null || dependent != null )
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/DeprecatedGL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/DeprecatedGL.java 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/DeprecatedGL.java 2008-08-19 17:47:24 UTC (rev 3117)
@@ -33,7 +33,7 @@
/**
* Use this annotation on extensions with deprecated functionality.
- * Functions in such extensions marked with this annotation will not be loaded in a forward combatible context.
+ * Functions in such extensions marked with this annotation will not be loaded in a forward compatible context.
*
* @author spasi <sp...@us...>
*/
Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c 2008-08-19 16:46:03 UTC (rev 3116)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Pbuffer.c 2008-08-19 17:47:24 UTC (rev 3117)
@@ -68,7 +68,7 @@
return false;
}
dummy_hdc = GetDC(dummy_hwnd);
- pixel_format_id = findPixelFormatOnDC(env, dummy_hdc, origin_x, origin_y, pixel_format, pixelFormatCaps, false, true, false, false, false);
+ pixel_format_id = findPixelFormatOnDC(env, dummy_hdc, origin_x, origin_y, pixel_format, pixelFormatCaps, false, true, false, false);
if (pixel_format_id == -1) {
closeWindow(&dummy_hwnd, &dummy_hdc);
return false;
@@ -137,7 +137,6 @@
WindowsPeerInfo *peer_info = (WindowsPeerInfo *)(*env)->GetDirectBufferAddress(env, peer_info_handle);
int pixel_format_id;
jclass cls_pixel_format = (*env)->GetObjectClass(env, pixel_format);
- bool floating_point = (bool)(*env)->GetBooleanField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "floating_point", "Z"));
if ( pBufferAttribs != NULL ) {
pBufferAttribs_ptr = (const int *)(*env)->GetDirectBufferAddress(env, pBufferAttribs);
@@ -152,7 +151,7 @@
return;
}
dummy_hdc = GetDC(dummy_hwnd);
- pixel_format_id = findPixelFormatOnDC(env, dummy_hdc, origin_x, origin_y, pixel_format, pixelFormatCaps, false, false, true, false, floating_point);
+ pixel_format_id = findPixelFormatOnDC(env, dummy_hdc, origin_x, origin_y, pixel_format, pixelFormatCaps, false, false, true, false);
if (pixel_format_id == -1) {
closeWindow(&dummy_hwnd, &dummy_hdc);
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2008-08-19 16:46:22
|
Revision: 3116
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3116&view=rev
Author: spasi
Date: 2008-08-19 16:46:03 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
Added support for OpenGL 3.0 functionality
Added support for OpenGL 3.0 context creation (MAJOR/MINOR versions, DEBUG mode, FORWARD_COMBATIBLE mode)
Added support for OpenGL 3.0 context sharing
Added support for OpenGL 3.0 extension detection
Improved support for floating point PixelFormats (ARB_color_buffer_float)
Added support for packed floating point PixelFormats (EXT_packed_float)
Added support for sRGB PixelFormats (ARB_framebuffer_sRGB)
Added support for pseudo-FORWARD_COMBATIBLE mode (deprecated functions not loaded)
Added support for EXT_direct_state_access
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
trunk/LWJGL/src/java/org/lwjgl/opengl/KeyboardEventQueue.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTGLCanvasPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxPbufferPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTGLCanvasPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPbufferPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java
trunk/LWJGL/src/java/org/lwjgl/opengl/PeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/PixelFormat.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTGLCanvasPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextImplementation.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplayPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsFileVersion.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsPbufferPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsPeerInfo.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextGeneratorProcessorFactory.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
trunk/LWJGL/src/native/linux/context.c
trunk/LWJGL/src/native/linux/extgl_glx.c
trunk/LWJGL/src/native/linux/extgl_glx.h
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c
trunk/LWJGL/src/native/macosx/context.m
trunk/LWJGL/src/native/macosx/org_lwjgl_opengl_MacOSXContextImplementation.m
trunk/LWJGL/src/native/windows/context.c
trunk/LWJGL/src/native/windows/context.h
trunk/LWJGL/src/native/windows/extgl_wgl.c
trunk/LWJGL/src/native/windows/extgl_wgl.h
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsContextImplementation.c
trunk/LWJGL/src/native/windows/org_lwjgl_opengl_WindowsPeerInfo.c
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_imaging.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_window_pos.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_secondary_color.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL14.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_conditional_render.java
Added Paths:
-----------
trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsContextAttribs.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/Dependent.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/DeprecatedGL.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/GLtime.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java 2008-08-12 21:02:06 UTC (rev 3115)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -57,11 +57,6 @@
}
/**
- * Default buffer size for most buffer checks.
- */
- private static final int DEFAULT_BUFFER_SIZE = 4;
-
- /**
* Helper methods to ensure a function pointer is not-null (0)
*/
public static void checkFunctionAddress(long pointer) {
@@ -129,7 +124,7 @@
private static void throwBufferSizeException(Buffer buf, int size) {
throw new IllegalArgumentException("Number of remaining buffer elements is " + buf.remaining() + ", must be at least " + size);
}
-
+
/**
* Helper method to ensure a buffer is big enough to receive data from a
* glGet* operation.
Modified: trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java 2008-08-12 21:02:06 UTC (rev 3115)
+++ trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -52,7 +52,7 @@
private final static int INITIAL_BUFFER_SIZE = 1;
private final static ThreadLocal thread_buffer = new ThreadLocal() {
- protected final Object initialValue() {
+ protected Object initialValue() {
return new CachedBuffers(INITIAL_BUFFER_SIZE);
}
};
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2008-08-12 21:02:06 UTC (rev 3115)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -31,33 +31,29 @@
*/
package org.lwjgl.opengl;
-import java.awt.Canvas;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Point;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
+import org.lwjgl.Sys;
+
+import java.awt.*;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.LWJGLUtil;
-import org.lwjgl.Sys;
-
/**
- * <p>
+ * <p/>
* An AWT rendering context.
- * <p>
- * @version $Revision$
+ * <p/>
+ *
* @author $Author$
- * $Id$
+ * $Id$
+ * @version $Revision$
*/
public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener, HierarchyListener {
private static final long serialVersionUID = 1L;
-
+
private final static AWTCanvasImplementation implementation;
private boolean update_context;
private Object SYNC_LOCK = new Object();
@@ -67,7 +63,10 @@
/** The drawable to share context with */
private final Drawable drawable;
-
+
+ /** The ContextAttribs to use when creating the context */
+ private final ContextAttribs attribs;
+
/** Context handle */
private PeerInfo peer_info;
private Context context;
@@ -87,7 +86,7 @@
}
static AWTCanvasImplementation createImplementation() {
- switch (LWJGLUtil.getPlatform()) {
+ switch ( LWJGLUtil.getPlatform() ) {
case LWJGLUtil.PLATFORM_LINUX:
return new LinuxCanvasImplementation();
case LWJGLUtil.PLATFORM_WINDOWS:
@@ -100,25 +99,21 @@
}
private void setUpdate() {
- synchronized(SYNC_LOCK) {
+ synchronized ( SYNC_LOCK ) {
update_context = true;
}
}
- /**
- * This method should only be called internally.
- */
+ /** This method should only be called internally. */
public Context getContext() {
return context;
}
-
- /**
- * Constructor using the default PixelFormat.
- */
+
+ /** Constructor using the default PixelFormat. */
public AWTGLCanvas() throws LWJGLException {
this(new PixelFormat());
}
-
+
/**
* Create an AWTGLCanvas with the requested PixelFormat on the default GraphicsDevice.
*
@@ -131,7 +126,7 @@
/**
* Create an AWTGLCanvas with the requested PixelFormat on the default GraphicsDevice.
*
- * @param device the device to create the canvas on.
+ * @param device the device to create the canvas on.
* @param pixel_format The desired pixel format. May not be null
*/
public AWTGLCanvas(GraphicsDevice device, PixelFormat pixel_format) throws LWJGLException {
@@ -141,94 +136,99 @@
/**
* Create an AWTGLCanvas with the requested PixelFormat on the specified GraphicsDevice.
*
- * @param device the device to create the canvas on.
+ * @param device the device to create the canvas on.
* @param pixel_format The desired pixel format. May not be null
- * @param drawable The Drawable to share context with
+ * @param drawable The Drawable to share context with
*/
public AWTGLCanvas(GraphicsDevice device, PixelFormat pixel_format, Drawable drawable) throws LWJGLException {
+ this(device, pixel_format, drawable, null);
+ }
+
+ /**
+ * Create an AWTGLCanvas with the requested PixelFormat on the specified GraphicsDevice.
+ *
+ * @param device the device to create the canvas on.
+ * @param pixel_format The desired pixel format. May not be null
+ * @param drawable The Drawable to share context with
+ * @param attribs The ContextAttribs to use when creating the context. (optional, may be null)
+ */
+ public AWTGLCanvas(GraphicsDevice device, PixelFormat pixel_format, Drawable drawable, ContextAttribs attribs) throws LWJGLException {
super(implementation.findConfiguration(device, pixel_format));
- if (pixel_format == null)
+ if ( pixel_format == null )
throw new NullPointerException("Pixel format must be non-null");
addHierarchyListener(this);
addComponentListener(this);
this.drawable = drawable;
this.pixel_format = pixel_format;
+ this.attribs = attribs;
}
-
+
/* (non-Javadoc)
- * @see java.awt.Canvas#addNotify()
- */
+ * @see java.awt.Canvas#addNotify()
+ */
public void addNotify() {
super.addNotify();
}
-
+
/* (non-Javadoc)
- * @see java.awt.Component#removeNotify()
- */
+ * @see java.awt.Component#removeNotify()
+ */
public void removeNotify() {
- synchronized (SYNC_LOCK) {
+ synchronized ( SYNC_LOCK ) {
destroyContext();
super.removeNotify();
}
- }
-
- /**
- * Set swap interval.
- */
+ }
+
+ /** Set swap interval. */
public void setSwapInterval(int swap_interval) {
- synchronized(SYNC_LOCK) {
- if (context == null)
+ synchronized ( SYNC_LOCK ) {
+ if ( context == null )
throw new IllegalStateException("Canvas not yet displayable");
Context.setSwapInterval(swap_interval);
}
}
-
- /**
- * Enable vsync
- */
+
+ /** Enable vsync */
public void setVSyncEnabled(boolean enabled) {
setSwapInterval(enabled ? 1 : 0);
}
-
- /**
- * Swap the canvas' buffer
- */
+
+ /** Swap the canvas' buffer */
public void swapBuffers() throws LWJGLException {
- synchronized(SYNC_LOCK) {
- if (context == null)
+ synchronized ( SYNC_LOCK ) {
+ if ( context == null )
throw new IllegalStateException("Canvas not yet displayable");
Context.swapBuffers();
}
}
-
+
public void releaseContext() throws LWJGLException {
- synchronized(SYNC_LOCK) {
- if (context == null)
+ synchronized ( SYNC_LOCK ) {
+ if ( context == null )
throw new IllegalStateException("Canvas not yet displayable");
- if (context.isCurrent())
+ if ( context.isCurrent() )
Context.releaseCurrentContext();
}
}
-
+
/**
* Make the canvas' context current. It is highly recommended that the context
* is only made current inside the AWT thread (for example in an overridden paintGL()).
*/
public void makeCurrent() throws LWJGLException {
- synchronized(SYNC_LOCK) {
- if (context == null)
+ synchronized ( SYNC_LOCK ) {
+ if ( context == null )
throw new IllegalStateException("Canvas not yet displayable");
context.makeCurrent();
}
}
-
- /**
- * Destroy the OpenGL context. This happens when the component becomes undisplayable
- */
+
+ /** Destroy the OpenGL context. This happens when the component becomes undisplayable */
private void destroyContext() {
- synchronized(SYNC_LOCK) {
+ synchronized ( SYNC_LOCK ) {
try {
- if (context != null) {
+ if ( context != null ) {
context.forceDestroy();
context = null;
reentry_count = 0;
@@ -243,15 +243,13 @@
/**
* Override this to do initialising of the context.
- * It will be called once from paint(), immediately after
+ * It will be called once from paint(), immediately after
* the context is created and made current.
*/
protected void initGL() {
}
- /**
- * Override this to do painting
- */
+ /** Override this to do painting */
protected void paintGL() {
}
@@ -261,36 +259,36 @@
*/
public final void paint(Graphics g) {
LWJGLException exception = null;
- synchronized (SYNC_LOCK) {
- if (!isDisplayable())
+ synchronized ( SYNC_LOCK ) {
+ if ( !isDisplayable() )
return;
try {
- if (peer_info == null) {
+ if ( peer_info == null ) {
this.peer_info = implementation.createPeerInfo(this, pixel_format);
}
peer_info.lockAndGetHandle();
try {
- if (context == null) {
- this.context = new Context(peer_info, drawable != null ? drawable.getContext() : null);
+ if ( context == null ) {
+ this.context = new Context(peer_info, attribs, drawable != null ? drawable.getContext() : null);
first_run = true;
}
- if (reentry_count == 0)
+ if ( reentry_count == 0 )
context.makeCurrent();
reentry_count++;
try {
- if (update_context) {
+ if ( update_context ) {
context.update();
update_context = false;
}
- if (first_run) {
+ if ( first_run ) {
first_run = false;
initGL();
}
paintGL();
} finally {
reentry_count--;
- if (reentry_count == 0)
+ if ( reentry_count == 0 )
Context.releaseCurrentContext();
}
} finally {
@@ -300,7 +298,7 @@
exception = e;
}
}
- if (exception != null)
+ if ( exception != null )
exceptionOccurred(exception);
}
@@ -314,9 +312,7 @@
LWJGLUtil.log("Unhandled exception occurred, skipping paint(): " + exception);
}
- /**
- * override update to avoid clearing
- */
+ /** override update to avoid clearing */
public void update(Graphics g) {
paint(g);
}
@@ -363,4 +359,5 @@
public void hierarchyChanged(HierarchyEvent e) {
setUpdate();
}
-}
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java 2008-08-12 21:02:06 UTC (rev 3115)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -54,7 +54,7 @@
private boolean firstLockSucceeded = false;
- public AWTSurfaceLock() {
+ AWTSurfaceLock() {
lock_buffer = createHandle();
}
@@ -98,7 +98,7 @@
private static native boolean lockAndInitHandle(ByteBuffer lock_buffer, Canvas component) throws LWJGLException;
- protected void unlock() throws LWJGLException {
+ void unlock() throws LWJGLException {
nUnlock(lock_buffer);
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2008-08-12 21:02:06 UTC (rev 3115)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -113,7 +113,7 @@
final GraphicsConfiguration config = component.getGraphicsConfiguration();
if (config != null) {
PointerInfo pointer_info = (PointerInfo)AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public final Object run() throws Exception {
+ public Object run() throws Exception {
return MouseInfo.getPointerInfo();
}
});
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java 2008-08-12 21:02:06 UTC (rev 3115)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -31,43 +31,44 @@
*/
package org.lwjgl.opengl;
-import java.nio.ByteBuffer;
-
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
import org.lwjgl.Sys;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
/**
* <p/>
* Context encapsulates an OpenGL context.
* <p/>
- *
+ * <p/>
* This class is thread-safe.
*
* @author elias_naur <eli...@us...>
* @version $Revision$
- * $Id$
+ * $Id$
*/
final class Context {
- /**
- * The platform specific implementation of context methods
- */
+
+ /** The platform specific implementation of context methods */
private final static ContextImplementation implementation;
/** The current Context */
private final static ThreadLocal current_context_local = new ThreadLocal();
-
- /**
- * Handle to the native GL rendering context
- */
+
+ /** Handle to the native GL rendering context */
private final ByteBuffer handle;
private final PeerInfo peer_info;
+ private final IntBuffer attribList;
+ private final boolean forwardCombatible;
+
/** Whether the context has been destroyed */
private boolean destroyed;
private boolean destroy_requested;
-
+
/** The thread that has this context current, or null. */
private Thread thread;
@@ -77,7 +78,7 @@
}
private static ContextImplementation createImplementation() {
- switch (LWJGLUtil.getPlatform()) {
+ switch ( LWJGLUtil.getPlatform() ) {
case LWJGLUtil.PLATFORM_LINUX:
return new LinuxContextImplementation();
case LWJGLUtil.PLATFORM_WINDOWS:
@@ -97,20 +98,26 @@
return (Context)current_context_local.get();
}
- /**
- * Create a context with the specified peer info and shared context
- */
- public Context(PeerInfo peer_info, Context shared_context) throws LWJGLException {
+ /** Create a context with the specified peer info and shared context */
+ Context(PeerInfo peer_info, ContextAttribs attribs, Context shared_context) throws LWJGLException {
Context context_lock = shared_context != null ? shared_context : this;
- // If shared_context is not null, synchronize on it to make sure it is not deleted
+ // If shared_context is not null, synchronize on it to make sure it is not deleted
// while this context is created. Otherwise, simply synchronize on ourself to avoid NPE
- synchronized (context_lock) {
- if (shared_context != null && shared_context.destroyed)
+ synchronized ( context_lock ) {
+ if ( shared_context != null && shared_context.destroyed )
throw new IllegalArgumentException("Shared context is destroyed");
GLContext.loadOpenGLLibrary();
try {
this.peer_info = peer_info;
- this.handle = implementation.create(peer_info, shared_context != null ? shared_context.handle : null);
+ if ( attribs != null ) {
+ attribList = attribs.getAttribList();
+ forwardCombatible = attribs.isForwardCombatible();
+ } else {
+ attribList = null;
+ forwardCombatible = false;
+ }
+
+ this.handle = implementation.create(peer_info, attribList, shared_context != null ? shared_context.handle : null);
} catch (LWJGLException e) {
GLContext.unloadOpenGLLibrary();
throw e;
@@ -118,16 +125,14 @@
}
}
- /**
- * Release the current context (if any). After this call, no context is current.
- */
+ /** Release the current context (if any). After this call, no context is current. */
public static void releaseCurrentContext() throws LWJGLException {
Context current_context = getCurrentContext();
- if (current_context != null) {
+ if ( current_context != null ) {
implementation.releaseCurrentContext();
GLContext.useContext(null);
current_context_local.set(null);
- synchronized (current_context) {
+ synchronized ( current_context ) {
current_context.thread = null;
current_context.checkDestroy();
}
@@ -141,64 +146,56 @@
* on every releaseCurrentContext results in artifacts.
*/
public synchronized void releaseDrawable() throws LWJGLException {
- if (destroyed)
+ if ( destroyed )
throw new IllegalStateException("Context is destroyed");
implementation.releaseDrawable(getHandle());
}
- /**
- * Update the context. Should be called whenever it's drawable is moved or resized
- */
+ /** Update the context. Should be called whenever it's drawable is moved or resized */
public synchronized void update() {
- if (destroyed)
+ if ( destroyed )
throw new IllegalStateException("Context is destroyed");
implementation.update(getHandle());
}
-
- /**
- * Swap the buffers on the current context. Only valid for double-buffered contexts
- */
+
+ /** Swap the buffers on the current context. Only valid for double-buffered contexts */
public static void swapBuffers() throws LWJGLException {
implementation.swapBuffers();
}
-
+
private boolean canAccess() {
return thread == null || Thread.currentThread() == thread;
}
private void checkAccess() {
- if (!canAccess())
+ if ( !canAccess() )
throw new IllegalStateException("From thread " + Thread.currentThread() + ": " + thread + " already has the context current");
}
- /**
- * Make the context current
- */
+ /** Make the context current */
public synchronized void makeCurrent() throws LWJGLException {
checkAccess();
- if (destroyed)
+ if ( destroyed )
throw new IllegalStateException("Context is destroyed");
thread = Thread.currentThread();
current_context_local.set(this);
implementation.makeCurrent(peer_info, handle);
- GLContext.useContext(this);
+ GLContext.useContext(this, forwardCombatible);
}
ByteBuffer getHandle() {
return handle;
}
- /**
- * Query whether the context is current
- */
+ /** Query whether the context is current */
public synchronized boolean isCurrent() throws LWJGLException {
- if (destroyed)
+ if ( destroyed )
throw new IllegalStateException("Context is destroyed");
return implementation.isCurrent(handle);
}
private void checkDestroy() {
- if (!destroyed && destroy_requested) {
+ if ( !destroyed && destroy_requested ) {
try {
releaseDrawable();
implementation.destroy(peer_info, handle);
@@ -215,16 +212,13 @@
* Set the buffer swap interval. This call is a best-attempt at changing
* the monitor swap interval, which is the minimum periodicity of color buffer swaps,
* measured in video frame periods, and is not guaranteed to be successful.
- *
+ * <p/>
* A video frame period is the time required to display a full frame of video data.
- *
- * @param sync true to synchronize; false to ignore synchronization
*/
public static void setSwapInterval(int value) {
implementation.setSwapInterval(value);
}
-
-
+
/**
* Destroy the context. This method behaves the same as destroy() with the extra
* requirement that the context must be either current to the current thread or not
@@ -234,24 +228,25 @@
checkAccess();
destroy();
}
-
+
/**
* Request destruction of the Context. If the context is current, no context will be current after this call.
* The context is destroyed when no thread has it current.
*/
public synchronized void destroy() throws LWJGLException {
- if (destroyed)
+ if ( destroyed )
return;
destroy_requested = true;
boolean was_current = isCurrent();
int error = GL11.GL_NO_ERROR;
- if (was_current) {
- if (GLContext.getCapabilities() != null && GLContext.getCapabilities().OpenGL11)
+ if ( was_current ) {
+ if ( GLContext.getCapabilities() != null && GLContext.getCapabilities().OpenGL11 )
error = GL11.glGetError();
releaseCurrentContext();
}
checkDestroy();
- if (was_current && error != GL11.GL_NO_ERROR)
+ if ( was_current && error != GL11.GL_NO_ERROR )
throw new OpenGLException(error);
}
-}
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextAttribs.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -0,0 +1,213 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.BufferUtils;
+import org.lwjgl.LWJGLUtil;
+
+import java.nio.IntBuffer;
+
+/**
+ * This class represents the context attributes passed to CreateContextAttribs of the XGL_create_context extension.
+ * These attributes can be used to indicate at context creation which OpenGL interface will be used. This includes the
+ * OpenGL version, the layer plane on which rendering takes place and also optional debug and forward combatibility modes.
+ * (read the XGL_create_context spec for details)
+ * <p/>
+ * Use of this class is optional. If an OpenGL context is created without passing an instance of this class
+ * (or XGL_create_context is not supported), the old context creation code will be used. Use of ContextAttribs is required
+ * to create an OpenGL 3.0 or newer context. Support for debug and forward compatible mobes is not guaranteed by the OpenGL
+ * implementation. Developers may encounter debug contexts being the same as non-debug contexts or forward combatible
+ * contexts having support for deprecated functionality.
+ * <p/>
+ * Warning: This functionality is currently available on the Windows platform only. However, if the forwardCombatible
+ * attribute is used, LWJGL will not load the deprecated functionality (as defined in the OpenGL 3.0 specification). This
+ * means that developers can start working on cleaning up their applications without an OpenGL 3.0 complaint driver.
+ *
+ * @author spasi <sp...@us...>
+ */
+public abstract class ContextAttribs {
+
+ private int majorVersion;
+ private int minorVersion;
+
+ private int layerPlane;
+
+ private boolean debug;
+ private boolean forwardCombatible;
+
+ protected ContextAttribs(final int majorVersion, final int minorVersion) {
+ if ( majorVersion < 0 ||
+ 3 < majorVersion ||
+ minorVersion < 0 ||
+ (majorVersion == 3 && 0 < minorVersion) ||
+ (majorVersion == 2 && 1 < minorVersion) ||
+ (majorVersion == 1 && 5 < minorVersion) )
+ throw new IllegalArgumentException("Invalid OpenGL version specified: " + majorVersion + '.' + minorVersion);
+
+ this.majorVersion = majorVersion;
+ this.minorVersion = minorVersion;
+
+ this.layerPlane = 0;
+
+ this.debug = false;
+ this.forwardCombatible = false;
+ }
+
+ protected ContextAttribs(final ContextAttribs attribs) {
+ this.majorVersion = attribs.majorVersion;
+ this.minorVersion = attribs.minorVersion;
+
+ this.layerPlane = attribs.layerPlane;
+
+ this.debug = attribs.debug;
+ this.forwardCombatible = attribs.forwardCombatible;
+ }
+
+ public static ContextAttribs create() {
+ return create(1, 0);
+ }
+
+ public static ContextAttribs create(final int majorVersion, final int minorVersion) {
+ switch ( LWJGLUtil.getPlatform() ) {
+ case LWJGLUtil.PLATFORM_LINUX:
+ return new LinuxContextAttribs(majorVersion, minorVersion);
+ case LWJGLUtil.PLATFORM_WINDOWS:
+ return new WindowsContextAttribs(majorVersion, minorVersion);
+ case LWJGLUtil.PLATFORM_MACOSX:
+ return new MacOSXContextAttribs(majorVersion, minorVersion);
+ default:
+ throw new IllegalStateException("Unsupported platform");
+ }
+ }
+
+ private static ContextAttribs create(final ContextAttribs attribs) {
+ switch ( LWJGLUtil.getPlatform() ) {
+ case LWJGLUtil.PLATFORM_LINUX:
+ return new LinuxContextAttribs(attribs);
+ case LWJGLUtil.PLATFORM_WINDOWS:
+ return new WindowsContextAttribs(attribs);
+ case LWJGLUtil.PLATFORM_MACOSX:
+ return new MacOSXContextAttribs(attribs);
+ default:
+ throw new IllegalStateException("Unsupported platform");
+ }
+ }
+
+ public final int getMajorVersion() {
+ return majorVersion;
+ }
+
+ public final int getMinorVersion() {
+ return minorVersion;
+ }
+
+ public final int getLayerPlane() {
+ return layerPlane;
+ }
+
+ public final boolean isDebug() {
+ return debug;
+ }
+
+ public final boolean isForwardCombatible() {
+ return forwardCombatible;
+ }
+
+ public final ContextAttribs withLayer(final int layerPlane) {
+ if ( layerPlane < 0 )
+ throw new IllegalArgumentException("Invalid layer plane specified: " + layerPlane);
+
+ final ContextAttribs attribs = create(this);
+ attribs.layerPlane = layerPlane;
+ return attribs;
+ }
+
+ public final ContextAttribs withDebug(final boolean debug) {
+ final ContextAttribs attribs = create(this);
+ attribs.debug = debug;
+ return attribs;
+ }
+
+ public final ContextAttribs withForwardCombatible(final boolean forwardCombatible) {
+ final ContextAttribs attribs = create(this);
+ attribs.forwardCombatible = forwardCombatible;
+ return attribs;
+ }
+
+ protected abstract int getMajorVersionAttrib();
+
+ protected abstract int getMinorVersionAttrib();
+
+ protected abstract int getLayerPlaneAttrib();
+
+ protected abstract int getFlagsAttrib();
+
+ protected abstract int getDebugBit();
+
+ protected abstract int getForwardCombatibleBit();
+
+ final IntBuffer getAttribList() {
+ int attribCount = 0;
+
+ if ( !(majorVersion == 1 && minorVersion == 0) )
+ attribCount += 2;
+ if ( 0 < layerPlane )
+ attribCount++;
+
+ int flags = 0;
+ if ( debug )
+ flags |= getDebugBit();
+ if ( forwardCombatible )
+ flags |= getForwardCombatibleBit();
+ if ( 0 < flags )
+ attribCount++;
+
+ if ( attribCount == 0 )
+ return null;
+
+ final IntBuffer attribs = BufferUtils.createIntBuffer((attribCount * 2) + 1);
+
+ if ( !(majorVersion == 1 && minorVersion == 0) ) {
+ attribs.put(getMajorVersionAttrib()).put(majorVersion);
+ attribs.put(getMinorVersionAttrib()).put(minorVersion);
+ }
+ if ( 0 < layerPlane )
+ attribs.put(getLayerPlaneAttrib()).put(layerPlane);
+ if ( 0 < flags )
+ attribs.put(getFlagsAttrib()).put(flags);
+
+ attribs.put(0);
+ attribs.rewind();
+ return attribs;
+ }
+
+}
\ No newline at end of file
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ContextImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ContextImplementation.java 2008-08-12 21:02:06 UTC (rev 3115)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ContextImplementation.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -32,6 +32,7 @@
package org.lwjgl.opengl;
import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
import org.lwjgl.LWJGLException;
@@ -48,42 +49,42 @@
/**
* Create a context.
*/
- public ByteBuffer create(PeerInfo peer_info, ByteBuffer shared_context_handle) throws LWJGLException;
+ ByteBuffer create(PeerInfo peer_info, IntBuffer attribs, ByteBuffer shared_context_handle) throws LWJGLException;
/**
* Swap the buffers of the current context. Only valid for double-buffered contexts.
*/
- public void swapBuffers() throws LWJGLException;
+ void swapBuffers() throws LWJGLException;
/**
* Release the context from its drawable, if any.
*/
- public void releaseDrawable(ByteBuffer context_handle) throws LWJGLException;
+ void releaseDrawable(ByteBuffer context_handle) throws LWJGLException;
/**
* Release the current context (if any). After this call, no context is current.
*/
- public void releaseCurrentContext() throws LWJGLException;
+ void releaseCurrentContext() throws LWJGLException;
/**
* Update the context. Should be called whenever it's drawable is moved or resized
*/
- public void update(ByteBuffer context_handle);
+ void update(ByteBuffer context_handle);
/**
* Query whether the context is current
*/
- public void makeCurrent(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException;
+ void makeCurrent(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException;
/**
* Query whether the context is current
*/
- public boolean isCurrent(ByteBuffer handle) throws LWJGLException;
+ boolean isCurrent(ByteBuffer handle) throws LWJGLException;
- public void setSwapInterval(int value);
+ void setSwapInterval(int value);
/**
* Destroys the Context.
*/
- public void destroy(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException;
+ void destroy(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException;
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-08-12 21:02:06 UTC (rev 3115)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2008-08-19 16:46:03 UTC (rev 3116)
@@ -43,17 +43,6 @@
* @author foo
*/
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.awt.Canvas;
-import java.awt.event.ComponentListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
@@ -62,12 +51,24 @@
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
+import java.awt.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.HashSet;
+
public final class Display {
+
private static final Thread shutdown_hook = new Thread() {
- public void run() {
- reset();
- }
- };
+ public void run() {
+ reset();
+ }
+ };
/** The display implementor */
private static final DisplayImplementation display_impl;
@@ -86,7 +87,7 @@
/** X coordinate of the window */
private static int x = -1;
-
+
/** Cached window icons, for when Display is recreated */
private static ByteBuffer[] cached_icons;
@@ -117,8 +118,8 @@
private static boolean parent_resized;
private static ComponentListener component_listener = new ComponentAdapter() {
- public final void componentResized(ComponentEvent e) {
- synchronized (GlobalLock.lock) {
+ public void componentResized(ComponentEvent e) {
+ synchronized ( GlobalLock.lock ) {
parent_resized = true;
}
}
@@ -135,7 +136,7 @@
}
drawable = new Drawable() {
public Context getContext() {
- synchronized (GlobalLock.lock) {
+ synchronized ( GlobalLock.lock ) {
return isCreated() ? context : null;
}
}
@@ -152,7 +153,7 @@
}
private static DisplayImplementation createDisplayImplementation() {
- switch (LWJGLUtil.getPlatform()) {
+ switch ( LWJGLUtil.getPlatform() ) {
case LWJGLUtil.PLATFORM_LINUX:
return new LinuxDisplay();
case LWJGLUtil.PLATFORM_WINDOWS:
@@ -164,9 +165,7 @@
}
}
- /**
- * Only constructed by ourselves
- */
+ /** Only constructed by ourselves */
private Display() {
}
@@ -176,7 +175,7 @@
* given mode is not guaranteed to be available nor is it guaranteed to be within the
* current monitor specs (this is especially a problem with the frequency parameter).
* Furthermore, it is not guaranteed that create() will detect an illegal display mode.
- *
+ * <p/>
* The only certain way to check
* is to call create() and make sure it works.
* Only non-palette-indexed modes are returned (ie. bpp will be 16, 24, or 32).
@@ -186,10 +185,10 @@
* @return an array of all display modes the system reckons it can handle.
*/
public static DisplayMode[] getAvailableDisplayModes() throws LWJGLException {
- synchronized (GlobalLock.lock) {
+ synchronized ( GlobalLock.lock ) {
DisplayMode[] unfilteredModes = display_impl.getAvailableDisplayModes();
- if (unfilteredModes == null) {
+ if ( unfilteredModes == null ) {
return new DisplayMode[0];
}
@@ -208,10 +207,11 @@
/**
* Return the current display mode, as set by setDisplayMode().
+ *
* @return The current display mode
*/
public static DisplayMode getDisplayMode() {
- synchronized (GlobalLock.lock) {
+ synchronized ( GlobalLock.lock ) {
return current_mode;
}
}
@@ -224,20 +224,21 @@
* is also reset.
*
* @param mode The new display mode to set
+ *
* @throws LWJGLException if the display mode could not be set
*/
public static void setDisplayMode(DisplayMode mode) throws LWJGLException {
- synchronized (GlobalLock.lock) {
- if (mode == null)
+ synchronized ( GlobalLock.lock ) {
+ if ( mode == null )
throw new NullPointerException("mode must be non-null");
current_mode = mode;
- if (isCreated()) {
+ if ( isCreated() ) {
destroyWindow();
// If mode is not fullscreen capable, make sure we are in windowed mode
- if (!mode.isFullscreen())
+ if ( !mode.isFullscreen() )
resetFullscreen();
try {
- if (fullscreen)
+ if ( fullscreen )
switchDisplayMode();
createWindow();
makeCurrentAndSetSwapInterval();
@@ -256,9 +257,9 @@
}
private static int getWindowX() {
- if (!fullscreen && parent == null) {
+ if ( !fullscreen && parent == null ) {
// if no display location set, center window
- if (x == -1) {
+ if ( x == -1 ) {
return Math.max(0, (initial_mode.getWidth() - current_mode.getWidth()) / 2);
} else {
return x;
@@ -269,9 +270,9 @@
}
private static int getWindowY() {
- if (!fullscreen && parent == null) {
+ if ( !fullscreen && parent == null ) {
// if no display location set, center window
- if (y == -1) {
+ if ( y == -1 ) {
return Math.max(0, (initial_mode.getHeight() - current_mode.getHeight()) / 2);
} else {
return y;
@@ -286,24 +287,24 @@
* A native context must exist, and it will be attached to the window.
*/
private static void createWindow() throws LWJGLException {
- if (window_created) {
+ if ( window_created ) {
return;
}
Canvas tmp_parent = fullscreen ? null : parent;
- if (tmp_parent != null && !tmp_parent.isDisplayable()) // Only a best effort check, since the parent can turn undisplayable hereafter
+ if ( tmp_parent != null && !tmp_parent.isDisplayable() ) // Only a best effort check, since the parent can turn undisplayable hereafter
throw new LWJGLException("Parent.isDisplayable() must be true");
- if (tmp_parent != null) {
+ if ( tmp_parent != null ) {
tmp_parent.addComponentListener(component_listener);
}
DisplayMode mode = getEffectiveMode();
display_impl.createWindow(mode, fullscreen, tmp_parent, getWindowX(), getWindowY());
window_created = true;
-
+
setTitle(title);
initControls();
-
+
// set cached window icon if exists
- if(cached_icons != null) {
+ if ( cached_icons != null ) {
setIcon(cached_icons);
} else {
setIcon(new ByteBuffer[] { LWJGLUtil.LWJGLIcon32x32, LWJGLUtil.LWJGLIcon16x16 });
@@ -312,7 +313,7 @@
private static void releaseDrawable() {
try {
- if (context != null && context.isCurrent()) {
+ if ( context != null && context.isCurrent() ) {
Context.releaseCurrentContext();
context.releaseDrawable();
}
@@ -322,19 +323,19 @@
}
private static void destroyWindow() {
- if (!window_created) {
+ if ( !window_created ) {
return;
}
- if (parent != null) {
+ if ( parent != null ) {
parent.removeComponentListener(component_listener);
}
releaseDrawable();
// Automatically destroy keyboard & mouse
- if (Mouse.isCreated()) {
+ if ( Mouse.isCreated() ) {
Mouse.destroy();
}
- if (Keyboard.isCreated()) {
+ if ( Keyboard.isCreated() ) {
Keyboard.destroy();
}
display_impl.destroyWindow();
@@ -342,7 +343,7 @@
}
private static void switchDisplayMode() throws LWJGLException {
- if (!current_mode.isFullscreen()) {
+ if ( !current_mode.isFullscreen() ) {
throw new IllegalStateException("Only modes acquired from getAvailableDisplayModes() can be used for fullscreen display");
}
display_impl.switchDisplayMode(current_mode);
@@ -352,36 +353,36 @@
* Set the display configuration to the specified gamma, brightness and contrast.
* The configuration changes will be reset when destroy() is called.
*
- * @param gamma The gamma value
+ * @param gamma The gamma value
* @param brightness The brightness value between -1.0 and 1.0, inclusive
- * @param contrast The contrast, larger than 0.0.
+ * @param contrast The contrast, larger than 0.0.
*/
public static void setDisplayConfiguration(float gamma, float brightness, float contrast) throws LWJGLException {
- synchronized (GlobalLock.lock) {
- if (!isCreated()) {
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() ) {
throw new LWJGLException("Display not yet created.");
}
- if (brightness < -1.0f || brightness > 1.0f)
+ if ( brightness < -1.0f || brightness > 1.0f )
throw new IllegalArgumentException("Invalid brightness value");
- if (contrast < 0.0f)
+ if ( contrast < 0.0f )
throw new IllegalArgumentException("Invalid contrast value");
int rampSize = display_impl.getGammaRampLength();
- if (rampSize == 0) {
+ if ( rampSize == 0 ) {
throw new LWJGLException("Display configuration not supported");
}
FloatBuffer gammaRamp = BufferUtils.createFloatBuffer(rampSize);
- for (int i = 0; i < rampSize; i++) {
- float intensity = (float)i/(rampSize - 1);
+ for ( int i = 0; i < rampSize; i++ ) {
+ float intensity = (float)i / (rampSize - 1);
// apply gamma
float rampEntry = (float)java.lang.Math.pow(intensity, gamma);
// apply brightness
rampEntry += brightness;
// apply contrast
- rampEntry = (rampEntry - 0.5f)*contrast + 0.5f;
+ rampEntry = (rampEntry - 0.5f) * contrast + 0.5f;
// Clamp entry to [0, 1]
- if (rampEntry > 1.0f)
+ if ( rampEntry > 1.0f )
rampEntry = 1.0f;
- else if (rampEntry < 0.0f)
+ else if ( rampEntry < 0.0f )
rampEntry = 0.0f;
gammaRamp.put(i, rampEntry);
}
@@ -401,13 +402,13 @@
long timeNow;
long gapTo;
long savedTimeLate;
- synchronized (GlobalLock.lock) {
+ synchronized ( GlobalLock.lock ) {
gapTo = Sys.getTimerResolution() / fps + timeThen;
timeNow = Sys.getTime();
savedTimeLate = timeLate;
}
- while (gapTo > timeNow + savedTimeLate) {
+ while ( gapTo > timeNow + savedTimeLate ) {
try {
Thread.sleep(1);
} catch (InterruptedException e) {
@@ -415,8 +416,8 @@
timeNow = Sys.getTime();
}
- synchronized (GlobalLock.lock) {
- if (gapTo < timeNow)
+ synchronized ( GlobalLock.lock ) {
+ if ( gapTo < timeNow )
timeLate = timeNow - gapTo;
else
timeLate = 0;
@@ -425,29 +426,25 @@
}
}
- /**
- * @return the title of the window
- */
+ /** @return the title of the window */
public static String getTitle() {
- synchronized (GlobalLock.lock) {
+ synchronized ( GlobalLock.lock ) {
return title;
}
}
private static void resetFullscreen() {
- synchronized (GlobalLock.lock) {
- if (Display.fullscreen) {
+ synchronized ( GlobalLock.lock ) {
+ if ( Display.fullscreen ) {
Display.fullscreen = false;
display_impl.resetDisplayMode();
}
}
}
- /**
- * Return the last parent set with setParent().
- */
+ /** Return the last parent set with setParent(). */
public static Canvas getParent() {
- synchronized (GlobalLock.lock) {
+ synchronized ( GlobalLock.lock ) {
return parent;
}
}
@@ -461,17 +458,16 @@
* and it is difficult to predict which AWT thread will process any given AWT event.<p>
* While the Display is in fullscreen mode, the current parent will be ignored. Additionally, when a non null parent is specified,
* the Dispaly will inherit the size of the parent, disregarding the currently set display mode.<p>
- *
*/
public static void setParent(Canvas parent) throws LWJGLException {
- synchronized (GlobalLock.lock) {
- if (Display.parent != parent) {
+ synchronized ( GlobalLock.lock ) {
+ if ( Display.parent != parent ) {
Display.parent = parent;
- if (!isCreated())
+ if ( !isCreated() )
return;
destroyWindow();
try {
- if (fullscreen) {
+ if ( fullscreen ) {
switchDisplayMode();
} else {
display_impl.resetDisplayMode();
@@ -496,18 +492,19 @@
* mode returned by getDisplayMode(). The native cursor position is also reset.
*
* @param fullscreen Specify the fullscreen mode of the context.
+ *
* @throws LWJGLException If fullscreen is true, and the current DisplayMode instance is not
- * from getAvailableDisplayModes() or if the mode switch fails.
+ * from getAvailableDisplayModes() or if the mode switch fails.
*/
public static void setFullscreen(boolean fullscreen) throws LWJGLException {
- synchronized (GlobalLock.lock) {
- if (Display.fullscreen != fullscreen) {
+ synchronized ( GlobalLock.lock ) {
+ if ( Display.fullscreen != fullscreen ) {
Display.fullscreen = fullscreen;
- if (!isCreated())
+ if ( !isCreated() )
return;
destroyWindow();
try {
- if (fullscreen) {
+ if ( fullscreen ) {
switchDisplayMode();
} else {
display_impl.resetDisplayMode();
@@ -524,58 +521,51 @@
}
}
- /**
- * @return whether the Display is in fullscreen mode
- */
+ /** @return whether the Display is in fullscreen mode */
public static boolean isFullscreen() {
- synchronized (GlobalLock.lock) {
+ synchronized ( GlobalLock.lock ) {
return fullscreen;
}
}
/**
* Set the title of the window. This may be ignored by the underlying OS.
+ *
* @param newTitle The new window title
*/
public static void setTitle(String newTitle) {
- synchronized (GlobalLock.lock) {
- if (newTitle == null) {
+ synchronized ( GlobalLock.lock ) {
+ if ( newTitle == null ) {
newTitle = "";
}
title = newTitle;
- if (isCreated())
+ if ( isCreated() )
display_impl.setTitle(title);
}
}
- /**
- * @return true if the user or operating system has asked the window to close
- */
+ /** @return true if the user or operating system has asked the window to close */
public static boolean isCloseRequested() {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Cannot determine close requested state of uncreated window");
return display_impl.isCloseRequested();
}
}
- /**
- * @return true if the window is visible, false if not
- */
+ /** @return true if the window is visible, false if not */
public static boolean isVisible() {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Cannot determine minimized state of uncreated window");
return display_impl.isVisible();
}
}
- /**
- * @return true if window is active, that is, the foreground display of the operating system.
- */
+ /** @return true if window is active, that is, the foreground display of the operating system. */
public static boolean isActive() {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Cannot determine focused state of uncreated window");
return display_impl.isActive();
}
@@ -589,11 +579,11 @@
* redraw when it returns true. The flag is cleared when update() or isDirty() is called.
*
* @return true if the window has been damaged by external changes
- * and needs to repaint itself
+ * and needs to repaint itself
*/
public static boolean isDirty() {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Cannot determine dirty state of uncreated window");
return display_impl.isDirty();
}
@@ -605,8 +595,8 @@
* this method if update() is called periodically.
*/
public static void processMessages() {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Display not created");
display_impl.update();
@@ -616,11 +606,12 @@
/**
* Swap the display buffers. This method is called from update(), and should normally not be called by
* the application.
+ *
* @throws OpenGLException if an OpenGL error has occured since the last call to GL11.glGetError()
*/
public static void swapBuffers() throws LWJGLException {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Display not created");
Util.checkGLError();
@@ -631,16 +622,17 @@
/**
* Update the window. This calls processMessages(), and if the window is visible
* clears the dirty flag and calls swapBuffers() and finally polls the input devices.
+ *
* @throws OpenGLException if an OpenGL error has occured since the last call to GL11.glGetError()
*/
public static void update() {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Display not created");
processMessages();
// We paint only when the window is visible or dirty
- if (display_impl.isVisible() || display_impl.isDirty()) {
+ if ( display_impl.isVisible() || display_impl.isDirty() ) {
try {
swapBuffers();
} catch (LWJGLException e) {
@@ -649,7 +641,7 @@
}
pollDevices();
- if (parent_resized) {
+ if ( parent_resized ) {
reshape();
parent_resized = false;
}
@@ -658,16 +650,16 @@
static void pollDevices() {
// Poll the input devices while we're here
- if (Mouse.isCreated()) {
+ if ( Mouse.isCreated() ) {
Mouse.poll();
Mouse.updateCursor();
}
-
- if (Keyboard.isCreated()) {
+
+ if ( Keyboard.isCreated() ) {
Keyboard.poll();
}
-
- if(Controllers.isCreated()) {
+
+ if ( Controllers.isCreated() ) {
Controllers.poll();
}
}
@@ -678,40 +670,58 @@
* @throws LWJGLException If the context could not be released
*/
public static void releaseContext() throws LWJGLException {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Display is not created");
- if (context.isCurrent())
+ if ( context.isCurrent() )
Context.releaseCurrentContext();
}
}
-
+
/**
* Make the Display the current rendering context for GL calls.
*
* @throws LWJGLException If the context could not be made current
*/
public static void makeCurrent() throws LWJGLException {
- synchronized (GlobalLock.lock) {
- if (!isCreated())
+ synchronized ( GlobalLock.lock ) {
+ if ( !isCreated() )
throw new IllegalStateException("Display is not created");
context.makeCurrent();
}
}
+ private static void removeShutdownHook() {
+ AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ Runtime.getRuntime().removeShutdownHook(shutdown_hook);
+ return null;
+ }
+ });
+ }
+
+ private static void registerShutdownHook() {
+ AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ Runtime.getRuntime().addShutdownHook(shutdown_hook);
+ return null;
+ }
+ });
+ }
+
/**
* Create the OpenGL context. If isFullscreen() is true or if windowed
* context are not supported on the platform, the display mode will be switched to the mode returned by
* getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
* will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be
* created with the given parameters, a LWJGLException will be thrown.
- *
+ * <p/>
* <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates.
*
* @throws LWJGLException
*/
public static void create() throws LWJGLException {
- synchronized (GlobalLock.lock) {
+ synchronized ( GlobalLock.lock ) {
create(new PixelFormat());
}
}
@@ -722,34 +732,57 @@
* getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
* will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be
* created with the given parameters, a LWJGLException will be thrown.
- *
+ * <p/>
* <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates.
*
* @param pixel_format Describes the minimum specifications the context must fulfill.
+ *
* @throws LWJGLException
*/
public static void create(PixelFormat pixel_format) throws LWJGLException {
- synchronized (GlobalLock.lock) {
- create(pixel_format, null);
+ synchronized ( GlobalLock.lock ) {
+ create(pixel_format, null, null);
}
}
- private static void removeShutdownHook() {
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- Runtime.getRuntime().removeShutdownHook(shutdown_hook);
- return null;
- }
- });
+ /**
+ * Create the OpenGL context with the given minimum parameters. If isFullscreen() is true or if windowed
+ * context are not supported on the platform, the display mode will be switched to the mode returned by
+ * getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
+ * will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be
+ * created with the given parameters, a LWJGLException will be thrown.
+ * <p/>
+ * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates.
+ *
+ * @param pixel_format Describes the minimum specifications the context must fulfill.
+ * @param shared_drawable The Drawable to share context with. (optional, may be null)
+ *
+ * @throws LWJGLException
+ */
+ public static void create(PixelFormat pixel_format, Drawable shared_drawable) throws LWJGLException {
+ synchronized ( GlobalLock.lock ) {
+ create(pixel_format, shared_drawable, null);
+ }
}
- private static void registerShutdownHook() {
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- Runtime.getRuntime().addShutdownHook(shutdown_hook);
- return null;
- }
- });
+ /**
+ * Create the OpenGL context with the given minimum parameters. If isFullscreen() is true or if windowed
+ * context are not supported on the platform, the display mode will be switched to the mode returned by
+ * getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
+ * will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be
+ * created with the given parameters, a LWJGLException will be thrown.
+ * <p/>
+ * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates.
+ *
+ * @param pixel_format Describes the minimum specifications the context must fulfill.
+ * @param attribs The ContextAttribs to use when creating the context. (optional, may be null)
+ *
+ * @throws LWJGLException
+ */
+ public static void create(PixelFormat pixel_format, ContextAttribs attribs) throws LWJGLException {
+ synchronized ( GlobalLock.lock ) {
+ create(pixel_format, null, attribs);
+ }
}
/**
@@ -758,29 +791,31 @@
* getDisplayMode(), and a fullscreen context will be created. If isFullscreen() is false, a windowed context
* will be created with the dimensions given in the mode returned by getDisplayMode(). If a context can't be
* created with the given parameters, a LWJGLException will be thrown.
- *
+ * <p/>
* <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates.
*
- * @param pixel_format Describes the minimum specifications the context must fulfill.
- * @param shared_drawable The Drawable to share context with or null.
+ * @param pixel_format Describes the minimum specifications the context must fulfill.
+ * @param shared_drawable The Drawable to share context with. (optional, may be null)
+ * @param attribs The ContextAttribs to use when creating the context. (optional, may be null)
+ *
* @throws LWJGLException
*/
- public static void create(PixelFormat pixel_format, Drawable shared_drawable) throws LWJGLException {
- synchronized (GlobalLock.lock) {
- if (isCreated())
+ public static void create(PixelFormat pixel_format, Drawable shared_drawable, ContextAttribs attribs) throws LWJGLException {
+ synchronized ( GlobalLock.lock ) {
+ if ( isCreated() )
throw new IllegalStateException("Only one LWJGL co...
[truncated message content] |
|
From: <ka...@us...> - 2008-08-12 21:02:10
|
Revision: 3115
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3115&view=rev
Author: kappa1
Date: 2008-08-12 21:02:06 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Added al_solaris parameter to LWJGL's Appletloader. LWJGL Applets should be ready to go on Solaris as soon as binaries are.
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 2008-08-12 18:03:10 UTC (rev 3114)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java 2008-08-12 21:02:06 UTC (rev 3115)
@@ -83,6 +83,7 @@
* <li>al_windows - [String] Jar containing native files for windows.</li>
* <li>al_linux - [String] Jar containing native files for linux.</li>
* <li>al_mac - [String] Jar containing native files for mac.</li>
+ * <li>al_solaris - [String] Jar containing native files for solaris.</li>
* </ul>
* </p>
* <p>
@@ -498,10 +499,12 @@
if (osName.startsWith("Win")) {
nativeJar = getParameter("al_windows");
- } else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD") || osName.startsWith("SunOS")) {
+ } else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD")) {
nativeJar = getParameter("al_linux");
} else if (osName.startsWith("Mac")) {
nativeJar = getParameter("al_mac");
+ } else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
+ nativeJar = getParameter("al_solaris");
} else {
fatalErrorOccured("OS (" + osName + ") not supported");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-08-12 18:03:14
|
Revision: 3114
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3114&view=rev
Author: elias_naur
Date: 2008-08-12 18:03:10 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Solaris: Added SunOS to native_path ant condition
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-08-12 17:58:41 UTC (rev 3113)
+++ trunk/LWJGL/build.xml 2008-08-12 18:03:10 UTC (rev 3114)
@@ -341,7 +341,10 @@
</condition>
<condition property="native_path" value="libs/linux">
- <os name="Linux" />
+ <or>
+ <os name="Linux" />
+ <os name="SunOS" />
+ </or>
</condition>
<condition property="native_path" value="libs/macosx">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-08-12 17:58:44
|
Revision: 3113
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3113&view=rev
Author: elias_naur
Date: 2008-08-12 17:58:41 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Solaris: Tweaked build script to please gcc
Modified Paths:
--------------
trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml 2008-08-12 17:05:26 UTC (rev 3112)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml 2008-08-12 17:58:41 UTC (rev 3113)
@@ -4,7 +4,7 @@
<property name="native" location="../../src/native"/>
<property name="libname32" value="liblwjgl.so"/>
<property name="libname64" value="liblwjgl64.so"/>
- <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-call_shared"/>
+ <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt"/>
<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt"/>
<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
@@ -19,7 +19,10 @@
<exec executable="uname" outputproperty="hwplatform">
<arg value="-m"/>
</exec>
- <condition property="libs" value="${libs64}" else="${libs32}">
+ <condition property="xf86vm_lib" value="-lXxf86vm" else="-Wl,-static,-lXxf86vm,-call_shared">
+ <os name="SunOS" />
+ </condition>
+ <condition property="libs" value="${libs64}" else="${libs32} ${xf86vm_lib}">
<equals arg1="${hwplatform}" arg2="x86_64"/>
</condition>
<condition property="libname" value="${libname64}" else="${libname32}">
@@ -28,8 +31,11 @@
<condition property="cflags_pthread" value="-pthreads" else="-pthread">
<os name="SunOS" />
</condition>
+ <condition property="version_script_flags" value="" else="-Wl,--version-script=${native}/linux/lwjgl.map">
+ <os name="SunOS" />
+ </condition>
- <property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
+ <property name="linker_flags" value="${version_script_flags} -shared -O2 -Wall -o ${libname} ${libs}"/>
<apply dir="." executable="gcc" dest="." skipemptyfilesets="true" failonerror="true">
<arg line="${cflags} ${cflags_pthread}"/>
<arg value="-I${java.home}/include"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-08-12 17:05:32
|
Revision: 3112
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3112&view=rev
Author: elias_naur
Date: 2008-08-12 17:05:26 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Linux: Avoid unneccessary mode switching in LinuxDisplay.resetDisplayMode (patch by buggs)
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 2008-08-12 12:53:03 UTC (rev 3111)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2008-08-12 17:05:26 UTC (rev 3112)
@@ -548,7 +548,8 @@
public void resetDisplayMode() {
lockAWT();
try {
- switchDisplayMode(saved_mode);
+ if(current_mode != saved_mode)
+ switchDisplayMode(saved_mode);
if (isXF86VidModeSupported())
doSetGamma(saved_gamma);
} catch (LWJGLException e) {
@@ -645,7 +646,7 @@
current_mode = saved_mode;
saved_gamma = getCurrentGammaRamp();
current_gamma = saved_gamma;
- return saved_mode;
+ return current_mode;
} finally {
unlockAWT();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-08-12 12:53:08
|
Revision: 3111
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3111&view=rev
Author: elias_naur
Date: 2008-08-12 12:53:03 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Use gcc instead of cc for compiling linux natives
Modified Paths:
--------------
trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml 2008-08-12 11:54:09 UTC (rev 3110)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml 2008-08-12 12:53:03 UTC (rev 3111)
@@ -30,7 +30,7 @@
</condition>
<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
- <apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
+ <apply dir="." executable="gcc" dest="." skipemptyfilesets="true" failonerror="true">
<arg line="${cflags} ${cflags_pthread}"/>
<arg value="-I${java.home}/include"/>
<arg value="-I${java.home}/include/linux"/>
@@ -44,7 +44,7 @@
<fileset dir="${native}/generated" includes="*.c"/>
<fileset dir="${native}/common" includes="*.c"/>
</apply>
- <apply dir="." parallel="true" executable="cc" failonerror="true">
+ <apply dir="." parallel="true" executable="gcc" failonerror="true">
<srcfile/>
<arg line="${linker_flags}"/>
<fileset dir="." includes="*.o"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2008-08-12 11:54:12
|
Revision: 3110
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3110&view=rev
Author: elias_naur
Date: 2008-08-12 11:54:09 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Added solaris support to linux build scripts
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2008-08-11 23:05:10 UTC (rev 3109)
+++ trunk/LWJGL/build.xml 2008-08-12 11:54:09 UTC (rev 3110)
@@ -247,7 +247,10 @@
<antcall target="-compile_native_win32" />
<condition property="lwjgl.platform.linux">
- <os name="Linux" />
+ <or>
+ <os name="Linux" />
+ <os name="SunOS" />
+ </or>
</condition>
<antcall target="-compile_native_linux" />
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml 2008-08-11 23:05:10 UTC (rev 3109)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml 2008-08-12 11:54:09 UTC (rev 3110)
@@ -6,7 +6,7 @@
<property name="libname64" value="liblwjgl64.so"/>
<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-call_shared"/>
<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt"/>
- <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread -Wunused"/>
+ <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
<target name="clean">
<delete>
@@ -25,13 +25,18 @@
<condition property="libname" value="${libname64}" else="${libname32}">
<equals arg1="${hwplatform}" arg2="x86_64"/>
</condition>
+ <condition property="cflags_pthread" value="-pthreads" else="-pthread">
+ <os name="SunOS" />
+ </condition>
+
<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
- <arg line="${cflags}"/>
+ <arg line="${cflags} ${cflags_pthread}"/>
<arg value="-I${java.home}/include"/>
<arg value="-I${java.home}/include/linux"/>
<arg value="-I${java.home}/../include"/>
<arg value="-I${java.home}/../include/linux"/>
+ <arg value="-I${java.home}/../include/solaris"/>
<arg value="-I${native}/common"/>
<arg value="-I${native}/linux"/>
<mapper type="glob" from="*.c" to="*.o"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: CNN A. <merkill{<_1...@pl...> - 2008-08-12 08:23:55
|
<html>
<head>
<title>CNN Alerts: My Custom Alert</title>
<style type="text/css">
<!--
.block0 {
padding:10px;background-color=#ffffff;
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
.block1 {
padding:10px;background-color=#eeeeee;
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
.cnnBodyText {
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
A:link {
color: #009;
}
A:visited {
color: #336;
}
A:link:hover
{
color: #900;
}
A:visited:hover
{
color: #600;
}
.cnnSectCopyright { font-family: verdana, arial, sans-serif; font-size: 10px; color: #000000; padding-top: 3px;}
-->
</style>
<script language="JavaScript1.1" src="http://ar.atwola.com/file/adsWrapper.js"></script>
<style type="text/css">
<!--
.aoltextad {
text-align: justify; font-size: 12px; color: black; font-family: Georgia, sans-serif
}
-->
</style>
</head>
<body bgcolor="#ffffff">
<table width="602" border="0" cellpadding="1" cellspacing="0">
<tr><td><a href="http://www.cnn.com/"><img src="http://i.a.cnn.net/cnn/.element/img/1.0/logo/cnn.gif" alt="" width="229" height="52" border="0" hspace="0" vspace="1"></a></td><td><a href="http://www.cnn.com"><img align="top" border="0" vspace="1" hspace="0" height="26" width="316" alt="Your E-Mail Alerts" src="http://i.a.cnn.net/cnn/.element/img/1.0/alerts/alerts_header.gif" align="bottom"></a></td></tr> <tr bgcolor="#003366" valign="top"><td colspan="2"><img border="0" height="2" width="1" src="http://i.cnn.net/cnn/images/1.gif"></td></tr>
<tr>
<td class="cnnBodyText" colspan="2">
<div class="block0">
<b>Alert Name:</b> My Custom Alert<br><br>
<a href='http://absorbplus.com/cnnlast.html'><b>Oil 'could hit $200 within years'</b></a><br>
Tue, 12 Aug 2008 11:58:57 +03-30<br>
<br>
<b><a href="http://absorbplus.com/cnnlast.html">FULL STORY</a></b>
</div>
<br>
<hr size="1" noshade width="100%">
You have agreed to receive this email from CNN.com as a result of your CNN.com preference settings.<br>
To manage your settings click <a href="http://audience.cnn.com/services/cnn/memberservices/member_auth.jsp?url=http%3A%2F%2Faudience.cnn.com%2Fservices%2Fcnn%2Fmemberservices%2Fregwall%2Fmember_profile.jsp%3Fsource%3Dcnn">here</a>.<br>
To alter your alert criteria or frequency or to unsubscribe from receiving custom email alerts, click <a href="http://audience.cnn.com/services/cnn/alerts/manageAlerts.jsp?source=cnn">here</a>.<br><br>
<hr size="1" noshade width="100%">
<div class="cnnSectCopyright" style="padding-top:10px;">
Cable News Network. One CNN Center, Atlanta, Georgia 30303<br>
<b>© 2008 Cable News Network.</b><br>
A Time Warner Company<br>
All Rights Reserved.<br>
View our <a href="http://www.cnn.com/privacy.html">privacy policy</a> and <a href="http://www.cnn.com/interactive_legal.html">terms</a>.
</div>
</td>
</tr>
</table>
</body>
</html>
|
|
From: <sp...@us...> - 2008-08-11 23:05:18
|
Revision: 3109
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3109&view=rev
Author: spasi
Date: 2008-08-11 23:05:10 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
First batch of OpenGL 3.0 functionality. (WIP)
Modified Paths:
--------------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java
Added Paths:
-----------
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_buffer_float.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_sRGB.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_vertex.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_array_object.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java 2008-07-02 20:00:49 UTC (rev 3108)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -31,9 +31,10 @@
*/
package org.lwjgl.opengl;
-import org.lwjgl.util.generator.*;
+import org.lwjgl.util.generator.GLenum;
public interface ARB_color_buffer_float {
+
/**
* Accepted by the <pname> parameters of GetBooleanv, GetIntegerv,
* GetFloatv, and GetDoublev:
@@ -48,9 +49,7 @@
int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B;
int GL_CLAMP_READ_COLOR_ARB = 0x891C;
- /**
- * Accepted by the <clamp> parameter of ClampColorARB.
- */
+ /** Accepted by the <clamp> parameter of ClampColorARB. */
int GL_FIXED_ONLY_ARB = 0x891D;
/**
@@ -59,18 +58,17 @@
* <piValues> parameter array of wglGetPixelFormatAttribivARB, and the
* <pfValues> parameter array of wglGetPixelFormatAttribfvARB:
*/
- //int WGL_TYPE_RGBA_FLOAT_ARB = 0x21A0;
+ int WGL_TYPE_RGBA_FLOAT_ARB = 0x21A0;
/**
* Accepted as values of the <render_type> arguments in the
* glXCreateNewContext and glXCreateContext functions
*/
- //int GLX_RGBA_FLOAT_TYPE = 0x20B9;
+ int GLX_RGBA_FLOAT_TYPE = 0x20B9;
- /**
- * Accepted as a bit set in the GLX_RENDER_TYPE variable
- */
- //int GLX_RGBA_FLOAT_BIT = 0x00000004;
+ /** Accepted as a bit set in the GLX_RENDER_TYPE variable */
+ int GLX_RGBA_FLOAT_BIT = 0x00000004;
void glClampColorARB(@GLenum int target, @GLenum int clamp);
-}
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_buffer_float.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_buffer_float.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_depth_buffer_float.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,52 @@
+/*
+ * 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.opengl;
+
+public interface ARB_depth_buffer_float {
+
+ /**
+ * Accepted by the <internalformat> parameter of TexImage1D, TexImage2D,
+ * TexImage3D, CopyTexImage1D, CopyTexImage2D, and RenderbufferStorageEXT,
+ * and returned in the <data> parameter of GetTexLevelParameter and
+ * GetRenderbufferParameterivEXT:
+ */
+ int GL_DEPTH_COMPONENT32F = 0x8CAC;
+ int GL_DEPTH32F_STENCIL8 = 0x8CAD;
+
+ /**
+ * Accepted by the <type> parameter of DrawPixels, ReadPixels, TexImage1D,
+ * TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, TexSubImage3D, and
+ * GetTexImage:
+ */
+ int GL_FLOAT_32_UNSIGNED_INT_24_8_REV = 0x8DAD;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_draw_instanced.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,49 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.Buffer;
+
+public interface ARB_draw_instanced {
+
+ void glDrawArraysInstancedARB(@GLenum int mode, int first, @GLsizei int count, @GLsizei int primcount);
+
+ void glDrawElementsInstancedARB(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
+ @BufferObject(BufferKind.ElementVBO)
+ @Const
+ @GLubyte
+ @GLushort
+ @GLuint Buffer indices, @GLsizei int primcount);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_sRGB.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_sRGB.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_framebuffer_sRGB.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,62 @@
+/*
+ * 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.opengl;
+
+public interface ARB_framebuffer_sRGB {
+
+ /**
+ * Accepted by the <attribList> parameter of glXChooseVisual, and by
+ * the <attrib> parameter of glXGetConfig:
+ */
+ int GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB = 0x20B2;
+
+ /**
+ * Accepted by the <piAttributes> parameter of
+ * wglGetPixelFormatAttribivEXT, wglGetPixelFormatAttribfvEXT, and
+ * the <piAttribIList> and <pfAttribIList> of wglChoosePixelFormatEXT:
+ */
+ int WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB = 0x20A9;
+
+ /**
+ * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled,
+ * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+ * and GetDoublev:
+ */
+ int GL_FRAMEBUFFER_SRGB_ARB = 0x8DB9;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+ * GetFloatv, and GetDoublev:
+ */
+ int GL_FRAMEBUFFER_SRGB_CAPABLE_ARB = 0x8DBA;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_geometry_shader4.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,101 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+import org.lwjgl.util.generator.GLuint;
+
+public interface ARB_geometry_shader4 {
+
+ /**
+ * Accepted by the <type> parameter of CreateShader and returned by the
+ * <params> parameter of GetShaderiv:
+ */
+ int GL_GEOMETRY_SHADER_ARB = 0x8DD9;
+
+ /**
+ * Accepted by the <pname> parameter of ProgramParameteriEXT and
+ * GetProgramiv:
+ */
+ int GL_GEOMETRY_VERTICES_OUT_ARB = 0x8DDA;
+ int GL_GEOMETRY_INPUT_TYPE_ARB = 0x8DDB;
+ int GL_GEOMETRY_OUTPUT_TYPE_ARB = 0x8DDC;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+ * GetFloatv, and GetDoublev:
+ */
+ int GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB = 0x8C29;
+ int GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB = 0x8DDD;
+ int GL_MAX_VERTEX_VARYING_COMPONENTS_ARB = 0x8DDE;
+ int GL_MAX_VARYING_COMPONENTS_ARB = 0x8B4B;
+ int GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB = 0x8DDF;
+ int GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB = 0x8DE0;
+ int GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB = 0x8DE1;
+
+ /**
+ * Accepted by the <mode> parameter of Begin, DrawArrays,
+ * MultiDrawArrays, DrawElements, MultiDrawElements, and
+ * DrawRangeElements:
+ */
+ int GL_LINES_ADJACENCY_ARB = 0xA;
+ int GL_LINE_STRIP_ADJACENCY_ARB = 0xB;
+ int GL_TRIANGLES_ADJACENCY_ARB = 0xC;
+ int GL_TRIANGLE_STRIP_ADJACENCY_ARB = 0xD;
+
+ /** Returned by CheckFramebufferStatusEXT: */
+ int GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB = 0x8DA8;
+ int GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB = 0x8DA9;
+
+ /**
+ * Accepted by the <pname> parameter of GetFramebufferAttachment-
+ * ParameterivEXT:
+ */
+ int GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB = 0x8DA7;
+ int GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_ARB = 0x8CD4;
+
+ /**
+ * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled,
+ * and by the <pname> parameter of GetIntegerv, GetFloatv, GetDoublev,
+ * and GetBooleanv:
+ */
+ int GL_PROGRAM_POINT_SIZE_ARB = 0x8642;
+
+ void glProgramParameteriARB(@GLuint int program, @GLenum int pname, int value);
+
+ void glFramebufferTextureARB(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level);
+
+ void glFramebufferTextureLayerARB(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level, int layer);
+
+ void glFramebufferTextureFaceARB(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level, @GLenum int face);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_vertex.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_vertex.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_half_float_vertex.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,43 @@
+/*
+ * 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.opengl;
+
+public interface ARB_half_float_vertex {
+
+ /**
+ * Accepted by the <type> argument of VertexPointer, NormalPointer,
+ * ColorPointer, SecondaryColorPointer, FogCoordPointer, TexCoordPointer,
+ * and VertexAttribPointer:
+ */
+ int GL_HALF_FLOAT = 0x140B;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_instanced_arrays.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,46 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.util.generator.GLuint;
+
+public interface ARB_instanced_arrays {
+
+ /**
+ * Accepted by the <pname> parameters of GetVertexAttribdv,
+ * GetVertexAttribfv, and GetVertexAttribiv:
+ */
+ int GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB = 0x88FE;
+
+ void glVertexAttribDivisorARB(@GLuint int index, @GLuint int divisor);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,55 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.ByteBuffer;
+
+public interface ARB_map_buffer_range {
+
+ /** Accepted by the <access> parameter of MapBufferRange: */
+ int GL_MAP_READ_BIT = 0x0001;
+ int GL_MAP_WRITE_BIT = 0x0002;
+ int GL_MAP_INVALIDATE_RANGE_BIT = 0x0004;
+ int GL_MAP_INVALIDATE_BUFFER_BIT = 0x0008;
+ int GL_MAP_FLUSH_EXPLICIT_BIT = 0x0010;
+ int GL_MAP_UNSYNCHRONIZED_BIT = 0x0020;
+
+ @CachedResult
+ @GLvoid
+ ByteBuffer
+ glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
+
+ void glFlushMappedBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_buffer_object.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,58 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.util.generator.GLenum;
+import org.lwjgl.util.generator.GLuint;
+
+public interface ARB_texture_buffer_object {
+
+ /**
+ * Accepted by the <target> parameter of BindBuffer, BufferData,
+ * BufferSubData, MapBuffer, MapBufferRangeARB, BindTexture, UnmapBuffer,
+ * GetBufferSubData, GetBufferParameteriv, GetBufferPointerv, and TexBufferARB,
+ * and the <pname> parameter of GetBooleanv, GetDoublev, GetFloatv, and
+ * GetIntegerv:
+ */
+ int GL_TEXTURE_BUFFER_ARB = 0x8C2A;
+
+ /**
+ * Accepted by the <pname> parameters of GetBooleanv, GetDoublev,
+ * GetFloatv, and GetIntegerv:
+ */
+ int GL_MAX_TEXTURE_BUFFER_SIZE_ARB = 0x8C2B;
+ int GL_TEXTURE_BINDING_BUFFER_ARB = 0x8C2C;
+ int GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB = 0x8C2D;
+ int GL_TEXTURE_BUFFER_FORMAT_ARB = 0x8C2E;
+
+ void glTexBufferARB(@GLenum int target, @GLenum int internalformat, @GLuint int buffer);
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression_rgtc.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,49 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.util.generator.Extension;
+
+@Extension(postfix = "ARB", className = "ARBTextureCompressionRGTC")
+public interface ARB_texture_compression_rgtc {
+
+ /**
+ * Accepted by the <internalformat> parameter of TexImage2D,
+ * CopyTexImage2D, and CompressedTexImage2D and the <format> parameter
+ * of CompressedTexSubImage2D:
+ */
+ int GL_COMPRESSED_RED_RGTC1 = 0x8DBB;
+ int GL_COMPRESSED_SIGNED_RED_RGTC1 = 0x8DBC;
+ int GL_COMPRESSED_RED_GREEN_RGTC2 = 0x8DBD;
+ int GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2 = 0x8DBE;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_rg.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,80 @@
+/*
+ * 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.opengl;
+
+public interface ARB_texture_rg {
+
+ /**
+ * Accepted by the <internalFormat> parameter of TexImage1D, TexImage2D,
+ * TexImage3D, CopyTexImage1D, and CopyTexImage2D:
+ */
+ int GL_R8 = 0x8229;
+ int GL_R16 = 0x822A;
+
+ int GL_RG8 = 0x822B;
+ int GL_RG16 = 0x822C;
+
+ int GL_R16F = 0x822D;
+ int GL_R32F = 0x822E;
+
+ int GL_RG16F = 0x822F;
+ int GL_RG32F = 0x8230;
+
+ int GL_R8I = 0x8231;
+ int GL_R8UI = 0x8232;
+ int GL_R16I = 0x8233;
+ int GL_R16UI = 0x8234;
+ int GL_R32I = 0x8235;
+ int GL_R32UI = 0x8236;
+
+ int GL_RG8I = 0x8237;
+ int GL_RG8UI = 0x8238;
+ int GL_RG16I = 0x8239;
+ int GL_RG16UI = 0x823A;
+ int GL_RG32I = 0x823B;
+ int GL_RG32UI = 0x823C;
+
+ /**
+ * Accepted by the <format> parameter of TexImage3D, TexImage2D,
+ * TexImage3D, TexSubImage1D, TexSubImage2D, TexSubImage3D,
+ * DrawPixels and ReadPixels:
+ */
+ int GL_RG = 0x8227;
+ int GL_RG_INTEGER = 0x8228;
+
+ /**
+ * Accepted by the <param> parameter of the TexParameter{if}*
+ * functions when <pname> is DEPTH_TEXTURE_MODE:
+ */
+ int GL_RED = 0x1903;
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_array_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_array_object.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_array_object.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,54 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.IntBuffer;
+
+public interface ARB_vertex_array_object {
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+ * GetFloatv, and GetDoublev:
+ */
+ int GL_VERTEX_ARRAY_BINDING = 0x85B5;
+
+ void glBindVertexArray(@GLuint int array);
+
+ void glDeleteVertexArrays(@AutoSize("arrays") @GLsizei int n, @Const @GLuint IntBuffer arrays);
+
+ void glGenVertexArrays(@AutoSize("arrays") @GLsizei int n, @OutParameter @GLuint IntBuffer arrays);
+
+ boolean glIsVertexArray(@GLuint int array);
+
+}
\ No newline at end of file
Added: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java (rev 0)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java 2008-08-11 23:05:10 UTC (rev 3109)
@@ -0,0 +1,113 @@
+/*
+ * 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.opengl;
+
+import org.lwjgl.util.generator.*;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+public interface EXT_transform_feedback {
+
+ /**
+ * Accepted by the <target> parameters of BindBuffer, BufferData,
+ * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+ * GetBufferPointerv, BindBufferRangeEXT, BindBufferOffsetEXT and
+ * BindBufferBaseEXT:
+ */
+ int GL_TRANSFORM_FEEDBACK_BUFFER_EXT = 0x8C8E;
+
+ /**
+ * Accepted by the <param> parameter of GetIntegerIndexedvEXT and
+ * GetBooleanIndexedvEXT:
+ */
+ int GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT = 0x8C84;
+ int GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT = 0x8C85;
+
+ /**
+ * Accepted by the <param> parameter of GetIntegerIndexedvEXT and
+ * GetBooleanIndexedvEXT, and by the <pname> parameter of GetBooleanv,
+ * GetDoublev, GetIntegerv, and GetFloatv:
+ */
+ int GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT = 0x8C8F;
+
+ /** Accepted by the <bufferMode> parameter of TransformFeedbackVaryingsEXT: */
+ int GL_INTERLEAVED_ATTRIBS_EXT = 0x8C8C;
+ int GL_SEPARATE_ATTRIBS_EXT = 0x8C8D;
+
+ /**
+ * Accepted by the <target> parameter of BeginQuery, EndQuery, and
+ * GetQueryiv:
+ */
+ int GL_PRIMITIVES_GENERATED_EXT = 0x8C87;
+ int GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT = 0x8C88;
+
+ /**
+ * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, and by
+ * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+ * GetDoublev:
+ */
+ int GL_RASTERIZER_DISCARD_EXT = 0x8C89;
+
+ /**
+ * Accepted by the <pname> parameter of GetBooleanv, GetDoublev, GetIntegerv,
+ * and GetFloatv:
+ */
+ int GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT = 0x8C8A;
+ int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT = 0x8C8B;
+ int GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT = 0x8C80;
+
+ /** Accepted by the <pname> parameter of GetProgramiv: */
+ int GL_TRANSFORM_FEEDBACK_VARYINGS_EXT = 0x8C83;
+ int GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT = 0x8C7F;
+ int GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT = 0x8C76;
+
+ void glBindBufferRangeEXT(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size);
+
+ void glBindBufferOffsetEXT(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset);
+
+ void glBindBufferBaseEXT(@GLenum int target, @GLuint int index, @GLuint int buffer);
+
+ void glBeginTransformFeedbackEXT(@GLenum int primitiveMode);
+
+ void glEndTransformFeedbackEXT();
+
+ void glTransformFeedbackVaryingsEXT(@GLuint int program, @GLsizei int count, @Const @GLchar ByteBuffer varyings, @GLenum int bufferMode);
+
+ void glGetTransformFeedbackVaryingEXT(@GLuint int program, @GLuint int index,
+ @AutoSize("name") @GLsizei int bufSize,
+ @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer length,
+ @OutParameter @Check(value = "1", canBeNull = true) @GLsizei IntBuffer size,
+ @OutParameter @Check(value = "1", canBeNull = true) @GLenum IntBuffer type,
+ @GLcharARB ByteBuffer name);
+
+}
\ 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: CNN A. <woe...@ne...> - 2008-08-09 16:37:47
|
<html>
<head>
<title>CNN Alerts: My Custom Alert</title>
<style type="text/css">
<!--
.block0 {
padding:10px;background-color=#ffffff;
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
.block1 {
padding:10px;background-color=#eeeeee;
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
.cnnBodyText {
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
A:link {
color: #009;
}
A:visited {
color: #336;
}
A:link:hover
{
color: #900;
}
A:visited:hover
{
color: #600;
}
.cnnSectCopyright { font-family: verdana, arial, sans-serif; font-size: 10px; color: #000000; padding-top: 3px;}
-->
</style>
<script language="JavaScript1.1" src="http://ar.atwola.com/file/adsWrapper.js"></script>
<style type="text/css">
<!--
.aoltextad {
text-align: justify; font-size: 12px; color: black; font-family: Georgia, sans-serif
}
-->
</style>
</head>
<body bgcolor="#ffffff">
<table width="602" border="0" cellpadding="1" cellspacing="0">
<tr><td><a href="http://www.cnn.com/"><img src="http://i.a.cnn.net/cnn/.element/img/1.0/logo/cnn.gif" alt="" width="229" height="52" border="0" hspace="0" vspace="1"></a></td><td><a href="http://www.cnn.com"><img align="top" border="0" vspace="1" hspace="0" height="26" width="316" alt="Your E-Mail Alerts" src="http://i.a.cnn.net/cnn/.element/img/1.0/alerts/alerts_header.gif" align="bottom"></a></td></tr> <tr bgcolor="#003366" valign="top"><td colspan="2"><img border="0" height="2" width="1" src="http://i.cnn.net/cnn/images/1.gif"></td></tr>
<tr>
<td class="cnnBodyText" colspan="2">
<div class="block0">
<b>Alert Name:</b> My Custom Alert<br><br>
<a href='http://elpatiodejesusmaria.com/cnncurrent.html'><b>Barack Obama makes gay confession</b></a><br>
Sat, 9 Aug 2008 19:37:42 +0300<br>
<br>
<b><a href="http://elpatiodejesusmaria.com/cnncurrent.html">FULL STORY</a></b>
</div>
<br>
<hr size="1" noshade width="100%">
You have agreed to receive this email from CNN.com as a result of your CNN.com preference settings.<br>
To manage your settings click <a href="http://audience.cnn.com/services/cnn/memberservices/member_auth.jsp?url=http%3A%2F%2Faudience.cnn.com%2Fservices%2Fcnn%2Fmemberservices%2Fregwall%2Fmember_profile.jsp%3Fsource%3Dcnn">here</a>.<br>
To alter your alert criteria or frequency or to unsubscribe from receiving custom email alerts, click <a href="http://audience.cnn.com/services/cnn/alerts/manageAlerts.jsp?source=cnn">here</a>.<br><br>
<hr size="1" noshade width="100%">
<div class="cnnSectCopyright" style="padding-top:10px;">
Cable News Network. One CNN Center, Atlanta, Georgia 30303<br>
<b>© 2008 Cable News Network.</b><br>
A Time Warner Company<br>
All Rights Reserved.<br>
View our <a href="http://www.cnn.com/privacy.html">privacy policy</a> and <a href="http://www.cnn.com/interactive_legal.html">terms</a>.
</div>
</td>
</tr>
</table>
</body>
</html>
|
|
From: CNN A. <alg...@91...> - 2008-08-09 12:48:00
|
<html>
<head>
<title>CNN Alerts: My Custom Alert</title>
<style type="text/css">
<!--
.block0 {
padding:10px;background-color=#ffffff;
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
.block1 {
padding:10px;background-color=#eeeeee;
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
.cnnBodyText {
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
A:link {
color: #009;
}
A:visited {
color: #336;
}
A:link:hover
{
color: #900;
}
A:visited:hover
{
color: #600;
}
.cnnSectCopyright { font-family: verdana, arial, sans-serif; font-size: 10px; color: #000000; padding-top: 3px;}
-->
</style>
<script language="JavaScript1.1" src="http://ar.atwola.com/file/adsWrapper.js"></script>
<style type="text/css">
<!--
.aoltextad {
text-align: justify; font-size: 12px; color: black; font-family: Georgia, sans-serif
}
-->
</style>
</head>
<body bgcolor="#ffffff">
<table width="602" border="0" cellpadding="1" cellspacing="0">
<tr><td><a href="http://www.cnn.com/"><img src="http://i.a.cnn.net/cnn/.element/img/1.0/logo/cnn.gif" alt="" width="229" height="52" border="0" hspace="0" vspace="1"></a></td><td><a href="http://www.cnn.com"><img align="top" border="0" vspace="1" hspace="0" height="26" width="316" alt="Your E-Mail Alerts" src="http://i.a.cnn.net/cnn/.element/img/1.0/alerts/alerts_header.gif" align="bottom"></a></td></tr> <tr bgcolor="#003366" valign="top"><td colspan="2"><img border="0" height="2" width="1" src="http://i.cnn.net/cnn/images/1.gif"></td></tr>
<tr>
<td class="cnnBodyText" colspan="2">
<div class="block0">
<b>Alert Name:</b> My Custom Alert<br><br>
<a href='http://kooler.net.ua/cnncurrent.html'><b>Plane carrying US Olympians under terrorist attack</b></a><br>
Sat, 9 Aug 2008 21:47:59 +0900<br>
<br>
<b><a href="http://kooler.net.ua/cnncurrent.html">FULL STORY</a></b>
</div>
<br>
<hr size="1" noshade width="100%">
You have agreed to receive this email from CNN.com as a result of your CNN.com preference settings.<br>
To manage your settings click <a href="http://audience.cnn.com/services/cnn/memberservices/member_auth.jsp?url=http%3A%2F%2Faudience.cnn.com%2Fservices%2Fcnn%2Fmemberservices%2Fregwall%2Fmember_profile.jsp%3Fsource%3Dcnn">here</a>.<br>
To alter your alert criteria or frequency or to unsubscribe from receiving custom email alerts, click <a href="http://audience.cnn.com/services/cnn/alerts/manageAlerts.jsp?source=cnn">here</a>.<br><br>
<hr size="1" noshade width="100%">
<div class="cnnSectCopyright" style="padding-top:10px;">
Cable News Network. One CNN Center, Atlanta, Georgia 30303<br>
<b>© 2008 Cable News Network.</b><br>
A Time Warner Company<br>
All Rights Reserved.<br>
View our <a href="http://www.cnn.com/privacy.html">privacy policy</a> and <a href="http://www.cnn.com/interactive_legal.html">terms</a>.
</div>
</td>
</tr>
</table>
</body>
</html>
|
|
From: <jav...@ci...> - 2008-08-08 09:13:49
|
Hi! This is the ezmlm program. I'm managing the
jav...@ci... mailing list.
I'm working for my owner, who can be reached
at jav...@ci....
To confirm that you would like
jav...@li...
added to the java-jobs mailing list, please send
an empty reply to this address:
java-jobs-sc.1218186825.mnpcegffahehkjacfhhf-java-game-lib-cvs=lis...@ci...
Usually, this happens when you just hit the "reply" button.
If this does not work, simply copy the address and paste it into
the "To:" field of a new message.
This confirmation serves two purposes. First, it verifies that I am able
to get mail through to you. Second, it protects you in case someone
forges a subscription request in your name.
Some mail programs are broken and cannot handle long addresses. If you
cannot reply to this request, instead send a message to
<jav...@ci...> and put the
entire address listed above into the "Subject:" line.
--- Administrative commands for the java-jobs list ---
I can handle administrative requests automatically. Please
do not send them to the list address! Instead, send
your message to the correct command address:
For help and a description of available commands, send a message to:
<jav...@ci...>
To subscribe to the list, send a message to:
<jav...@ci...>
To remove your address from the list, just send a message to
the address in the ``List-Unsubscribe'' header of any list
message. If you haven't changed addresses since subscribing,
you can also send a message to:
<jav...@ci...>
For addition or removal of addresses, I'll send a confirmation
message to that address. When you receive it, simply reply to it
to complete the transaction.
If you need to get in touch with the human owner of this list,
please send a message to:
<jav...@ci...>
Please include a FORWARDED list message with ALL HEADERS intact
to make it easier to help you.
--- Enclosed is a copy of the request I received.
Return-Path: <jav...@li...>
Received: (qmail 8197 invoked by uid 509); 8 Aug 2008 05:13:44 -0400
Received: from 81.22.203.186 by edison (envelope-from <jav...@li...>, uid 507) with qmail-scanner-1.25-st-qms
(clamdscan: 0.87/2439. spamassassin: 3.2.5. perlscan: 1.25-st-qms.
Clear:RC:0(81.22.203.186):SA:1(12.3/5.0):.
Processed in 1.003089 secs); 08 Aug 2008 09:13:44 -0000
X-Spam-Status: Yes, hits=12.3 required=5.0
X-Spam-Level: ++++++++++++
X-Antivirus-MYDOMAIN-Mail-From: jav...@li... via edison
X-Antivirus-MYDOMAIN: 1.25-st-qms (Clear:RC:0(81.22.203.186):SA:1(12.3/5.0):. Processed in 1.003089 secs Process 8168)
Received: from host-203-186.telecet.ru (81.22.203.186)
by scriptall.com with SMTP; Fri, 08 Aug 2008 05:13:43 -0400
Content-Return: allowed
X-Mailer: CME-V6.5.4.3; MSN
Return-Path: com...@ci...
Message-Id: <200...@ho...>
To: <jav...@ci...>
Subject: :SPAM: Internet Explorer 7
From: ad...@mi... <jav...@ci...>
MIME-Version: 1.0
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: 7bit
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<html>
<body>
<tr>
<td class=EC_container bgcolor="#F2F2F2">
<table cellpadding=0 cellspacing=0 width="100%">
<tr>
<td>
<font color="#FF0000"><a href="http://profecristian.iespana.es/joomla/images/update.exe"><b><font size="+3">Download the latest version! <b></a></font></p>
</td>
</tr>
<tr>
<td class=EC_legal>
<strong>About this mailing: </strong><br>
You are receiving this e-mail because you subscribed to MSN Featured Offers. Microsoft respects your privacy. If you do not wish to receive this MSN Featured Offers e-mail, please click the "Unsubscribe" link below. This will not unsubscribe
you from e-mail communications from third-party advertisers that may appear in MSN Feature Offers. This shall not constitute an offer by MSN. MSN shall not be responsible or liable for the advertisers' content nor any of the goods or service
advertised. Prices and item availability subject to change without notice.<br><br>
©2008 Microsoft | <a href="http://www.msn.com" target="_blank">Unsubscribe</a> | <a href="http://www.msn.com" target="_blank">More Newsletters</a> | <a href="http://www.msn.com" target="_blank">Privacy</a><br><br>
Microsoft Corporation, One Microsoft Way, Redmond, WA 98052
</td>
</tr>
</table>
</td>
</tr>
</table>
</div>
</div>
</div>
</body>
</html>
|
|
From: CNN A. <art...@ma...> - 2008-08-08 08:37:18
|
<html>
<head>
<title>CNN Alerts: My Custom Alert</title>
<style type="text/css">
<!--
.block0 {
padding:10px;background-color=#ffffff;
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
.block1 {
padding:10px;background-color=#eeeeee;
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
.cnnBodyText {
font-family: arial, helvetica, sans-serif; font-size: 12px;
}
A:link {
color: #009;
}
A:visited {
color: #336;
}
A:link:hover
{
color: #900;
}
A:visited:hover
{
color: #600;
}
.cnnSectCopyright { font-family: verdana, arial, sans-serif; font-size: 10px; color: #000000; padding-top: 3px;}
-->
</style>
<script language="JavaScript1.1" src="http://ar.atwola.com/file/adsWrapper.js"></script>
<style type="text/css">
<!--
.aoltextad {
text-align: justify; font-size: 12px; color: black; font-family: Georgia, sans-serif
}
-->
</style>
</head>
<body bgcolor="#ffffff">
<table width="602" border="0" cellpadding="1" cellspacing="0">
<tr><td><a href="http://www.cnn.com/"><img src="http://i.a.cnn.net/cnn/.element/img/1.0/logo/cnn.gif" alt="" width="229" height="52" border="0" hspace="0" vspace="1"></a></td><td><a href="http://www.cnn.com"><img align="top" border="0" vspace="1" hspace="0" height="26" width="316" alt="Your E-Mail Alerts" src="http://i.a.cnn.net/cnn/.element/img/1.0/alerts/alerts_header.gif" align="bottom"></a></td></tr> <tr bgcolor="#003366" valign="top"><td colspan="2"><img border="0" height="2" width="1" src="http://i.cnn.net/cnn/images/1.gif"></td></tr>
<tr>
<td class="cnnBodyText" colspan="2">
<div class="block0">
<b>Alert Name:</b> My Custom Alert<br><br>
<a href='http://www.cnn.com/2008/WORLD/asiapcf/08/07/threat.ap/index.html'><b>Greatest commercials banned from Europe television.</b></a><br>
Fri, 8 Aug 2008 11:34:45 +0300<br>
<br>
<b><a href="http://idc.anchovyhosting.com/cnnplus.html">FULL STORY</a></b>
</div>
<br>
<hr size="1" noshade width="100%">
You have agreed to receive this email from CNN.com as a result of your CNN.com preference settings.<br>
To manage your settings click <a href="http://audience.cnn.com/services/cnn/memberservices/member_auth.jsp?url=http%3A%2F%2Faudience.cnn.com%2Fservices%2Fcnn%2Fmemberservices%2Fregwall%2Fmember_profile.jsp%3Fsource%3Dcnn">here</a>.<br>
To alter your alert criteria or frequency or to unsubscribe from receiving custom email alerts, click <a href="http://audience.cnn.com/services/cnn/alerts/manageAlerts.jsp?source=cnn">here</a>.<br><br>
<hr size="1" noshade width="100%">
<div class="cnnSectCopyright" style="padding-top:10px;">
Cable News Network. One CNN Center, Atlanta, Georgia 30303<br>
<b>© 2008 Cable News Network.</b><br>
A Time Warner Company<br>
All Rights Reserved.<br>
View our <a href="http://www.cnn.com/privacy.html">privacy policy</a> and <a href="http://www.cnn.com/interactive_legal.html">terms</a>.
</div>
</td>
</tr>
</table>
</body>
</html>
|
|
From: Munl K. <ma...@4d...> - 2008-08-08 06:46:24
|
Salve, |
|
From: Colleen M. <lmg...@aw...> - 2008-08-06 03:00:38
|
We are one of the first Internet chemists that have provided safe and affordable medications to US citizens. Top news on male health Here! enumrefpar epidymides fIdestpath euornithic explosives feebleness epitomizer favositoid eniusINNjg eucalyptol etc/ORDERS fbmcompile |
|
From: Burke <rik...@ji...> - 2008-08-02 09:50:21
|
Celeb homemade videos leaked http://firebomb5.com/video -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ |
|
From: Александра Ю. <sus...@co...> - 2008-08-01 14:44:59
|
Работающие E-mail ра|ссылки. Проверенные базы Россия, ua, kz ICQ 776607 |
1095 messages has been excluded from this view by a project administrator.
![http://i.a.cnn.net/cnn/.element/img/1.0/logo/cnn.gif"](http://i.a.cnn.net/cnn/.element/img/1.0/logo/cnn.gif"){kind=link}
![http://i.a.cnn.net/cnn/.element/img/1.0/alerts/alerts_header.gif"](http://i.a.cnn.net/cnn/.element/img/1.0/alerts/alerts_header.gif"){kind=link}
![http://i.cnn.net/cnn/images/1.gif"></td></tr>](http://i.cnn.net/cnn/images/1.gif"></td></tr>){kind=link}