Add shaderobjects_3dlabs.c back into build but use #ifdef FEATURE_shading_language...

diff --git a/src/mesa/shader/shaderobjects.c b/src/mesa/shader/shaderobjects.c
index 791ab6081531ac31dcf4fa1bd3d5d70a32b10d4b..ac8ff1af487ddcdc5d47cd65f4ac9e649184c348 100644 (file)
--- a/src/mesa/shader/shaderobjects.c
+++ b/src/mesa/shader/shaderobjects.c
@@ -130,9 +130,7 @@ _mesa_DetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj)
 GLhandleARB GLAPIENTRY
 _mesa_CreateShaderObjectARB (GLenum shaderType)
 {
-#if FEATURE_shading_language
        return _mesa_3dlabs_create_shader_object (shaderType);
-#endif
 }
 
 void GLAPIENTRY
@@ -235,9 +233,7 @@ _mesa_CompileShaderARB (GLhandleARB shaderObj)
 GLhandleARB GLAPIENTRY
 _mesa_CreateProgramObjectARB (void)
 {
-#if FEATURE_shading_language
        return _mesa_3dlabs_create_program_object ();
-#endif
 }
 
 void GLAPIENTRY
@@ -1181,8 +1177,6 @@ _mesa_init_shaderobjects (GLcontext *ctx)
 {
        ctx->ShaderObjects.current_program = NULL;
 
-#if FEATURE_shading_language
        _mesa_init_shaderobjects_3dlabs (ctx);
-#endif
 }
 

diff --git a/src/mesa/shader/shaderobjects_3dlabs.c b/src/mesa/shader/shaderobjects_3dlabs.c
index ce56ddfa67c5c5cc73bc9baf0e49e76a64da2b3d..7ac8ae1eaadf96fb5185951fc745d406caf28be7 100755 (executable)
--- a/src/mesa/shader/shaderobjects_3dlabs.c
+++ b/src/mesa/shader/shaderobjects_3dlabs.c
@@ -411,10 +411,14 @@ struct gl2_3dlabs_shhandle_impl
 static void\r
 _3dlabs_shhandle_destructor (struct gl2_unknown_intf **intf)\r
 {\r
+#if FEATURE_shading_language\r
        struct gl2_3dlabs_shhandle_impl *impl = (struct gl2_3dlabs_shhandle_impl *) intf;\r
 \r
        ShDestruct (impl->_obj.handle);\r
        _unkinner_destructor (intf);\r
+#else\r
+       (void) _unkinner_destructor;\r
+#endif\r
 }\r
 \r
 static GLvoid *\r
