[Mesa-dev] [PATCH 12/45] mesa: replace FEATURE_drawpix with FEATURE_GL define.

[Oliver McFadden]

Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
---
 src/mesa/main/drawpix.c                   |    4 ++--
 src/mesa/main/drawpix.h                   |    6 +++---
 src/mesa/main/mfeatures.h                 |    1 -
 src/mesa/state_tracker/st_cb_bitmap.c     |    4 ++--
 src/mesa/state_tracker/st_cb_bitmap.h     |    4 ++--
 src/mesa/state_tracker/st_cb_drawpixels.c |    4 ++--
 src/mesa/state_tracker/st_cb_drawpixels.h |    4 ++--
 src/mesa/state_tracker/st_program.c       |    2 +-
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index bd9837f..7b18588 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -39,7 +39,7 @@
 #include "fbobject.h"
 
 
-#if FEATURE_drawpix
+#if FEATURE_GL
 
 
 /*
@@ -381,4 +381,4 @@ _mesa_init_drawpix_dispatch(struct _glapi_table *disp)
 }
 
 
-#endif /* FEATURE_drawpix */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
index 13efba5..0bab1d5 100644
--- a/src/mesa/main/drawpix.h
+++ b/src/mesa/main/drawpix.h
@@ -32,19 +32,19 @@
 struct _glapi_table;
 
 
-#if FEATURE_drawpix
+#if FEATURE_GL
 
 extern void
 _mesa_init_drawpix_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_drawpix */
+#else /* FEATURE_GL */
 
 static inline void
 _mesa_init_drawpix_dispatch(struct _glapi_table *disp)
 {
 }
 
-#endif /* FEATURE_drawpix */
+#endif /* FEATURE_GL */
 
 
 #endif /* DRAWPIX_H */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 2742e5a..9695e38 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 dbd778b..3f889b9 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -57,7 +57,7 @@
 #include "cso_cache/cso_context.h"
 
 
-#if FEATURE_drawpix
+#if FEATURE_GL
 
 /**
  * glBitmaps are drawn as textured quads.  The user's bitmap pattern
@@ -885,4 +885,4 @@ st_destroy_bitmap(struct st_context *st)
    }
 }
 
-#endif /* FEATURE_drawpix */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/state_tracker/st_cb_bitmap.h b/src/mesa/state_tracker/st_cb_bitmap.h
index 25410e5..d418ee2 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.h
+++ b/src/mesa/state_tracker/st_cb_bitmap.h
@@ -38,7 +38,7 @@ struct st_context;
 struct gl_fragment_program;
 struct st_fragment_program;
 
-#if FEATURE_drawpix
+#if FEATURE_GL
 
 extern void
 st_init_bitmap_functions(struct dd_function_table *functions);
@@ -85,6 +85,6 @@ st_flush_bitmap(struct st_context *st)
 {
 }
 
-#endif /* FEATURE_drawpix */
+#endif /* FEATURE_GL */
 
 #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 b2c6327..072ac26 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -71,7 +71,7 @@
 #include "cso_cache/cso_context.h"
 
 
-#if FEATURE_drawpix
+#if FEATURE_GL
 
 /**
  * Check if the given program is:
@@ -1662,4 +1662,4 @@ st_destroy_drawpix(struct st_context *st)
       cso_delete_vertex_shader(st->cso_context, st->drawpix.vert_shaders[1]);
 }
 
-#endif /* FEATURE_drawpix */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.h b/src/mesa/state_tracker/st_cb_drawpixels.h
index 44d7f5e..3208e24 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.h
+++ b/src/mesa/state_tracker/st_cb_drawpixels.h
@@ -36,7 +36,7 @@
 struct dd_function_table;
 struct st_context;
 
-#if FEATURE_drawpix
+#if FEATURE_GL
 
 extern void st_init_drawpixels_functions(struct dd_function_table *functions);
 
@@ -65,6 +65,6 @@ st_destroy_drawpix(struct st_context *st)
 {
 }
 
-#endif /* FEATURE_drawpix */
+#endif /* FEATURE_GL */
 
 #endif /* ST_CB_DRAWPIXELS_H */
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 9816e22..9f45ed4 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -497,7 +497,7 @@ st_translate_fragment_program(struct st_context *st,
 
    assert(!(key->bitmap && key->drawpixels));
 
-#if FEATURE_drawpix
+#if FEATURE_GL
    if (key->bitmap) {
       /* glBitmap drawing */
       struct gl_fragment_program *fp; /* we free this temp program below */
-- 
1.7.8.6