Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[mesa.git] / src / gallium / drivers / llvmpipe / lp_context.h

diff --git a/src/gallium/drivers/llvmpipe/lp_context.h b/src/gallium/drivers/llvmpipe/lp_context.h
index 32b1925b77a60c68e730b443e05c1aca275a3f79..3ad95d0bfc2f0eeffa489b8a983ce3b7e3271287 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_context.h
+++ b/src/gallium/drivers/llvmpipe/lp_context.h
@@ -28,34 +28,25 @@
 /* Authors:  Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#ifndef SP_CONTEXT_H
-#define SP_CONTEXT_H
+#ifndef LP_CONTEXT_H
+#define LP_CONTEXT_H
 
 #include "pipe/p_context.h"
 
 #include "draw/draw_vertex.h"
 
-#include "lp_quad_pipe.h"
 #include "lp_tex_sample.h"
+#include "lp_jit.h"
 
 
-/**
- * This is a temporary variable for testing draw-stage polygon stipple.
- * If zero, do stipple in lp_quad_stipple.c
- */
-#define USE_DRAW_STAGE_PSTIPPLE 1
-
-/* Number of threads working on individual quads.
- * Setting to 1 disables this feature.
- */
-#define SP_NUM_QUAD_THREADS 1
-
 struct llvmpipe_vbuf_render;
 struct draw_context;
 struct draw_stage;
 struct llvmpipe_tile_cache;
+struct llvmpipe_tex_tile_cache;
 struct lp_fragment_shader;
 struct lp_vertex_shader;
+struct lp_blend_state;
 
 
 struct llvmpipe_context {
@@ -66,11 +57,11 @@ struct llvmpipe_context {
    const struct pipe_sampler_state *sampler[PIPE_MAX_SAMPLERS];
    const struct pipe_depth_stencil_alpha_state *depth_stencil;
    const struct pipe_rasterizer_state *rasterizer;
-   const struct lp_fragment_shader *fs;
+   struct lp_fragment_shader *fs;
    const struct lp_vertex_shader *vs;
 
    /** Other rendering state */
-   struct pipe_blend_color blend_color;
+   struct pipe_blend_color blend_color[4][16];
    struct pipe_clip_state clip;
    struct pipe_constant_buffer constants[PIPE_SHADER_TYPES];
    struct pipe_framebuffer_state framebuffer;
@@ -86,7 +77,7 @@ struct llvmpipe_context {
    unsigned num_vertex_elements;
    unsigned num_vertex_buffers;
 
-   unsigned dirty; /**< Mask of SP_NEW_x flags */
+   unsigned dirty; /**< Mask of LP_NEW_x flags */
 
    /* Counter for occlusion queries.  Note this supports overlapping
     * queries.
@@ -97,9 +88,6 @@ struct llvmpipe_context {
    /** Mapped vertex buffers */
    ubyte *mapped_vbuffer[PIPE_MAX_ATTRIBS];
    
-   /** Mapped constant buffers */
-   void *mapped_constants[PIPE_SHADER_TYPES];
-
    /** Vertex format */
    struct vertex_info vertex_info;
    struct vertex_info vertex_info_vbuf;
@@ -107,30 +95,22 @@ struct llvmpipe_context {
    /** Which vertex shader output slot contains point size */
    int psize_slot;
 
-   unsigned reduced_api_prim;  /**< PIPE_PRIM_POINTS, _LINES or _TRIANGLES */
+   /* The reduced version of the primitive supplied by the state
+    * tracker.
+    */
+   unsigned reduced_api_prim;
+
+   /* The reduced primitive after unfilled triangles, wide-line
+    * decomposition, etc, are taken into account.  This is the
+    * primitive actually rasterized.
+    */
+   unsigned reduced_prim;
 
    /** Derived from scissor and surface bounds: */
    struct pipe_scissor_state cliprect;
 
    unsigned line_stipple_counter;
 
-   /** Software quad rendering pipeline */
-   struct {
-      struct quad_stage *polygon_stipple;
-      struct quad_stage *earlyz;
-      struct quad_stage *shade;
-      struct quad_stage *alpha_test;
-      struct quad_stage *stencil_test;
-      struct quad_stage *depth_test;
-      struct quad_stage *occlusion;
-      struct quad_stage *coverage;
-      struct quad_stage *blend;
-      struct quad_stage *colormask;
-      struct quad_stage *output;
-
-      struct quad_stage *first; /**< points to one of the above stages */
-   } quad[SP_NUM_QUAD_THREADS];
-
    /** TGSI exec things */
    struct {
       struct lp_shader_sampler vert_samplers[PIPE_MAX_SAMPLERS];
@@ -141,20 +121,25 @@ struct llvmpipe_context {
 
    /** The primitive drawing context */
    struct draw_context *draw;
-   struct draw_stage *setup;
+
+   /** Draw module backend */
+   struct vbuf_render *vbuf_backend;
    struct draw_stage *vbuf;
-   struct llvmpipe_vbuf_render *vbuf_render;
 
    boolean dirty_render_cache;
    
    struct llvmpipe_tile_cache *cbuf_cache[PIPE_MAX_COLOR_BUFS];
-   struct llvmpipe_tile_cache *zsbuf_cache;
+   
+   /* TODO: we shouldn't be using external interfaces internally like this */
+   struct pipe_transfer *zsbuf_transfer;
+   uint8_t *zsbuf_map;
 
-   struct llvmpipe_tile_cache *tex_cache[PIPE_MAX_SAMPLERS];
+   unsigned tex_timestamp;
+   struct llvmpipe_tex_tile_cache *tex_cache[PIPE_MAX_SAMPLERS];
 
-   unsigned use_sse : 1;
-   unsigned dump_fs : 1;
    unsigned no_rast : 1;
+
+   struct lp_jit_context jit_context;
 };
 
 
@@ -164,5 +149,5 @@ llvmpipe_context( struct pipe_context *pipe )
    return (struct llvmpipe_context *)pipe;
 }
 
-#endif /* SP_CONTEXT_H */
+#endif /* LP_CONTEXT_H */