From 1203f54686896ed21bb4e2e57880e0e034091b14 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 29 Oct 2007 16:38:53 -0600 Subject: [PATCH] make _mesa_combine_programs() params const --- src/mesa/shader/program.c | 3 ++- src/mesa/shader/program.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c index 0e420179bc5..2d8b8877915 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 02faa706d94..4b7297e4c65 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); -- 2.30.2