Squashed commit of the following:

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

diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.h b/src/gallium/auxiliary/util/u_gen_mipmap.h
index 80496140a24a845f437c4bb4f40b9d2d6cb193bb..a7502b9982b082add8a550e36b61ff50bc5e835a 100644 (file)
--- a/src/gallium/auxiliary/util/u_gen_mipmap.h
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.h
@@ -31,22 +31,40 @@
 #include "pipe/p_state.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+   
+struct pipe_context;
+struct pipe_resource;
+struct cso_context;
+
 struct gen_mipmap_state;
 
 
 extern struct gen_mipmap_state *
-util_create_gen_mipmap(struct pipe_context *pipe);
+util_create_gen_mipmap(struct pipe_context *pipe, struct cso_context *cso);
 
 
 extern void
 util_destroy_gen_mipmap(struct gen_mipmap_state *ctx);
 
+/* Release vertex buffer at end of frame to avoid synchronous
+ * rendering.
+ */
+extern void 
+util_gen_mipmap_flush( struct gen_mipmap_state *ctx );
 
 
 extern void
 util_gen_mipmap(struct gen_mipmap_state *ctx,
-                struct pipe_texture *pt,
-                uint face, uint baseLevel, uint lastLevel);
+                struct pipe_sampler_view *psv,
+                uint face, uint baseLevel, uint lastLevel, uint filter);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif