summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-04-01 01:41:54 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-04-01 01:41:54 +0000
commitfe1230f1c88fbe2e756f159625988ec3c66be2e6 (patch)
tree5cf4906ca089b16adf4b32fa9af82cbc29e0afbf /src
parent26772ac988ee0f125da6b7bb15990bbf40d5f944 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/config.h4
-rw-r--r--src/mesa/shader/shaderobjects.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index c29faebae77..0ab0e471812 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 fd1e0db4d29..791ab608153 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
}