summaryrefslogtreecommitdiff
path: root/src/mesa/shader/program.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-05-18 15:46:26 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-05-18 15:46:26 -0600
commit0c78c766e4cb8ffcda44cabfadb8de8e09121034 (patch)
treec257fa1467b495b75e84b5487382cd06f755f319 /src/mesa/shader/program.h
parent5976a6a75cfa6749db306111a601d99c99cc00a4 (diff)
fixes to _mesa_combine_programs(), from gallium-0.1
Diffstat (limited to 'src/mesa/shader/program.h')
-rw-r--r--src/mesa/shader/program.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/shader/program.h b/src/mesa/shader/program.h
index 0f0d6060a9..f1a69a2c01 100644
--- a/src/mesa/shader/program.h
+++ b/src/mesa/shader/program.h
@@ -117,7 +117,8 @@ _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);
+ const struct gl_program *progA,
+ const struct gl_program *progB);
extern GLint
_mesa_find_free_register(const struct gl_program *prog, GLuint regFile);