Thread: [Java-game-lib-cvs] SF.net SVN: java-game-lib:[3116] trunk/LWJGL/src

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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 ContextAt...
 
[truncated message content]

Thread: [Java-game-lib-cvs] SF.net SVN: java-game-lib:[3116] trunk/LWJGL/src

java-game-lib-cvs