X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_cb_bitmap.h;h=d1c18058bd0c0b669d0ed352802c41a9782aeb2c;hb=1aa8ad8b50f6bb8e7ec4911eef2518dc485b9285;hp=8af975b74fce7a81c33fa9d88f03b12339c57d5e;hpb=bcc13b74443137043e8a34f8cb64a5add0d8af93;p=mesa.git

diff --git a/src/mesa/state_tracker/st_cb_bitmap.h b/src/mesa/state_tracker/st_cb_bitmap.h
index 8af975b74fc..d1c18058bd0 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.h
+++ b/src/mesa/state_tracker/st_cb_bitmap.h
@@ -30,9 +30,13 @@
 #define ST_CB_BITMAP_H
 
 
-#include "main/mtypes.h"
+#include "main/compiler.h"
+#include "main/mfeatures.h"
 
-#if FEATURE_drawpix
+struct dd_function_table;
+struct st_context;
+struct gl_fragment_program;
+struct st_fragment_program;
 
 extern void
 st_init_bitmap_functions(struct dd_function_table *functions);
@@ -44,41 +48,13 @@ extern void
 st_destroy_bitmap(struct st_context *st);
 
 extern void
-st_flush_bitmap_cache(struct st_context *st);
+st_make_bitmap_fragment_program(struct st_context *st,
+                                struct gl_fragment_program *fpIn,
+                                struct gl_fragment_program **fpOut,
+                                GLuint *bitmap_sampler);
 
-/* Flush bitmap cache and release vertex buffer.  Needed at end of
- * frame to avoid synchronous rendering.
- */
 extern void
-st_flush_bitmap(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)
-{
-}
+st_flush_bitmap_cache(struct st_context *st);
 
-#endif /* FEATURE_drawpix */
 
 #endif /* ST_CB_BITMAP_H */