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

[<eli...@us...>]

Revision: 2811
          http://svn.sourceforge.net/java-game-lib/?rev=2811&view=rev
Author:   elias_naur
Date:     2007-04-29 12:38:04 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
Removed Util.glGetInteger convenience method since it is not thread safe

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java	2007-04-29 11:06:40 UTC (rev 2810)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java	2007-04-29 19:38:04 UTC (rev 2811)
@@ -43,9 +43,6 @@
  */
 
 public final class Util {
-
-	private static final IntBuffer int_buffer = BufferUtils.createIntBuffer(16);
-
 	/** No c'tor */
 	private Util() {
 	}
@@ -56,16 +53,4 @@
 			throw new OpenGLException(err);
 		}
 	}
-
-	/**
-	 * Obtain a GL integer value from the driver
-	 *
-	 * @param gl_enum The GL value you want
-	 *
-	 * @return the integer value
-	 */
-	public static int glGetInteger(int gl_enum) {
-		GL11.glGetInteger(gl_enum, int_buffer);
-		return int_buffer.get(0);
-	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java	2007-04-29 11:06:40 UTC (rev 2810)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java	2007-04-29 19:38:04 UTC (rev 2811)
@@ -51,6 +51,7 @@
 
 abstract class Shader {
 
+	private static final IntBuffer int_buffer = BufferUtils.createIntBuffer(16);
 	protected static IntBuffer programBuffer = BufferUtils.createIntBuffer(1);
 	protected static ByteBuffer fileBuffer = BufferUtils.createByteBuffer(1024 * 10);
 
@@ -61,6 +62,18 @@
 
 	abstract void cleanup();
 
+	/**
+	 * Obtain a GL integer value from the driver
+	 *
+	 * @param gl_enum The GL value you want
+	 *
+	 * @return the integer value
+	 */
+	public static int glGetInteger(int gl_enum) {
+		GL11.glGetInteger(gl_enum, int_buffer);
+		return int_buffer.get(0);
+	}
+
 	protected static ByteBuffer getShaderText(String file) {
 		ByteBuffer shader = null;
 
@@ -99,7 +112,7 @@
 			final byte[] bytes = new byte[programSource.capacity()];
 			programSource.get(bytes);
 
-			final int errorPos = Util.glGetInteger(ARBProgram.GL_PROGRAM_ERROR_POSITION_ARB);
+			final int errorPos = glGetInteger(ARBProgram.GL_PROGRAM_ERROR_POSITION_ARB);
 			int lineStart = 0;
 			int lineEnd = -1;
 			for ( int i = 0; i < bytes.length; i++ ) {
@@ -185,4 +198,4 @@
 		System.out.println(new String(charArray, 0, logLength));
 	}
 
-}
\ No newline at end of file
+}


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