[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16538] trunk/blender/source: Added -d debug option for blenderplayer, and remove some

[Brecht Van Lommel]

Revision: 16538
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16538
Author:   blendix
Date:     2008-09-15 14:40:17 +0200 (Mon, 15 Sep 2008)

Log Message:
-----------
Added -d debug option for blenderplayer, and remove some
invalid/unnecessary opengl calls on shader errors.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2008-09-15 11:39:49 UTC (rev 16537)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2008-09-15 12:40:17 UTC (rev 16538)
@@ -706,7 +706,6 @@
 		glGetObjectParameterivARB(shader->vertex, GL_OBJECT_COMPILE_STATUS_ARB, &status);
 
 		if (!status) {
-			glValidateProgramARB(shader->vertex);
 			glGetInfoLogARB(shader->vertex, sizeof(log), &length, log);
 			shader_print_errors("compile", log, vertexcode);
 
@@ -723,7 +722,6 @@
 		glGetObjectParameterivARB(shader->fragment, GL_OBJECT_COMPILE_STATUS_ARB, &status);
 
 		if (!status) {
-			glValidateProgramARB(shader->fragment);
 			glGetInfoLogARB(shader->fragment, sizeof(log), &length, log);
 			shader_print_errors("compile", log, fragcode);
 
@@ -771,7 +769,6 @@
 	glGetObjectParameterivARB(shader->lib, GL_OBJECT_COMPILE_STATUS_ARB, &status);
 
 	if (!status) {
-		glValidateProgramARB(shader->lib);
 		glGetInfoLogARB(shader->lib, sizeof(log), &length, log);
 		shader_print_errors("compile", log, code);
 

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2008-09-15 11:39:49 UTC (rev 16537)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2008-09-15 12:40:17 UTC (rev 16538)
@@ -52,6 +52,7 @@
 extern "C"
 {
 #endif  // __cplusplus
+#include "MEM_guardedalloc.h"
 #include "BKE_global.h"	
 #include "BKE_icons.h"	
 #include "BKE_node.h"	
@@ -185,6 +186,7 @@
 #ifdef _WIN32
 	printf("  -c: keep console window open\n");
 #endif
+	printf("  -d: turn debugging on\n");
 	printf("  -g: game engine options:\n");
 	printf("       Name            Default      Description\n");
 	printf("       ----------------------------------------\n");
@@ -414,6 +416,12 @@
 					}
 				}
 				break;
+
+			case 'd':
+				i++;
+				G.f |= G_DEBUG;     /* std output printf's */
+				MEM_set_memory_debug();
+				break;
 				
 			case 'p':
 				// Parse window position and size options