Merge branch 'mesa_7_5_branch'

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

diff --git a/src/mesa/shader/prog_print.h b/src/mesa/shader/prog_print.h
index 36c47e0dff921b68b59d18ffa59bfda3736431cb..d55661cebb807a03e47215644553e223eb5582fc 100644 (file)
--- a/src/mesa/shader/prog_print.h
+++ b/src/mesa/shader/prog_print.h
@@ -43,6 +43,12 @@ _mesa_condcode_string(GLuint condcode);
 extern const char *
 _mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended);
 
+const char *
+_mesa_writemask_string(GLuint writeMask);
+
+extern void
+_mesa_print_swizzle(GLuint swizzle);
+
 extern void
 _mesa_print_alu_instruction(const struct prog_instruction *inst,
                             const char *opcode_string, GLuint numRegs);
@@ -59,8 +65,9 @@ extern void
 _mesa_print_program(const struct gl_program *prog);
 
 extern void
-_mesa_print_program_opt(const struct gl_program *prog, gl_prog_print_mode mode,
-                        GLboolean lineNumbers);
+_mesa_fprint_program_opt(FILE *f,
+                         const struct gl_program *prog, gl_prog_print_mode mode,
+                         GLboolean lineNumbers);
 
 extern void
 _mesa_print_program_parameters(GLcontext *ctx, const struct gl_program *prog);
@@ -69,4 +76,8 @@ extern void
 _mesa_print_parameter_list(const struct gl_program_parameter_list *list);
 
 
+extern void
+_mesa_write_shader_to_file(const struct gl_shader *shader);
+
+
 #endif /* PROG_PRINT_H */