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

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

Revision: 2938
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2938&view=rev
Author:   elias_naur
Date:     2008-01-21 12:28:53 -0800 (Mon, 21 Jan 2008)

Log Message:
-----------
Moved translation of ogl error codes from GLU to Util, to prepare for glu to be moved to lwjgl_utils

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java	2008-01-21 20:21:21 UTC (rev 2937)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java	2008-01-21 20:28:53 UTC (rev 2938)
@@ -43,11 +43,43 @@
 	/** No c'tor */
 	private Util() {
 	}
-
-	public static void checkGLError() {
+	
+	/**
+	 * Throws OpenGLException if GL11.glGetError() returns anything else than GL11.GL_NO_ERROR
+	 *
+	 */
+	public static void checkGLError() throws OpenGLException {
 		int err = GL11.glGetError();
 		if ( err != GL11.GL_NO_ERROR ) {
 			throw new OpenGLException(err);
 		}
 	}
+
+	/**
+	 * Translate a GL error code to a String describing the error
+	 */
+	public static String translateGLErrorString(int error_code) {
+		switch (error_code) {
+			case GL11.GL_NO_ERROR:
+				return "No error";
+			case GL11.GL_INVALID_ENUM:
+				return "Invalid enum";
+			case GL11.GL_INVALID_VALUE:
+				return "Invalid value";
+			case GL11.GL_INVALID_OPERATION:
+				return "Invalid operation";
+			case GL11.GL_STACK_OVERFLOW:
+				return "Stack overflow";
+			case GL11.GL_STACK_UNDERFLOW:
+				return "Stack underflow";
+			case GL11.GL_OUT_OF_MEMORY:
+				return "Out of memory";
+			case ARBImaging.GL_TABLE_TOO_LARGE:
+				return "Table too large";
+			case EXTFramebufferObject.GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
+				return "Invalid framebuffer operation";
+			default:
+				return null;
+		}
+	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java	2008-01-21 20:21:21 UTC (rev 2937)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java	2008-01-21 20:28:53 UTC (rev 2938)
@@ -36,6 +36,7 @@
 import org.lwjgl.opengl.ARBImaging;
 import org.lwjgl.opengl.EXTFramebufferObject;
 import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.Util;
 
 /**
  * GLU.java
@@ -411,24 +412,6 @@
 
 	public static String gluErrorString(int error_code) {
 		switch (error_code) {
-			case GL11.GL_NO_ERROR:
-				return "No error";
-			case GL11.GL_INVALID_ENUM:
-				return "Invalid enum";
-			case GL11.GL_INVALID_VALUE:
-				return "Invalid value";
-			case GL11.GL_INVALID_OPERATION:
-				return "Invalid operation";
-			case GL11.GL_STACK_OVERFLOW:
-				return "Stack overflow";
-			case GL11.GL_STACK_UNDERFLOW:
-				return "Stack underflow";
-			case GL11.GL_OUT_OF_MEMORY:
-				return "Out of memory";
-			case ARBImaging.GL_TABLE_TOO_LARGE:
-				return "Table too large";
-			case EXTFramebufferObject.GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
-				return "Invalid framebuffer operation";
 			case GLU.GLU_INVALID_ENUM:
 				return "Invalid enum (glu)";
 			case GLU.GLU_INVALID_VALUE:
@@ -436,7 +419,7 @@
 			case GLU.GLU_OUT_OF_MEMORY:
 				return "Out of memory (glu)";
 			default:
-				return null;
+				return Util.translateGLErrorString(error_code);
 		}
 	}
 }


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