diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
| commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
| tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /src/mesa/main/texenvprogram.h | |
| parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
| parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'src/mesa/main/texenvprogram.h')
| -rw-r--r-- | src/mesa/main/texenvprogram.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h index a7aa60cf37..0a162d2e7a 100644 --- a/src/mesa/main/texenvprogram.h +++ b/src/mesa/main/texenvprogram.h @@ -32,6 +32,4 @@ extern struct gl_fragment_program * _mesa_get_fixed_func_fragment_program(GLcontext *ctx); -extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx ); - #endif |