Merge remote-tracking branch 'origin/master' into pipe-video

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

diff --git a/src/gallium/auxiliary/util/u_draw_quad.h b/src/gallium/auxiliary/util/u_draw_quad.h
index ec4862ead39f1534a5be8b9332a9d247aa488ce5..f1167786f0efc4dfccf037587e2dc81866189c67 100644 (file)
--- a/src/gallium/auxiliary/util/u_draw_quad.h
+++ b/src/gallium/auxiliary/util/u_draw_quad.h
@@ -29,20 +29,27 @@
 #define U_DRAWQUAD_H
 
 
+#include "pipe/p_compiler.h"
+#include "pipe/p_context.h"
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct pipe_buffer;
+struct pipe_resource;
+struct cso_context;
+
+#include "util/u_draw.h"
 
 extern void 
-util_draw_vertex_buffer(struct pipe_context *pipe,
-                        struct pipe_buffer *vbuf,
+util_draw_vertex_buffer(struct pipe_context *pipe, struct cso_context *cso,
+                        struct pipe_resource *vbuf, uint offset,
                         uint num_attribs, uint num_verts, uint prim_type);
 
 
 extern void 
-util_draw_texquad(struct pipe_context *pipe,
+util_draw_texquad(struct pipe_context *pipe, struct cso_context *cso,
                   float x0, float y0, float x1, float y1, float z);