Merge branch 'gallium-0.2' into gallium-winsys-private

[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 a5df8481bf8dcf8165e8648b8144d5970fbc84bf..54608f9466dafc108eebbfd7685cd108e8bd3466 100644 (file)
--- a/src/gallium/auxiliary/util/u_gen_mipmap.h
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.h
@@ -31,6 +31,11 @@
 #include "pipe/p_state.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+   
 struct pipe_context;
 struct pipe_texture;
 struct cso_context;
@@ -45,6 +50,11 @@ 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
@@ -52,10 +62,9 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
                 struct pipe_texture *pt,
                 uint face, uint baseLevel, uint lastLevel, uint filter);
 
-extern void
-util_gen_mipmap_filter(struct gen_mipmap_state *ctx,
-                       struct pipe_texture *pt,
-                       uint face, uint baseLevel, uint lastLevel, uint filter);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif