Merge branch 'master' into r300-compiler

[mesa.git] / src / mesa / shader / nvfragparse.h

diff --git a/src/mesa/shader/nvfragparse.h b/src/mesa/shader/nvfragparse.h
index 849a7fbc7d6752b1362983d7ccd5eb33fe4b91cf..544ab80c56c9449526b3703b7b9a342af69cd799 100644 (file)
--- a/src/mesa/shader/nvfragparse.h
+++ b/src/mesa/shader/nvfragparse.h
@@ -34,19 +34,10 @@
 extern void
 _mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum target,
                                 const GLubyte *str, GLsizei len,
-                                struct fragment_program *program);
-
-
-extern void
-_mesa_print_nv_fragment_program(const struct fragment_program *program);
+                                struct gl_fragment_program *program);
 
 
 extern const char *
 _mesa_nv_fragment_input_register_name(GLuint i);
 
-
-extern const char *
-_mesa_nv_fragment_output_register_name(GLuint i);
-
-
 #endif