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

[mesa.git] / src / gallium / drivers / softpipe / sp_quad_pipe.h

diff --git a/src/gallium/drivers/softpipe/sp_quad_pipe.h b/src/gallium/drivers/softpipe/sp_quad_pipe.h
index 08513cb95f1633b86d711dcfcd2cc3a241d819a2..c0aa134831949ba164000c9d6876c4fbfa154532 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_pipe.h
+++ b/src/gallium/drivers/softpipe/sp_quad_pipe.h
@@ -28,14 +28,19 @@
 /* Authors:  Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#ifndef SP_QUAD_H
-#define SP_QUAD_H
+#ifndef SP_QUAD_PIPE_H
+#define SP_QUAD_PIPE_H
 
 
 struct softpipe_context;
 struct quad_header;
 
 
+/**
+ * Fragment processing is performed on 2x2 blocks of pixels called "quads".
+ * Quad processing is performed with a pipeline of stages represented by
+ * this type.
+ */
 struct quad_stage {
    struct softpipe_context *softpipe;
 
@@ -44,7 +49,7 @@ struct quad_stage {
    void (*begin)(struct quad_stage *qs);
 
    /** the stage action */
-   void (*run)(struct quad_stage *qs, struct quad_header *quad);
+   void (*run)(struct quad_stage *qs, struct quad_header *quad[], unsigned nr);
 
    void (*destroy)(struct quad_stage *qs);
 };
@@ -64,6 +69,4 @@ struct quad_stage *sp_quad_output_stage( struct softpipe_context *softpipe );
 
 void sp_build_quad_pipeline(struct softpipe_context *sp);
 
-void sp_depth_test_quad(struct quad_stage *qs, struct quad_header *quad);
-
-#endif /* SP_QUAD_H */
+#endif /* SP_QUAD_PIPE_H */