From 1d0374643527f502465e8592df5ba1127c58bd32 Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Sat, 13 Aug 2011 17:20:59 +0000 Subject: [PATCH] Fixed GL42 detection and added an @Optional so that AMD's beta driver works. --- src/java/org/lwjgl/opengl/GLContext.java | 2 +- src/templates/org/lwjgl/opengl/GL42.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/org/lwjgl/opengl/GLContext.java b/src/java/org/lwjgl/opengl/GLContext.java index c363b731..e50c9cfe 100644 --- a/src/java/org/lwjgl/opengl/GLContext.java +++ b/src/java/org/lwjgl/opengl/GLContext.java @@ -221,7 +221,7 @@ public final class GLContext { { 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++ ) { diff --git a/src/templates/org/lwjgl/opengl/GL42.java b/src/templates/org/lwjgl/opengl/GL42.java index 6f8e10ee..92c13ccf 100644 --- a/src/templates/org/lwjgl/opengl/GL42.java +++ b/src/templates/org/lwjgl/opengl/GL42.java @@ -127,6 +127,7 @@ public interface GL42 { /** Returned in <params> 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);