X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fpipe%2Fi915simple%2Fi915_context.h;h=dc19b6efeb9e627a9ee54a6fa0541571575cd645;hb=d0bca086ab6d032909e9a429720fea297c536f97;hp=51baa281ec573a1c1baee701cb71366ccf4f095d;hpb=f117327a3f246713abfd4dc4320d4a1a7f1b811a;p=mesa.git

diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/mesa/pipe/i915simple/i915_context.h
index 51baa281ec5..dc19b6efeb9 100644
--- a/src/mesa/pipe/i915simple/i915_context.h
+++ b/src/mesa/pipe/i915simple/i915_context.h
@@ -113,31 +113,65 @@ struct i915_state
    unsigned id;			/* track lost context events */
 };
 
+struct i915_blend_state {
+   unsigned iab;
+   unsigned modes4;
+   unsigned LIS5;
+   unsigned LIS6;
+};
+
+struct i915_depth_stencil_state {
+   unsigned stencil_modes4;
+   unsigned bfo[2];
+   unsigned stencil_LIS5;
+   unsigned depth_LIS6;
+};
+
+struct i915_rasterizer_state {
+   int light_twoside : 1;
+   unsigned st;
+   interp_mode color_interp;
+
+   unsigned LIS4;
+   unsigned LIS7;
+   unsigned sc[1];
+
+   const struct pipe_rasterizer_state *templ;
 
+   union { float f; unsigned u; } ds[2];
+};
+
+struct i915_sampler_state {
+   unsigned state[3];
+   const struct pipe_sampler_state *templ;
+};
+
+struct i915_alpha_test_state {
+   unsigned LIS6;
+};
 
 struct i915_context
 {
-   struct pipe_context pipe; 
+   struct pipe_context pipe;
    struct i915_winsys *winsys;
    struct draw_context *draw;
 
    /* The most recent drawing state as set by the driver:
     */
-   const struct pipe_blend_state   *blend;
-   const struct pipe_sampler_state *sampler[PIPE_MAX_SAMPLERS];
+   const struct i915_alpha_test_state      *alpha_test;
+   const struct i915_blend_state           *blend;
+   const struct i915_sampler_state         *sampler[PIPE_MAX_SAMPLERS];
+   const struct i915_depth_stencil_state   *depth_stencil;
+   const struct i915_rasterizer_state      *rasterizer;
+   const struct pipe_shader_state *fs;
 
-   struct pipe_alpha_test_state alpha_test;
    struct pipe_blend_color blend_color;
    struct pipe_clear_color_state clear_color;
    struct pipe_clip_state clip;
    struct pipe_constant_buffer constants[PIPE_SHADER_TYPES];
-   struct pipe_depth_state depth_test;
    struct pipe_framebuffer_state framebuffer;
-   struct pipe_shader_state fs;
    struct pipe_poly_stipple poly_stipple;
    struct pipe_scissor_state scissor;
-   struct pipe_setup_state setup;
-   struct pipe_stencil_state stencil;
    struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
    struct pipe_viewport_state viewport;
    struct pipe_vertex_buffer vertex_buffer[PIPE_ATTRIB_MAX];
@@ -160,19 +194,18 @@ struct i915_context
 /* A flag for each state_tracker state object:
  */
 #define I915_NEW_VIEWPORT      0x1
-#define I915_NEW_SETUP         0x2
+#define I915_NEW_RASTERIZER    0x2
 #define I915_NEW_FS            0x4
 #define I915_NEW_BLEND         0x8
-#define I915_NEW_CLIP         0x10
-#define I915_NEW_SCISSOR      0x20
-#define I915_NEW_STIPPLE      0x40
-#define I915_NEW_FRAMEBUFFER  0x80
-#define I915_NEW_ALPHA_TEST  0x100
-#define I915_NEW_DEPTH_TEST  0x200
-#define I915_NEW_SAMPLER     0x400
-#define I915_NEW_TEXTURE     0x800
-#define I915_NEW_STENCIL    0x1000
-#define I915_NEW_CONSTANTS  0x2000
+#define I915_NEW_CLIP          0x10
+#define I915_NEW_SCISSOR       0x20
+#define I915_NEW_STIPPLE       0x40
+#define I915_NEW_FRAMEBUFFER   0x80
+#define I915_NEW_ALPHA_TEST    0x100
+#define I915_NEW_DEPTH_STENCIL 0x200
+#define I915_NEW_SAMPLER       0x400
+#define I915_NEW_TEXTURE       0x800
+#define I915_NEW_CONSTANTS     0x1000
 
 
 /* Driver's internally generated state flags: