st/mesa: Combine the DrawPixels and Bitmap passthrough VS programs.

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

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.h b/src/mesa/state_tracker/st_cb_drawpixels.h
index b8a34952141b2f455a0dd781c9376cecfee5a573..88142c3f9ab81cc1319a385aa68df5f86bda0961 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.h
+++ b/src/mesa/state_tracker/st_cb_drawpixels.h
@@ -30,7 +30,6 @@
 #define ST_CB_DRAWPIXELS_H
 
 
-#include "main/compiler.h"
 #include <stdbool.h>
 
 struct dd_function_table;
@@ -44,6 +43,11 @@ st_destroy_drawpix(struct st_context *st);
 extern const struct tgsi_token *
 st_get_drawpix_shader(const struct tgsi_token *tokens, bool use_texcoord,
                       bool scale_and_bias, unsigned scale_const,
-                      unsigned bias_const, bool pixel_maps);
+                      unsigned bias_const, bool pixel_maps,
+                      unsigned drawpix_sampler, unsigned pixelmap_sampler,
+                      unsigned texcoord_const, unsigned tex_target);
+
+extern void
+st_make_passthrough_vertex_shader(struct st_context *st);
 
 #endif /* ST_CB_DRAWPIXELS_H */