[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60330] branches/soc-2013-viewport_fx/ source/blender/gpu: added gpuErrorSymbol to go with gpuErrorString

Jason Wilkins Jason.A.Wilkins at gmail.com
Mon Sep 23 14:25:23 CEST 2013


Revision: 60330
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60330
Author:   jwilkins
Date:     2013-09-23 12:25:22 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
added gpuErrorSymbol to go with gpuErrorString

Modified Paths:
--------------
    branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_safety.c
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_utility.c

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h	2013-09-23 12:14:06 UTC (rev 60329)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h	2013-09-23 12:25:22 UTC (rev 60330)
@@ -54,22 +54,18 @@
 #endif
 
 #if GL_GREMEDY_string_marker && GPU_ENABLE_STRING_MARKER
-#define GPU_STRING_MARKER(msg)                   \
-    if (GLEW_GREMEDY_string_marker) {            \
-        glStringMarkerGREMEDY(sizeof(msg), msg); \
-    }
+#define GPU_STRING_MARKER(msg) if (GLEW_GREMEDY_string_marker) glStringMarkerGREMEDY(sizeof(msg), msg)
 #else
-#define GPU_STRING_MARKER(msg) ((void)0)
+#define GPU_STRING_MARKER(msg) do {} while(0)
 #endif
 
 
 
-const char* gpuErrorString(GLenum err);
+const char* gpuErrorString(GLenum err); /* e.g. Invalid Enumeration */
+const char* gpuErrorSymbol(GLenum err); /* e.g. GL_INVALID_ENUM     */
 
 
 
-
-
 #ifdef __cplusplus
 }
 #endif

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_safety.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_safety.c	2013-09-23 12:14:06 UTC (rev 60329)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_safety.c	2013-09-23 12:25:22 UTC (rev 60330)
@@ -54,9 +54,9 @@
 			no_error = GL_FALSE;
 
 			if (text == NULL)
-				fprintf(stderr, "%s(%d): GL Error (0x%04X): %s\n", file, line, code, gpuErrorString(code));
+				fprintf(stderr, "%s(%d): GL Error (0x%04X): %s: %s\n", file, line, code, gpuErrorSymbol(code), gpuErrorString(code));
 			else
-				fprintf(stderr, "%s(%d):[%s] -> GL Error (0x%04X): %s\n", file, line, text, code, gpuErrorString(code));
+				fprintf(stderr, "%s(%d):[%s] -> GL Error (0x%04X): %s\n", file, line, text, code, gpuErrorSymbol(code), gpuErrorString(code));
 		}
 
 		error_count ++;

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_utility.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_utility.c	2013-09-23 12:14:06 UTC (rev 60329)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_utility.c	2013-09-23 12:25:22 UTC (rev 60330)
@@ -40,7 +40,7 @@
 			return "No Error";
 
 		case GL_INVALID_ENUM:
-			return "Invalid Enum";
+			return "Invalid Enumeration";
 
 		case GL_INVALID_VALUE:
 			return "Invalid Value";
@@ -77,3 +77,48 @@
 			return "<unknown error>";
 	}
 }
+
+const char* gpuErrorSymbol(GLenum err)
+{
+	switch(err) {
+		case GL_NO_ERROR:
+			return "GL_NO_ERROR";
+
+		case GL_INVALID_ENUM:
+			return "GL_INVALID_ENUM";
+
+		case GL_INVALID_VALUE:
+			return "GL_INVALID_VALUE";
+
+		case GL_INVALID_OPERATION:
+			return "GL_INVALID_OPERATION";
+
+		case GL_STACK_OVERFLOW:
+			return "GL_STACK_OVERFLOW";
+
+		case GL_STACK_UNDERFLOW:
+			return "GL_STACK_UNDERFLOW";
+
+		case GL_OUT_OF_MEMORY:
+			return "GL_OUT_OF_MEMORY";
+
+#if GL_ARB_imagining
+		case GL_TABLE_TOO_LARGE:
+			return "GL_TABLE_TOO_LARGE";
+#endif
+
+#if defined(WITH_GLU)
+		case GLU_INVALID_ENUM:
+			return "GLU_INVALID_ENUM";
+
+		case GLU_INVALID_VALUE:
+			return "GLU_INVALID_VALUE";
+
+		case GLU_OUT_OF_MEMORY:
+			return "GLU_OUT_OF_MEMORY";
+#endif
+
+		default:
+			return "<unknown error>";
+	}
+}




More information about the Bf-blender-cvs mailing list