diff options
| author | Christian König <[email protected]> | 2010-10-28 20:24:56 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-10-28 20:24:56 +0200 |
| commit | 41ed47d6b8fb6c032e2907ef2e49e414c26f35c1 (patch) | |
| tree | 8cf267ee3ac5d8b530dd70a28a0d568344aa8304 /src/mesa/program/prog_cache.h | |
| parent | 97a7cf230a70c64fff300931ae7c00aa00449c97 (diff) | |
| parent | 5479fa34d9acebd55f68c23a278cf382d0e84248 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
Conflicts:
src/gallium/include/pipe/p_format.h
Diffstat (limited to 'src/mesa/program/prog_cache.h')
| -rw-r--r-- | src/mesa/program/prog_cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/program/prog_cache.h b/src/mesa/program/prog_cache.h index bfe8f99d445..4907ae3030e 100644 --- a/src/mesa/program/prog_cache.h +++ b/src/mesa/program/prog_cache.h @@ -41,7 +41,7 @@ extern struct gl_program_cache * _mesa_new_program_cache(void); extern void -_mesa_delete_program_cache(GLcontext *ctx, struct gl_program_cache *pc); +_mesa_delete_program_cache(struct gl_context *ctx, struct gl_program_cache *pc); extern struct gl_program * @@ -49,7 +49,7 @@ _mesa_search_program_cache(struct gl_program_cache *cache, const void *key, GLuint keysize); extern void -_mesa_program_cache_insert(GLcontext *ctx, +_mesa_program_cache_insert(struct gl_context *ctx, struct gl_program_cache *cache, const void *key, GLuint keysize, struct gl_program *program); |