summaryrefslogtreecommitdiff
path: root/src/mesa/shader/program.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-05-14 12:53:03 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-05-14 12:53:03 -0600
commit6ca948a303e1af7ae66ea7082af741f6880887f2 (patch)
treea497895b6edac79d78853913ddd91080f05e18ac /src/mesa/shader/program.h
parent19ad9cf7741c641bd83d20485b32d11fe27ca8df (diff)
added _mesa_combine_parameter_lists()
cherry-picked from gallium-0.1
Diffstat (limited to 'src/mesa/shader/program.h')
-rw-r--r--src/mesa/shader/program.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/shader/program.h b/src/mesa/shader/program.h
index c5d36c78a03..0f0d6060a9e 100644
--- 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
*/