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

[<sp...@us...>]

Revision: 3610
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3610&view=rev
Author:   spasi
Date:     2011-08-13 17:20:59 +0000 (Sat, 13 Aug 2011)

Log Message:
-----------
Fixed GL42 detection and added an @Optional so that AMD's beta driver works.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL42.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2011-08-10 17:27:49 UTC (rev 3609)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2011-08-13 17:20:59 UTC (rev 3610)
@@ -221,7 +221,7 @@
 			{ 1, 2, 3, 4, 5 },  // OpenGL 1
 			{ 0, 1 },           // OpenGL 2
 			{ 0, 1, 2, 3 },     // OpenGL 3
-			{ 0, 1 },           // OpenGL 4
+			{ 0, 1, 2 },        // OpenGL 4
 		};
 
 		for ( int major = 1; major <= GL_VERSIONS.length; major++ ) {

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL42.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL42.java	2011-08-10 17:27:49 UTC (rev 3609)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL42.java	2011-08-13 17:20:59 UTC (rev 3610)
@@ -127,6 +127,7 @@
 	/** Returned in &lt;params&gt; by GetActiveUniform and GetActiveUniformsiv: */
 	int GL_UNSIGNED_INT_ATOMIC_COUNTER = 0x92DB;
 
+	@Optional(reason = "AMD's beta 4.2 driver (11.8) does not expose this")
 	@StripPostfix("params")
 	void glGetActiveAtomicCounterBufferiv(@GLuint int program, @GLuint int bufferIndex, @GLenum int pname, @Check("1") @OutParameter IntBuffer params);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.