glsl: add ir_emit_vertex and ir_end_primitive instruction types

[mesa.git] / src / mesa / state_tracker / st_cb_bitmap.h

diff --git a/src/mesa/state_tracker/st_cb_bitmap.h b/src/mesa/state_tracker/st_cb_bitmap.h
index 8af975b74fce7a81c33fa9d88f03b12339c57d5e..cc9f5f57464051dbfd4b803b4edfa0d1c0064d99 100644 (file)
--- a/src/mesa/state_tracker/st_cb_bitmap.h
+++ b/src/mesa/state_tracker/st_cb_bitmap.h
@@ -30,9 +30,12 @@
 #define ST_CB_BITMAP_H
 
 
-#include "main/mtypes.h"
+#include "main/compiler.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 +47,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 */