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.

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index c29faebae77056214e799433d812f41ae8c8434e..0ab0e471812edd29e11ccfc9d088860dc66857fd 100644 (file)
--- 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 fd1e0db4d290cbf80050c0e004e70ad4ae695348..791ab6081531ac31dcf4fa1bd3d5d70a32b10d4b 100644 (file)
--- 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
 }