diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 12:49:41 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 12:49:41 +0200 |
| commit | dbf3a15313eed930a3d8fdde12e457259c43651b (patch) | |
| tree | 78bc54fa866ff1e97e61802f52dabe3f4f3380b1 /src/mesa/program/prog_statevars.h | |
| parent | 1dccc4cfaa423f15ab582d2a0253a84a0ae0b9fa (diff) | |
| parent | 547e7619aac74ae13bdaa7fdf403a4ceb5212467 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
src/gallium/include/pipe/p_format.h
Diffstat (limited to 'src/mesa/program/prog_statevars.h')
| -rw-r--r-- | src/mesa/program/prog_statevars.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/program/prog_statevars.h b/src/mesa/program/prog_statevars.h index cfce226fb49..6e5be53630c 100644 --- a/src/mesa/program/prog_statevars.h +++ b/src/mesa/program/prog_statevars.h @@ -125,7 +125,7 @@ typedef enum gl_state_index_ { extern void -_mesa_load_state_parameters(GLcontext *ctx, +_mesa_load_state_parameters(struct gl_context *ctx, struct gl_program_parameter_list *paramList); @@ -138,7 +138,7 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH]); extern void -_mesa_load_tracked_matrices(GLcontext *ctx); +_mesa_load_tracked_matrices(struct gl_context *ctx); #endif /* PROG_STATEVARS_H */ |