Merge branch 'gallium-s3tc'

[mesa.git] / src / gallium / auxiliary / util / u_blit.h

diff --git a/src/gallium/auxiliary/util/u_blit.h b/src/gallium/auxiliary/util/u_blit.h
index a349be99ad8249ae907626964d4f288b77e5ada9..c35beceda8d64e986c847a61b29382ff573df565 100644 (file)
--- a/src/gallium/auxiliary/util/u_blit.h
+++ b/src/gallium/auxiliary/util/u_blit.h
@@ -30,22 +30,26 @@
 #define U_BLIT_H
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+   
 struct pipe_context;
 struct pipe_surface;
+struct pipe_texture;
+struct cso_context;
 
 
 struct blit_state;
 
 
 extern struct blit_state *
-util_create_blit(struct pipe_context *pipe);
-
+util_create_blit(struct pipe_context *pipe, struct cso_context *cso);
 
 extern void
 util_destroy_blit(struct blit_state *ctx);
 
-
-
 extern void
 util_blit_pixels(struct blit_state *ctx,
                  struct pipe_surface *src,
@@ -56,5 +60,23 @@ util_blit_pixels(struct blit_state *ctx,
                  int dstX1, int dstY1,
                  float z, uint filter);
 
+extern void
+util_blit_pixels_tex(struct blit_state *ctx,
+                     struct pipe_texture *tex,
+                     int srcX0, int srcY0,
+                     int srcX1, int srcY1,
+                     struct pipe_surface *dst,
+                     int dstX0, int dstY0,
+                     int dstX1, int dstY1,
+                     float z, uint filter);
+
+/* Call at end of frame to avoid synchronous rendering.
+ */
+extern void
+util_blit_flush( struct blit_state *ctx );
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif