diff options
| author | Christian König <[email protected]> | 2011-01-20 22:10:37 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-20 22:10:37 +0100 |
| commit | d2ff6b8715e817c1ef14d4bf12be58c19d894143 (patch) | |
| tree | 281badfe8638da50221270af29e16da1e40d9a6a /src/mesa/main/texfetch.h | |
| parent | e755c7bec3bc722ee451bdaed8da741f337d33b3 (diff) | |
| parent | d136d1d2e1174d2420ce5e32507904243ab240cd (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/mesa/main/texfetch.h')
| -rw-r--r-- | src/mesa/main/texfetch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/texfetch.h b/src/mesa/main/texfetch.h index e78079ae5ab..002ff0c768c 100644 --- a/src/mesa/main/texfetch.h +++ b/src/mesa/main/texfetch.h @@ -40,4 +40,6 @@ _mesa_get_texel_fetch_func(gl_format format, GLuint dims); extern void _mesa_set_fetch_functions(struct gl_texture_image *texImage, GLuint dims); +void +_mesa_update_fetch_functions(struct gl_texture_object *texObj); #endif |