[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17051] trunk/blender/source: Added a -noglsl option to disable GLSL from the command line.

[Brecht Van Lommel]

Revision: 17051
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17051
Author:   blendix
Date:     2008-10-12 20:32:26 +0200 (Sun, 12 Oct 2008)

Log Message:
-----------
Added a -noglsl option to disable GLSL from the command line.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/GPU_extensions.h
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/gpu/GPU_extensions.h
===================================================================
--- trunk/blender/source/blender/gpu/GPU_extensions.h	2008-10-12 17:54:47 UTC (rev 17050)
+++ trunk/blender/source/blender/gpu/GPU_extensions.h	2008-10-12 18:32:26 UTC (rev 17051)
@@ -51,6 +51,7 @@
 struct GPUShader;
 typedef struct GPUShader GPUShader;
 
+void GPU_extensions_disable(void);
 void GPU_extensions_init(void); /* call this before running any of the functions below */
 void GPU_extensions_exit(void);
 int GPU_extensions_minimum_support(void);

Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2008-10-12 17:54:47 UTC (rev 17050)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2008-10-12 18:32:26 UTC (rev 17051)
@@ -66,12 +66,18 @@
 	- arb draw buffers? 2.0 core
 */
 
-struct GPUGlobal {
+static struct GPUGlobal {
 	GLint maxtextures;
 	GLuint currentfb;
 	int minimumsupport;
-} GG = {1, 0, 0};
+	int extdisabled;
+} GG = {1, 0, 0, 0};
 
+void GPU_extensions_disable()
+{
+	GG.extdisabled = 1;
+}
+
 void GPU_extensions_init()
 {
 	glewInit();
@@ -89,7 +95,7 @@
 
 int GPU_extensions_minimum_support()
 {
-	return GG.minimumsupport;
+	return !GG.extdisabled && GG.minimumsupport;
 }
 
 int GPU_print_error(char *str)

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2008-10-12 17:54:47 UTC (rev 17050)
+++ trunk/blender/source/creator/creator.c	2008-10-12 18:32:26 UTC (rev 17051)
@@ -77,6 +77,7 @@
 #include "RE_pipeline.h"
 
 #include "GPU_draw.h"
+#include "GPU_extensions.h"
 
 #include "playanim_ext.h"
 #include "mydevice.h"
@@ -220,6 +221,7 @@
 	printf ("  -d\t\tTurn debugging on\n");
 	printf ("  -noaudio\tDisable audio on systems that support audio\n");
 	printf ("  -nojoystick\tDisable joystick support\n");
+	printf ("  -noglsl\tDisable GLSL shading\n");
 	printf ("  -h\t\tPrint this help text\n");
 	printf ("  -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n");
 	printf ("  -P <filename>\tRun the given Python script (filename or Blender Text)\n");
@@ -506,6 +508,8 @@
 						SYS_WriteCommandLineInt(syshandle,"nojoystick",1);
 						if (G.f & G_DEBUG) printf("disabling nojoystick\n");
 					}
+					if (BLI_strcasecmp(argv[a], "-noglsl") == 0)
+						GPU_extensions_disable();
 					break;
 				}
 			}