mesa: remove FEATURE_drawpix define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index bd9837fdd9a8360d236ae98a54e981492336c9ed..b5ab2cbeb7af32e75d87c93673385f877cd6718b 100644 (file)
--- 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 13efba5f8ff10cd79a54f4f5ee8167b32b9c62d8..971d258f18192c0fd9fc9a0579b5f575515ec7d2 100644 (file)
--- 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 2742e5a160e8391739587a7729e8a1cf2b882caf..9695e38e8dada8c3988a9dcb20d4bc8015cdd302 100644 (file)
--- 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 dbd778b4fc74204115fe01303d9b148034f3db39..62e5712351225deb2f268ddfa684ed12ef320c53 100644 (file)
--- 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 25410e5037f869fd780406361780f1e1d444dac8..d1c18058bd0c0b669d0ed352802c41a9782aeb2c 100644 (file)
--- 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 b2c6327a0ec445fc6055658e4849494bac87f10a..a8a01db969d3b573047cb6863391b7aa57b66f04 100644 (file)
--- 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 44d7f5ed1e7ee9f51a7ace5629e53ae6c747e4e9..6209dcade34944b0dc6aa36638ea28a867287451 100644 (file)
--- 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 9816e22ac26e1d6b2fdc6c770119d3f14d16410f..4eb27fe7056ac53eb86a7ca60b480e990cbd0ac7 100644 (file)
--- 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);