diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-03-31 11:54:20 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-05-12 12:12:57 +0800 |
| commit | 14a92b26ff76550c5010ddf8bcbf5226dae5183f (patch) | |
| tree | 9035b54e3f7f5f6f4ff5713e44e2bc805b28dd46 /src/mesa/state_tracker/st_context.c | |
| parent | e33ad4999e5f8a690a72ad6ce4e6d36328173430 (diff) | |
st/mesa: Make st_cb_{bitmap,drawpixels}.h FEATURE_drawpix aware.
This change allows st_cb_{bitmap,drawpixels}.h to be used without
knowing if FEATURE_drawpix is enabled.
Diffstat (limited to 'src/mesa/state_tracker/st_context.c')
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 24360fa8bc..bab54811b4 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -38,10 +38,8 @@ #include "st_cb_bufferobjects.h" #include "st_cb_clear.h" #include "st_cb_condrender.h" -#if FEATURE_drawpix #include "st_cb_drawpixels.h" #include "st_cb_rasterpos.h" -#endif #if FEATURE_OES_draw_texture #include "st_cb_drawtex.h" #endif @@ -130,7 +128,7 @@ st_create_context_priv( GLcontext *ctx, struct pipe_context *pipe ) /* state tracker needs the VBO module */ _vbo_CreateContext(ctx); -#if FEATURE_feedback || FEATURE_drawpix +#if FEATURE_feedback || FEATURE_rastpos st->draw = draw_create(pipe); /* for selection/feedback */ /* Disable draw options that might convert points/lines to tris, etc. @@ -226,7 +224,7 @@ static void st_destroy_context_priv( struct st_context *st ) { uint i; -#if FEATURE_feedback || FEATURE_drawpix +#if FEATURE_feedback || FEATURE_rastpos draw_destroy(st->draw); #endif st_destroy_atoms( st ); @@ -236,10 +234,8 @@ static void st_destroy_context_priv( struct st_context *st ) st_destroy_blit(st); #endif st_destroy_clear(st); -#if FEATURE_drawpix st_destroy_bitmap(st); st_destroy_drawpix(st); -#endif #if FEATURE_OES_draw_texture st_destroy_drawtex(st); #endif @@ -308,11 +304,9 @@ void st_init_driver_functions(struct dd_function_table *functions) #endif st_init_bufferobject_functions(functions); st_init_clear_functions(functions); -#if FEATURE_drawpix st_init_bitmap_functions(functions); st_init_drawpixels_functions(functions); st_init_rasterpos_functions(functions); -#endif #if FEATURE_OES_draw_texture st_init_drawtex_functions(functions); |