Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

1 files changed, 5 insertions, 12 deletions

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index e81aebba3d..63150dbeaf 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -40,6 +40,9 @@ struct draw_context;
 struct draw_stage;
 struct cso_cache;
 struct cso_blend;
+struct gen_mipmap_state;
+struct blit_state;
+
 
 #define ST_NEW_MESA                    0x1 /* Mesa state has changed */
 #define ST_NEW_FRAGMENT_PROGRAM        0x2
@@ -146,18 +149,8 @@ struct st_context
       struct st_fragment_program *combined_prog;
    } bitmap;
 
-   /** For gen/render mipmap feature */
-   struct {
-      struct pipe_blend_state blend;
-      struct pipe_depth_stencil_alpha_state depthstencil;
-      struct pipe_rasterizer_state rasterizer;
-
-      void *blend_cso;
-      void *depthstencil_cso;
-      void *rasterizer_cso;
-      struct st_fragment_program *stfp;
-      struct st_vertex_program *stvp;
-   } gen_mipmap;
+   struct gen_mipmap_state *gen_mipmap;
+   struct blit_state *blit;
 
    struct cso_context *cso_context;
 };