diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-07-22 03:51:46 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-07-22 03:51:46 +0000 |
| commit | 05944c031cd6bea985050f0e88a19f0794f57887 (patch) | |
| tree | 23b1def1e5c7fe1efe19deb67c366f811e21cdc0 /src/mesa/main/context.c | |
| parent | f7fda86c6dcb7894157bd35a0cf15d003d48b441 (diff) | |
| download | external_mesa3d-05944c031cd6bea985050f0e88a19f0794f57887.zip external_mesa3d-05944c031cd6bea985050f0e88a19f0794f57887.tar.gz external_mesa3d-05944c031cd6bea985050f0e88a19f0794f57887.tar.bz2 | |
Restore more code lost during last big merge.
Rename colortable-related functions.
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index b44f74b..13b4d19 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -74,6 +74,7 @@ #include "glheader.h" #include "imports.h" #include "accum.h" +#include "arbprogram.h" #include "attrib.h" #include "blend.h" #include "buffers.h" @@ -97,6 +98,7 @@ #include "lines.h" #include "macros.h" #include "matrix.h" +#include "occlude.h" #include "pixel.h" #include "points.h" #include "polygon.h" @@ -1089,7 +1091,7 @@ init_attrib_groups( GLcontext *ctx ) _mesa_init_attrib( ctx ); _mesa_init_buffers( ctx ); _mesa_init_color( ctx ); - _mesa_init_colortable( ctx ); + _mesa_init_colortables( ctx ); _mesa_init_current( ctx ); _mesa_init_depth( ctx ); _mesa_init_debug( ctx ); @@ -1102,10 +1104,11 @@ init_attrib_groups( GLcontext *ctx ) _mesa_init_line( ctx ); _mesa_init_lighting( ctx ); _mesa_init_matrix( ctx ); + _mesa_init_occlude( ctx ); _mesa_init_pixel( ctx ); _mesa_init_point( ctx ); _mesa_init_polygon( ctx ); - /* XXX _mesa_init_program( ctx ); */ + _mesa_init_program( ctx ); _mesa_init_rastpos( ctx ); _mesa_init_stencil( ctx ); _mesa_init_transform( ctx ); @@ -1473,7 +1476,7 @@ _mesa_free_context_data( GLcontext *ctx ) _mesa_free_texture_data( ctx ); _mesa_free_matrix_data( ctx ); _mesa_free_viewport_data( ctx ); - _mesa_free_colortable_data( ctx ); + _mesa_free_colortables_data( ctx ); #if FEATURE_NV_vertex_program if (ctx->VertexProgram.Current) { ctx->VertexProgram.Current->Base.RefCount--; |