From 24c3d16f3b2bcfa1cff6836ffaf136333893f1e3 Mon Sep 17 00:00:00 2001 From: Oliver McFadden Date: Tue, 11 Sep 2012 09:14:31 +0300 Subject: [PATCH] mesa: remove FEATURE_drawpix define. Signed-off-by: Oliver McFadden Reviewed-by: Brian Paul --- src/mesa/main/drawpix.c | 6 ----- src/mesa/main/drawpix.h | 11 --------- src/mesa/main/mfeatures.h | 1 - src/mesa/state_tracker/st_cb_bitmap.c | 4 --- src/mesa/state_tracker/st_cb_bitmap.h | 30 ----------------------- src/mesa/state_tracker/st_cb_drawpixels.c | 4 --- src/mesa/state_tracker/st_cb_drawpixels.h | 15 ------------ src/mesa/state_tracker/st_program.c | 2 -- 8 files changed, 73 deletions(-) diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index bd9837fdd9a..b5ab2cbeb7a 100644 --- a/src/mesa/main/drawpix.c +++ b/src/mesa/main/drawpix.c @@ -39,9 +39,6 @@ #include "fbobject.h" -#if FEATURE_drawpix - - /* * Execute glDrawPixels */ @@ -379,6 +376,3 @@ _mesa_init_drawpix_dispatch(struct _glapi_table *disp) SET_CopyPixels(disp, _mesa_CopyPixels); SET_DrawPixels(disp, _mesa_DrawPixels); } - - -#endif /* FEATURE_drawpix */ diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h index 13efba5f8ff..971d258f181 100644 --- a/src/mesa/main/drawpix.h +++ b/src/mesa/main/drawpix.h @@ -32,19 +32,8 @@ struct _glapi_table; -#if FEATURE_drawpix - extern void _mesa_init_drawpix_dispatch(struct _glapi_table *disp); -#else /* FEATURE_drawpix */ - -static inline void -_mesa_init_drawpix_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_drawpix */ - #endif /* DRAWPIX_H */ diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 2742e5a160e..9695e38e8da 100644 --- a/src/mesa/main/mfeatures.h +++ b/src/mesa/main/mfeatures.h @@ -84,7 +84,6 @@ #define FEATURE_remap_table 0 #endif -#define FEATURE_drawpix FEATURE_GL #define FEATURE_evaluators FEATURE_GL #define FEATURE_feedback FEATURE_GL #define FEATURE_pixel_transfer FEATURE_GL diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c index dbd778b4fc7..62e57123512 100644 --- a/src/mesa/state_tracker/st_cb_bitmap.c +++ b/src/mesa/state_tracker/st_cb_bitmap.c @@ -57,8 +57,6 @@ #include "cso_cache/cso_context.h" -#if FEATURE_drawpix - /** * glBitmaps are drawn as textured quads. The user's bitmap pattern * is stored in a texture image. An alpha8 texture format is used. @@ -884,5 +882,3 @@ st_destroy_bitmap(struct st_context *st) st->bitmap.cache = NULL; } } - -#endif /* FEATURE_drawpix */ diff --git a/src/mesa/state_tracker/st_cb_bitmap.h b/src/mesa/state_tracker/st_cb_bitmap.h index 25410e5037f..d1c18058bd0 100644 --- a/src/mesa/state_tracker/st_cb_bitmap.h +++ b/src/mesa/state_tracker/st_cb_bitmap.h @@ -38,8 +38,6 @@ struct st_context; struct gl_fragment_program; struct st_fragment_program; -#if FEATURE_drawpix - extern void st_init_bitmap_functions(struct dd_function_table *functions); @@ -58,33 +56,5 @@ st_make_bitmap_fragment_program(struct st_context *st, extern void st_flush_bitmap_cache(struct st_context *st); -#else - -static INLINE void -st_init_bitmap_functions(struct dd_function_table *functions) -{ -} - -static INLINE void -st_init_bitmap(struct st_context *st) -{ -} - -static INLINE void -st_destroy_bitmap(struct st_context *st) -{ -} - -static INLINE void -st_flush_bitmap_cache(struct st_context *st) -{ -} - -static INLINE void -st_flush_bitmap(struct st_context *st) -{ -} - -#endif /* FEATURE_drawpix */ #endif /* ST_CB_BITMAP_H */ diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index b2c6327a0ec..a8a01db969d 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -71,8 +71,6 @@ #include "cso_cache/cso_context.h" -#if FEATURE_drawpix - /** * Check if the given program is: * 0: MOVE result.color, fragment.color; @@ -1661,5 +1659,3 @@ st_destroy_drawpix(struct st_context *st) if (st->drawpix.vert_shaders[1]) cso_delete_vertex_shader(st->cso_context, st->drawpix.vert_shaders[1]); } - -#endif /* FEATURE_drawpix */ diff --git a/src/mesa/state_tracker/st_cb_drawpixels.h b/src/mesa/state_tracker/st_cb_drawpixels.h index 44d7f5ed1e7..6209dcade34 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.h +++ b/src/mesa/state_tracker/st_cb_drawpixels.h @@ -36,8 +36,6 @@ struct dd_function_table; struct st_context; -#if FEATURE_drawpix - extern void st_init_drawpixels_functions(struct dd_function_table *functions); extern void @@ -53,18 +51,5 @@ st_make_drawpix_z_stencil_program(struct st_context *st, GLboolean write_depth, GLboolean write_stencil); -#else - -static INLINE void -st_init_drawpixels_functions(struct dd_function_table *functions) -{ -} - -static INLINE void -st_destroy_drawpix(struct st_context *st) -{ -} - -#endif /* FEATURE_drawpix */ #endif /* ST_CB_DRAWPIXELS_H */ diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 9816e22ac26..4eb27fe7056 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -497,7 +497,6 @@ st_translate_fragment_program(struct st_context *st, assert(!(key->bitmap && key->drawpixels)); -#if FEATURE_drawpix if (key->bitmap) { /* glBitmap drawing */ struct gl_fragment_program *fp; /* we free this temp program below */ @@ -525,7 +524,6 @@ st_translate_fragment_program(struct st_context *st, } stfp = st_fragment_program(fp); } -#endif if (!stfp->glsl_to_tgsi) _mesa_remove_output_reads(&stfp->Base.Base, PROGRAM_OUTPUT); -- 2.30.2