X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2Flp_rast.h;h=1ed27001914f8148e4cfc840e711e2bd66467774;hb=8462fe2bbf2aac87e6eabddc805b3d3ec63c6376;hp=3d2388b8948422ee676daf3ed9e2eb52fe1cd90b;hpb=b533b56750aca8c7e8cb22af93a0fc2a0cfc0d97;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h
index 3d2388b8948..1ed27001914 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast.h
@@ -41,33 +41,40 @@
 #include "lp_jit.h"
 
 
-/* Initially create and program a single rasterizer directly.  Later
- * will want multiple of these, one or two per core.  At that stage
- * will probably pass command buffers into the rasterizers rather than
- * individual function calls like this.
- */
 struct lp_rasterizer;
+struct lp_scene;
+struct lp_scene_queue;
+struct lp_fence;
 struct cmd_bin;
 struct pipe_screen;
 
+/** For sub-pixel positioning */
 #define FIXED_ORDER 4
 #define FIXED_ONE (1<<FIXED_ORDER)
 
 
+struct lp_rasterizer_task;
+
+
 /**
  * Rasterization state.
  * Objects of this type are put into the shared data bin and pointed
  * to by commands in the per-tile bins.
  */
 struct lp_rast_state {
-   /* State for the shader:
+   /* State for the shader.  This also contains state which feeds into
+    * the fragment shader, such as blend color and alpha ref value.
     */
    struct lp_jit_context jit_context;
    
    /* The shader itself.  Probably we also need to pass a pointer to
     * the tile color/z/stencil data somehow:
-    */
-   lp_jit_frag_func jit_function;
+    * jit_function[0] skips the triangle in/out test code
+    * jit_function[1] does triangle in/out testing
+     */
+   lp_jit_frag_func jit_function[2];
+
+   boolean opaque;
 };
 
 
@@ -80,6 +87,9 @@ struct lp_rast_shader_inputs {
    float (*a0)[4];
    float (*dadx)[4];
    float (*dady)[4];
+
+   /* edge/step info for 3 edges and 4x4 block of pixels */
+   PIPE_ALIGN_VAR(16) int step[3][16];
 };
 
 
@@ -90,12 +100,6 @@ struct lp_rast_shader_inputs {
  * Objects of this type are put into the setup_context::data buffer.
  */
 struct lp_rast_triangle {
-   /* bounding box of tri (in pixels) */
-   int minx;
-   int maxx;
-   int miny;
-   int maxy;
-
    /* one-pixel sized trivial accept offsets for each plane */
    int ei1;                   
    int ei2;
@@ -117,39 +121,27 @@ struct lp_rast_triangle {
    int dx31;
 
    /* edge function values at minx,miny ?? */
-   int c1;
-   int c2;
-   int c3;
-
-   int step[3][16];
+   int c1, c2, c3;
 
    /* inputs for the shader */
-   struct lp_rast_shader_inputs inputs;
+   PIPE_ALIGN_VAR(16) struct lp_rast_shader_inputs inputs;
 };
 
 
 
-struct lp_rasterizer *lp_rast_create( struct pipe_screen *screen );
+struct lp_rasterizer *lp_rast_create( struct pipe_screen *screen,
+                                      struct lp_scene_queue *empty );
 
 void lp_rast_destroy( struct lp_rasterizer * );
 
+unsigned lp_rast_get_num_threads( struct lp_rasterizer * );
 
-boolean lp_rast_begin( struct lp_rasterizer *rast,
-                       struct pipe_surface *cbuf,
-                       struct pipe_surface *zsbuf,
-                       boolean write_color,
-                       boolean write_zstencil,
-                       unsigned width,
-                       unsigned height );
-
-void
-lp_rasterize_bin( struct lp_rasterizer *rast,
-                  const struct cmd_bin *bin,
-                  int x, int y);
+void lp_rasterize_scene( struct lp_rasterizer *rast,
+			 struct lp_scene *scene,
+			 const struct pipe_framebuffer_state *fb,
+			 bool write_depth );
 
 
-void lp_rast_end( struct lp_rasterizer * );
-
 
 union lp_rast_cmd_arg {
    const struct lp_rast_shader_inputs *shade_tile;
@@ -157,12 +149,13 @@ union lp_rast_cmd_arg {
    const struct lp_rast_state *set_state;
    uint8_t clear_color[4];
    unsigned clear_zstencil;
+   struct lp_fence *fence;
 };
 
 
 /* Cast wrappers.  Hopefully these compile to noops!
  */
-static INLINE const union lp_rast_cmd_arg
+static INLINE union lp_rast_cmd_arg
 lp_rast_arg_inputs( const struct lp_rast_shader_inputs *shade_tile )
 {
    union lp_rast_cmd_arg arg;
@@ -170,7 +163,7 @@ lp_rast_arg_inputs( const struct lp_rast_shader_inputs *shade_tile )
    return arg;
 }
 
-static INLINE const union lp_rast_cmd_arg
+static INLINE union lp_rast_cmd_arg
 lp_rast_arg_triangle( const struct lp_rast_triangle *triangle )
 {
    union lp_rast_cmd_arg arg;
@@ -178,7 +171,7 @@ lp_rast_arg_triangle( const struct lp_rast_triangle *triangle )
    return arg;
 }
 
-static INLINE const union lp_rast_cmd_arg
+static INLINE union lp_rast_cmd_arg
 lp_rast_arg_state( const struct lp_rast_state *state )
 {
    union lp_rast_cmd_arg arg;
@@ -186,7 +179,16 @@ lp_rast_arg_state( const struct lp_rast_state *state )
    return arg;
 }
 
-static INLINE const union lp_rast_cmd_arg
+static INLINE union lp_rast_cmd_arg
+lp_rast_arg_fence( struct lp_fence *fence )
+{
+   union lp_rast_cmd_arg arg;
+   arg.fence = fence;
+   return arg;
+}
+
+
+static INLINE union lp_rast_cmd_arg
 lp_rast_arg_null( void )
 {
    union lp_rast_cmd_arg arg;
@@ -202,26 +204,25 @@ lp_rast_arg_null( void )
  * the bins are executed.
  */
 
-void lp_rast_clear_color( struct lp_rasterizer *, 
+void lp_rast_clear_color( struct lp_rasterizer_task *, 
                           const union lp_rast_cmd_arg );
 
-void lp_rast_clear_zstencil( struct lp_rasterizer *, 
+void lp_rast_clear_zstencil( struct lp_rasterizer_task *, 
                              const union lp_rast_cmd_arg );
 
-void lp_rast_load_color( struct lp_rasterizer *, 
+void lp_rast_load_color( struct lp_rasterizer_task *, 
                          const union lp_rast_cmd_arg );
 
-void lp_rast_load_zstencil( struct lp_rasterizer *, 
-                            const union lp_rast_cmd_arg );
-
-void lp_rast_set_state( struct lp_rasterizer *, 
+void lp_rast_set_state( struct lp_rasterizer_task *, 
                         const union lp_rast_cmd_arg );
 
-void lp_rast_triangle( struct lp_rasterizer *, 
+void lp_rast_triangle( struct lp_rasterizer_task *, 
                        const union lp_rast_cmd_arg );
 
-void lp_rast_shade_tile( struct lp_rasterizer *,
+void lp_rast_shade_tile( struct lp_rasterizer_task *,
                          const union lp_rast_cmd_arg );
 
+void lp_rast_fence( struct lp_rasterizer_task *,
+                    const union lp_rast_cmd_arg );
 
 #endif