@@ -524,6 +528,7 @@ _shader_GetSource (struct gl2_shader_intf **intf)
 static GLvoid\r
 _shader_Compile (struct gl2_shader_intf **intf)\r
 {\r
+#if FEATURE_shading_language\r
        struct gl2_shader_impl *impl = (struct gl2_shader_impl *) intf;\r
        char **strings;\r
        TBuiltInResource res;\r
@@ -584,7 +589,6 @@ _shader_Compile (struct gl2_shader_intf **intf)
        if (ShCompile (impl->_obj._3dlabs_shhandle._obj.handle, strings, impl->_obj.offset_count,\r
                        EShOptFull, &res, 0))\r
                impl->_obj.compile_status = GL_TRUE;\r
-\r
        if (impl->_obj.offset_count > 1)\r
        {\r
                GLsizei i;\r
@@ -596,6 +600,7 @@ _shader_Compile (struct gl2_shader_intf **intf)
 \r
        impl->_obj._generic.info_log = _mesa_strdup (ShGetInfoLog (\r
                impl->_obj._3dlabs_shhandle._obj.handle));\r
+#endif\r
 }\r
 \r
 static struct gl2_shader_intf _shader_vftbl = {\r
@@ -650,10 +655,12 @@ struct gl2_program_impl
 static void\r
 _program_destructor (struct gl2_unknown_intf **intf)\r
 {\r
+#if FEATURE_shading_language\r
        struct gl2_program_impl *impl = (struct gl2_program_impl *) intf;\r
 \r
        ShDestruct (impl->_obj.linker);\r
        ShDestruct (impl->_obj.uniforms);\r
+#endif\r
        _container_destructor (intf);\r
 }\r
 \r
@@ -710,6 +717,7 @@ _program_GetValidateStatus (struct gl2_program_intf **intf)
 static GLvoid\r
 _program_Link (struct gl2_program_intf **intf)\r
 {\r
+#if FEATURE_shading_language\r
        struct gl2_program_impl *impl = (struct gl2_program_impl *) intf;\r
        ShHandle *handles;\r
        GLuint i;\r
@@ -746,6 +754,7 @@ _program_Link (struct gl2_program_intf **intf)
                impl->_obj.link_status = GL_TRUE;\r
 \r
        impl->_obj._container._generic.info_log = _mesa_strdup (ShGetInfoLog (impl->_obj.linker));\r
+#endif\r
 }\r
 \r
 static GLvoid\r
@@ -788,6 +797,7 @@ static struct gl2_program_intf _program_vftbl = {
 static void\r
 _program_constructor (struct gl2_program_impl *impl)\r
 {\r
+#if FEATURE_shading_language\r
        _container_constructor ((struct gl2_container_impl *) impl);\r
        impl->_vftbl = &_program_vftbl;\r
        impl->_obj._container._generic._unknown._destructor = _program_destructor;\r
@@ -795,6 +805,11 @@ _program_constructor (struct gl2_program_impl *impl)
        impl->_obj.validate_status = GL_FALSE;\r
        impl->_obj.linker = ShConstructLinker (EShExVertexFragment, 0);\r
        impl->_obj.uniforms = ShConstructUniformMap ();\r
+#else\r
+        (void) _container_constructor;\r
+        (void) _program_destructor;\r
+        (void) _program_vftbl;\r
+#endif\r
 }\r
 \r
 struct gl2_fragment_shader_obj\r
@@ -861,10 +876,16 @@ static struct gl2_fragment_shader_intf _fragment_shader_vftbl = {
 static void\r
 _fragment_shader_constructor (struct gl2_fragment_shader_impl *impl)\r
 {\r
+#if FEATURE_shading_language\r
        _shader_constructor ((struct gl2_shader_impl *) impl);\r
        impl->_vftbl = &_fragment_shader_vftbl;\r
        impl->_obj._shader._generic._unknown._destructor = _fragment_shader_destructor;\r
        impl->_obj._shader._3dlabs_shhandle._obj.handle = ShConstructCompiler (EShLangFragment, 0);\r
+#else\r
+        (void) _shader_constructor;\r
+        (void) _fragment_shader_vftbl;\r
+        (void) _fragment_shader_destructor;\r
+#endif\r
 }\r
 \r
 struct gl2_vertex_shader_obj\r
@@ -931,10 +952,15 @@ static struct gl2_vertex_shader_intf _vertex_shader_vftbl = {
 static void\r
 _vertex_shader_constructor (struct gl2_vertex_shader_impl *impl)\r
 {\r
+#if FEATURE_shading_language\r
        _shader_constructor ((struct gl2_shader_impl *) impl);\r
        impl->_vftbl = &_vertex_shader_vftbl;\r
        impl->_obj._shader._generic._unknown._destructor = _vertex_shader_destructor;\r
        impl->_obj._shader._3dlabs_shhandle._obj.handle = ShConstructCompiler (EShLangVertex, 0);\r
+#else\r
+        (void) _vertex_shader_vftbl;\r
+        (void) _vertex_shader_destructor;\r
+#endif\r
 }\r
 \r
 GLhandleARB\r
@@ -989,7 +1015,9 @@ _mesa_3dlabs_create_program_object (void)
 void\r
 _mesa_init_shaderobjects_3dlabs (GLcontext *ctx)\r
 {\r
+#if FEATURE_shading_language\r
        _glslang_3dlabs_InitProcess ();\r
        _glslang_3dlabs_ShInitialize ();\r
+#endif\r
 }\r
 \r

diff --git a/src/mesa/sources b/src/mesa/sources
index b2f19cc00bb3201f8705b64ced449c4ce5148543..208970bdff63dc236be7aef3647e330024fa0373 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -149,11 +149,10 @@ SHADER_SOURCES = \
        shader/nvvertexec.c \
        shader/nvvertparse.c \
        shader/program.c \
-       shader/shaderobjects.c
+       shader/shaderobjects.c \
+       shader/shaderobjects_3dlabs.c
 
-#      shader/shaderobjects_3dlabs.c
-
-SLANG_SOURCES = \
+SLANG_C_SOURCES = \
        shader/slang/MachineIndependent/preprocessor/atom.c \
        shader/slang/MachineIndependent/preprocessor/cpp.c \
        shader/slang/MachineIndependent/preprocessor/cppstruct.c \
@@ -271,8 +270,9 @@ CORE_SOURCES = \
        $(SHADER_SOURCES)       \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
-       $(ASM_C_SOURCES)        \
-       $(SLANG_SOURCES)
+       $(ASM_C_SOURCES)        
+
+#      $(SLANG_C_SOURCES)
 
 
 ### Object files