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

diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h
index f40208bbda9..1ed27001914 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast.h
@@ -25,104 +25,121 @@
  *
  **************************************************************************/
 
+/**
+ * The rast code is concerned with rasterization of command bins.
+ * Each screen tile has a bin associated with it.  To render the
+ * scene we iterate over the tile bins and execute the commands
+ * in each bin.
+ * We'll do that with multiple threads...
+ */
+
+
 #ifndef LP_RAST_H
 #define LP_RAST_H
 
+#include "pipe/p_compiler.h"
 #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)
+
 
-#define TILESIZE 64
+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 jc;
+   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 shader;
+    * 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;
 };
 
-/* Coefficients necessary to run the shader at a given location:
+
+/**
+ * Coefficients necessary to run the shader at a given location.
+ * First coefficient is position.
+ * These pointers point into the bin data buffer.
  */
 struct lp_rast_shader_inputs {
+   float (*a0)[4];
+   float (*dadx)[4];
+   float (*dady)[4];
 
-   /* Current rasterizer state:
-    */
-   const struct lp_rast_state *state;
-
-   /* Attribute interpolation:  FIXME: reduce memory waste!
-    */
-   float a0[PIPE_MAX_ATTRIBS][4];
-   float dadx[PIPE_MAX_ATTRIBS][4];
-   float dady[PIPE_MAX_ATTRIBS][4];
+   /* edge/step info for 3 edges and 4x4 block of pixels */
+   PIPE_ALIGN_VAR(16) int step[3][16];
 };
 
 
-/* Rasterization information for a triangle known to be in this bin,
+/**
+ * Rasterization information for a triangle known to be in this bin,
  * plus inputs to run the shader:
+ * These fields are tile- and bin-independent.
+ * Objects of this type are put into the setup_context::data buffer.
  */
 struct lp_rast_triangle {
    /* one-pixel sized trivial accept offsets for each plane */
-   float ei1;                   
-   float ei2;
-   float ei3;
+   int ei1;                   
+   int ei2;
+   int ei3;
 
    /* one-pixel sized trivial reject offsets for each plane */
-   float eo1;                   
-   float eo2;
-   float eo3;
-
-   /* y deltas for vertex pairs */
-   float dy12;
-   float dy23;
-   float dy31;
-
-   /* x deltas for vertex pairs */
-   float dx12;
-   float dx23;
-   float dx31;
-
-   /* State to run the shader: */
-   struct lp_rast_shader_inputs inputs;
-};
+   int eo1;                   
+   int eo2;
+   int eo3;
 
-struct clear_tile {
-   boolean do_color;
-   boolean do_depth_stencil;
-   unsigned rgba;
-   unsigned depth_stencil;
-};
+   /* y deltas for vertex pairs (in fixed pt) */
+   int dy12;
+   int dy23;
+   int dy31;
+
+   /* x deltas for vertex pairs (in fixed pt) */
+   int dx12;
+   int dx23;
+   int dx31;
 
-struct load_tile {
-   boolean do_color;
-   boolean do_depth_stencil;
+   /* edge function values at minx,miny ?? */
+   int c1, c2, c3;
+
+   /* inputs for the shader */
+   PIPE_ALIGN_VAR(16) struct lp_rast_shader_inputs inputs;
 };
 
 
-struct lp_rasterizer *lp_rast_create( void );
 
-void lp_rast_bind_surfaces( struct lp_rasterizer *,
-			    struct pipe_surface *color,
-			    struct pipe_surface *zstencil,
-			    const float *clear_color,
-			    double clear_depth,
-			    unsigned clear_stencil);
+struct lp_rasterizer *lp_rast_create( struct pipe_screen *screen,
+                                      struct lp_scene_queue *empty );
 
-/* Begining of each tile:
- */
-void lp_rast_start_tile( struct lp_rasterizer *,
-			 unsigned x,
-			 unsigned y );
+void lp_rast_destroy( struct lp_rasterizer * );
+
+unsigned lp_rast_get_num_threads( struct lp_rasterizer * );
+
+void lp_rasterize_scene( struct lp_rasterizer *rast,
+			 struct lp_scene *scene,
+			 const struct pipe_framebuffer_state *fb,
+			 bool write_depth );
 
 
 
@@ -130,42 +147,82 @@ union lp_rast_cmd_arg {
    const struct lp_rast_shader_inputs *shade_tile;
    const struct lp_rast_triangle *triangle;
    const struct lp_rast_state *set_state;
+   uint8_t clear_color[4];
+   unsigned clear_zstencil;
+   struct lp_fence *fence;
 };
 
 
-/* Binnable Commands:
+/* Cast wrappers.  Hopefully these compile to noops!
+ */
+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;
+   arg.shade_tile = shade_tile;
+   return arg;
+}
+
+static INLINE union lp_rast_cmd_arg
+lp_rast_arg_triangle( const struct lp_rast_triangle *triangle )
+{
+   union lp_rast_cmd_arg arg;
+   arg.triangle = triangle;
+   return arg;
+}
+
+static INLINE union lp_rast_cmd_arg
+lp_rast_arg_state( const struct lp_rast_state *state )
+{
+   union lp_rast_cmd_arg arg;
+   arg.set_state = state;
+   return 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;
+   arg.set_state = NULL;
+   return arg;
+}
+
+
+
+/**
+ * Binnable Commands.
+ * These get put into bins by the setup code and are called when
+ * the bins are executed.
  */
-void lp_rast_clear_color( struct lp_rasterizer *, 
-                          const union lp_rast_cmd_arg *);
-
-void lp_rast_clear_zstencil( struct lp_rasterizer *, 
-                             const union lp_rast_cmd_arg *);
-
-void lp_rast_load_color( struct lp_rasterizer *, 
-                         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 *, 
-                        const union lp_rast_cmd_arg * );
 
-void lp_rast_triangle( struct lp_rasterizer *, 
-                       const union lp_rast_cmd_arg * );
+void lp_rast_clear_color( struct lp_rasterizer_task *, 
+                          const union lp_rast_cmd_arg );
 
-void lp_rast_shade_tile( struct lp_rasterizer *,
-                         const union lp_rast_cmd_arg * );
+void lp_rast_clear_zstencil( struct lp_rasterizer_task *, 
+                             const union lp_rast_cmd_arg );
 
-void lp_rast_store_color( struct lp_rasterizer *,
-                          const union lp_rast_cmd_arg *);
+void lp_rast_load_color( struct lp_rasterizer_task *, 
+                         const union lp_rast_cmd_arg );
 
-void lp_rast_store_zstencil( struct lp_rasterizer *,
-                             const union lp_rast_cmd_arg *);
+void lp_rast_set_state( struct lp_rasterizer_task *, 
+                        const union lp_rast_cmd_arg );
 
+void lp_rast_triangle( struct lp_rasterizer_task *, 
+                       const union lp_rast_cmd_arg );
 
-/* Shutdown:
- */
-void lp_rast_destroy( 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