include proper header file, remove local extern declarations

diff --git a/src/mesa/swrast/s_arbshader.c b/src/mesa/swrast/s_arbshader.c
index 7cea59ee40a2e4aac8936e64e603b9c2237ec710..1d489d90e54798ad4171f8edaf333a00811785c3 100644 (file)
--- a/src/mesa/swrast/s_arbshader.c
+++ b/src/mesa/swrast/s_arbshader.c
@@ -31,11 +31,8 @@
 #include "s_arbshader.h"\r
 #include "s_context.h"\r
 #include "shaderobjects.h"\r
+#include "shaderobjects_3dlabs.h"\r
 \r
-int _slang_fetch_vec4_f (struct gl2_fragment_shader_intf **, const char *, GLfloat *,\r
-       GLuint, int);\r
-int _slang_fetch_discard (struct gl2_fragment_shader_intf **, GLboolean *);\r
-void exec_fragment_shader (struct gl2_fragment_shader_intf **);\r
 \r
 static void fetch_input_vec4 (const char *name, GLfloat *vec, GLuint index,\r
        struct gl2_fragment_shader_intf **fs)\r
@@ -99,13 +96,13 @@ void _swrast_exec_arbshader (GLcontext *ctx, struct sw_span *span)
                        fetch_input_vec4 ("gl_TexCoord", vec, j, fs);\r
                }\r
 \r
-               exec_fragment_shader (fs);\r
+               _slang_exec_fragment_shader (fs);\r
 \r
                _slang_fetch_discard (fs, &kill);\r
                if (kill)\r
                {\r
                        span->array->mask[i] = GL_FALSE;\r
-            span->writeAll = GL_FALSE;\r
+                       span->writeAll = GL_FALSE;\r
                }\r
                fetch_output_vec4 ("gl_FragColor", vec, 0, fs);\r
                UNCLAMPED_FLOAT_TO_CHAN(span->array->rgba[i][RCOMP], vec[0]);\r

diff --git a/src/mesa/tnl/t_vb_arbshader.c b/src/mesa/tnl/t_vb_arbshader.c
index 50b23cf1332caf4551a9d78f510544f2e3312de4..c8f826571ad4d45b4a783fb1268902a8a5b7ca20 100644 (file)
--- a/src/mesa/tnl/t_vb_arbshader.c
+++ b/src/mesa/tnl/t_vb_arbshader.c
@@ -29,6 +29,7 @@
 #include "imports.h"\r
 #include "macros.h"\r
 #include "shaderobjects.h"\r
+#include "shaderobjects_3dlabs.h"\r
 #include "t_pipeline.h"\r
 #include "slang_utility.h"\r
 \r
@@ -89,19 +90,11 @@ static void validate_arb_vertex_shader (GLcontext *ctx, struct tnl_pipeline_stag
 {\r
 }\r
 \r
-/* XXX */\r
-extern void exec_vertex_shader (struct gl2_vertex_shader_intf **vs);\r
-extern int _slang_fetch_float (struct gl2_vertex_shader_intf **, const char *, GLfloat *, int);\r
-extern int _slang_fetch_vec3 (struct gl2_vertex_shader_intf **, const char *, GLfloat *, int);\r
-extern int _slang_fetch_vec4 (struct gl2_vertex_shader_intf **, const char *, GLfloat *, GLuint, int);\r
-extern int _slang_fetch_mat3 (struct gl2_vertex_shader_intf **, const char *, GLfloat *, GLuint, int);\r
-extern int _slang_fetch_mat4 (struct gl2_vertex_shader_intf **, const char *, GLfloat *, GLuint, int);\r
-\r
 static void fetch_input_float (const char *name, GLuint attr, GLuint i, struct vertex_buffer *vb,\r
        struct gl2_vertex_shader_intf **vs)\r
 {\r
        const GLubyte *ptr = (const GLubyte *) vb->AttribPtr[attr]->data;\r
-       const GLuint size = vb->AttribPtr[attr]->size;\r
+       /*const GLuint size = vb->AttribPtr[attr]->size;*/\r
        const GLuint stride = vb->AttribPtr[attr]->stride;\r
        const GLfloat *data = (const GLfloat *) (ptr + stride * i);\r
        float vec[1];\r
@@ -114,7 +107,7 @@ static void fetch_input_vec3 (const char *name, GLuint attr, GLuint i, struct ve
        struct gl2_vertex_shader_intf **vs)\r
 {\r
        const GLubyte *ptr = (const GLubyte *) vb->AttribPtr[attr]->data;\r
-       const GLuint size = vb->AttribPtr[attr]->size;\r
+       /*const GLuint size = vb->AttribPtr[attr]->size;*/\r
        const GLuint stride = vb->AttribPtr[attr]->stride;\r
        const GLfloat *data = (const GLfloat *) (ptr + stride * i);\r
        float vec[3];\r
@@ -298,7 +291,7 @@ static GLboolean run_arb_vertex_shader (GLcontext *ctx, struct tnl_pipeline_stag
                fetch_input_vec4 ("gl_MultiTexCoord6", _TNL_ATTRIB_TEX6, i, vb, vs);\r
                fetch_input_vec4 ("gl_MultiTexCoord7", _TNL_ATTRIB_TEX7, i, vb, vs);\r
 \r
-               exec_vertex_shader (vs);\r
+               _slang_exec_vertex_shader (vs);\r
 \r
                fetch_output_vec4 ("gl_Position", VERT_RESULT_HPOS, i, 0, store, vs);\r
                fetch_output_vec4 ("gl_FrontColor", VERT_RESULT_COL0, i, 0, store, vs);\r