summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-29 16:38:53 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-30 11:32:52 -0600
commit1203f54686896ed21bb4e2e57880e0e034091b14 (patch)
tree3aa5cb20cdff654b6de590cec5a84af688b54de0
parentbcc026893b4719122711d6dd3a391cca10820665 (diff)
make _mesa_combine_programs() params const
-rw-r--r--src/mesa/shader/program.c3
-rw-r--r--src/mesa/shader/program.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 0e420179bc..2d8b887791 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -460,7 +460,8 @@ adjust_param_indexes(struct prog_instruction *inst, GLuint numInst,
*/
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)
{
struct prog_instruction *newInst;
struct gl_program *newProg;
diff --git a/src/mesa/shader/program.h b/src/mesa/shader/program.h
index 02faa706d9..4b7297e4c6 100644
--- a/src/mesa/shader/program.h
+++ b/src/mesa/shader/program.h
@@ -90,7 +90,8 @@ _mesa_clone_program(GLcontext *ctx, const struct gl_program *prog);
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);