From fe1230f1c88fbe2e756f159625988ec3c66be2e6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 1 Apr 2005 01:41:54 +0000
Subject: Use FEATURE_shading_language to control whether the shading language
 compiler is hooked in.  May be enabled on compiler command line by setting
 -DFEATURE_shading_lanuage=1.

---
 src/mesa/main/config.h          | 4 ++++
 src/mesa/shader/shaderobjects.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index c29faebae7..0ab0e47181 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -297,6 +297,10 @@
 #define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
 #define FEATURE_ATI_fragment_shader _HAVE_FULL_GL
 #define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
+
+#ifndef FEATURE_shading_language
+#define FEATURE_shading_language 0
+#endif
 /*@}*/
 
 
diff --git a/src/mesa/shader/shaderobjects.c b/src/mesa/shader/shaderobjects.c
index fd1e0db4d2..791ab60815 100644
--- a/src/mesa/shader/shaderobjects.c
+++ b/src/mesa/shader/shaderobjects.c
@@ -130,7 +130,7 @@ _mesa_DetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj)
 GLhandleARB GLAPIENTRY
 _mesa_CreateShaderObjectARB (GLenum shaderType)
 {
-#if 0
+#if FEATURE_shading_language
 	return _mesa_3dlabs_create_shader_object (shaderType);
 #endif
 }
@@ -235,7 +235,7 @@ _mesa_CompileShaderARB (GLhandleARB shaderObj)
 GLhandleARB GLAPIENTRY
 _mesa_CreateProgramObjectARB (void)
 {
-#if 0
+#if FEATURE_shading_language
 	return _mesa_3dlabs_create_program_object ();
 #endif
 }
@@ -1181,7 +1181,7 @@ _mesa_init_shaderobjects (GLcontext *ctx)
 {
 	ctx->ShaderObjects.current_program = NULL;
 
-#if 0  /* disable for now */
+#if FEATURE_shading_language
 	_mesa_init_shaderobjects_3dlabs (ctx);
 #endif
 }
-- 
cgit v1.2.3