added _mesa_combine_parameter_lists()

cherry-picked from gallium-0.1
2008-05-14 12:53:03 -06:00
parent 19ad9cf774
commit 6ca948a303
6 changed files with 296 additions and 2 deletions
--- a/src/mesa/shader/program.h
+++ b/src/mesa/shader/program.h
@@ -115,6 +115,14 @@ _mesa_clone_program(GLcontext *ctx, const struct gl_program *prog);
 extern  GLboolean
 _mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count);

+extern struct gl_program *
+_mesa_combine_programs(GLcontext *ctx,
+                       struct gl_program *progA, struct gl_program *progB);
+
+extern GLint
+_mesa_find_free_register(const struct gl_program *prog, GLuint regFile);
+
+
 /*
 * API functions common to ARB/NV_vertex/fragment_program
 */