include surface.offset in address calculations

[mesa.git] / src / mesa / pipe / softpipe / sp_context.h

diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index a87330136846bccc0e490047cc8843ff1f1a34eb..a99c083caa535875befdd009c26c66c22785c662 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -28,19 +28,20 @@
 /* Authors:  Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#ifndef G_CONTEXT_H
-#define G_CONTEXT_H
+#ifndef SP_CONTEXT_H
+#define SP_CONTEXT_H
 
 #include "glheader.h"
 
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
 
-
+#include "sp_quad.h"
 
 struct softpipe_surface;
+struct softpipe_winsys;
 struct draw_context;
-struct prim_stage;
+struct draw_stage;
 
 
 enum interp_mode {
@@ -50,84 +51,102 @@ enum interp_mode {
 };
 
 
-#define G_NEW_VIEWPORT  0x1
-#define G_NEW_SETUP     0x2
-#define G_NEW_FS        0x4
-#define G_NEW_BLEND     0x8
-#define G_NEW_CLIP      0x20
-#define G_NEW_SCISSOR   0x40
-#define G_NEW_STIPPLE   0x80
-#define G_NEW_FRAMEBUFFER 0x100
-#define G_NEW_ALPHA_TEST  0x200
+#define SP_NEW_VIEWPORT      0x1
+#define SP_NEW_SETUP         0x2
+#define SP_NEW_FS            0x4
+#define SP_NEW_BLEND         0x8
+#define SP_NEW_CLIP         0x10
+#define SP_NEW_SCISSOR      0x20
+#define SP_NEW_STIPPLE      0x40
+#define SP_NEW_FRAMEBUFFER  0x80
+#define SP_NEW_ALPHA_TEST  0x100
+#define SP_NEW_DEPTH_TEST  0x200
+#define SP_NEW_SAMPLER     0x400
+#define SP_NEW_TEXTURE     0x800
+#define SP_NEW_STENCIL    0x1000
 
 
 struct softpipe_context {     
-   struct pipe_context pipe;
+   struct pipe_context pipe;  /**< base class */
+   struct softpipe_winsys *winsys;     /**< window system interface */
 
 
    /* The most recent drawing state as set by the driver:
     */
-   struct pipe_framebuffer_state framebuffer;
-   struct pipe_viewport     viewport;
-   struct pipe_setup_state  setup;
-   struct pipe_fs_state     fs;
-   struct pipe_blend_state  blend;
    struct pipe_alpha_test_state alpha_test;
-   struct pipe_clip_state   clip;
-   struct pipe_scissor_rect scissor;
+   struct pipe_blend_state blend;
+   struct pipe_blend_color blend_color;
+   struct pipe_clear_color_state clear_color;
+   struct pipe_clip_state clip;
+   struct pipe_depth_state depth_test;
+   struct pipe_framebuffer_state framebuffer;
+   struct pipe_fs_state fs;
    struct pipe_poly_stipple poly_stipple;
+   struct pipe_scissor_state scissor;
+   struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
+   struct pipe_setup_state setup;
+   struct pipe_stencil_state stencil;
+   struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
+   struct pipe_viewport_state viewport;
    GLuint dirty;
 
-   /* Clip derived state:
-    */
-   GLfloat plane[12][4];
-   GLuint nr_planes;
-
    /* Setup derived state.  TODO: this should be passed in the program
     * tokens as parameters to DECL instructions.
     * 
     * For now we just set colors to CONST on flatshade, textures to
     * perspective always and everything else to linear.
     */
-   enum interp_mode interp[VF_ATTRIB_MAX];
+   enum interp_mode interp[PIPE_ATTRIB_MAX];
 
 
    /* FS + setup derived state:
     */
-   GLuint fp_attr_to_slot[VF_ATTRIB_MAX];
-   GLuint vf_attr_to_slot[VF_ATTRIB_MAX];
+
+   /** Map fragment program attribute to quad/coef array slot */
+   GLuint fp_attr_to_slot[PIPE_ATTRIB_MAX];
+   /** Map vertex format attribute to a vertex attribute slot */
+   GLuint vf_attr_to_slot[PIPE_ATTRIB_MAX];
    GLuint nr_attrs;
-   GLuint nr_frag_attrs;
-   GLuint attr_mask;
+   GLuint nr_frag_attrs;  /**< number of active fragment attribs */
+   GLbitfield attr_mask;  /**< bitfield of VF_ATTRIB_ indexes/bits */
 
-   GLboolean need_z;
-   GLboolean need_w;
+   GLboolean need_z;  /**< produce quad/fragment Z values? */
+   GLboolean need_w;  /**< produce quad/fragment W values? */
 
+#if 0
    /* Stipple derived state:
     */
    GLubyte stipple_masks[16][16];
+#endif
 
+   /** Derived from scissor and surface bounds: */
+   struct pipe_scissor_state cliprect;
 
-   /* The software clipper/setup engine.  
-    */
-   struct {
-      struct prim_stage *setup;
-      struct prim_stage *unfilled;
-      struct prim_stage *twoside;
-      struct prim_stage *clip;
-      struct prim_stage *flatshade;
-      struct prim_stage *offset;
-      struct prim_stage *cull;
-
-      struct prim_stage *first;
+   GLuint occlusion_counter;
 
-      GLenum prim;
-      GLuint vertex_size;
-   } prim;
+   GLuint line_stipple_counter;
 
-   /* Temp kludge:
-    */
+   /** Software quad rendering pipeline */
+   struct {
+      struct quad_stage *polygon_stipple;
+      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 *bufloop;
+      struct quad_stage *blend;
+      struct quad_stage *colormask;
+      struct quad_stage *output;
+
+      struct quad_stage *first; /**< points to one of the above stages */
+   } quad;
+
+   /** The primitive drawing context */
    struct draw_context *draw;
+
+   struct pipe_surface *cbuf;      /**< current color buffer (one of cbufs) */
 };
 
 
@@ -140,6 +159,4 @@ softpipe_context( struct pipe_context *pipe )
 }
 
 
-
-
-#endif
+#endif /* SP_CONTEXT_H */