make _mesa_combine_programs() params const

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 0e42017..2d8b887 100644 (file)
--- 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 02faa70..4b7297e 100644 (file)
--- 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);