Convert the rasterizer cso to the new semantics.

Basically make cso hold the driver specific struct, while
managing the template.

7 files changed, 29 insertions, 27 deletions

diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c
index cab8ad5cd6..e0d83ddaea 100644
--- a/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -73,7 +73,7 @@ static void update_raster_state( struct st_context *st )
 {
    GLcontext *ctx = st->ctx;
    struct pipe_rasterizer_state raster;
-   const struct pipe_rasterizer_state *cached;
+   const struct cso_rasterizer *cso;
 
    memset(&raster, 0, sizeof(raster));
    
@@ -206,10 +206,10 @@ static void update_raster_state( struct st_context *st )
    if (ctx->Scissor.Enabled)
       raster.scissor = 1;
 
-   cached = st_cached_rasterizer_state(st, &raster);
-   if (st->state.rasterizer != cached) {
-      st->state.rasterizer = cached;
-      st->pipe->bind_rasterizer_state( st->pipe, cached );
+   cso = st_cached_rasterizer_state(st, &raster);
+   if (st->state.rasterizer != cso) {
+      st->state.rasterizer = cso;
+      st->pipe->bind_rasterizer_state(st->pipe, cso->data);
    }
 }
 
diff --git a/src/mesa/state_tracker/st_cache.c b/src/mesa/state_tracker/st_cache.c
index bd6c63b7a1..0f233cea58 100644
--- a/src/mesa/state_tracker/st_cache.c
+++ b/src/mesa/state_tracker/st_cache.c
@@ -95,22 +95,24 @@ struct pipe_depth_stencil_state * st_cached_depth_stencil_state(
    return (struct pipe_depth_stencil_state*)(cso_hash_iter_data(iter));
 }
 
-struct pipe_rasterizer_state * st_cached_rasterizer_state(
+const struct cso_rasterizer* st_cached_rasterizer_state(
    struct st_context *st,
-   const struct pipe_rasterizer_state *raster)
+   const struct pipe_rasterizer_state *templ)
 {
-   unsigned hash_key = cso_construct_key((void*)raster,
+   unsigned hash_key = cso_construct_key((void*)templ,
                                          sizeof(struct pipe_rasterizer_state));
    struct cso_hash_iter iter = cso_find_state_template(st->cache,
                                                        hash_key, CSO_RASTERIZER,
-                                                       (void*)raster);
+                                                       (void*)templ);
    if (cso_hash_iter_is_null(iter)) {
-      const struct pipe_rasterizer_state *created_state =
-         st->pipe->create_rasterizer_state(st->pipe, raster);
-      iter = cso_insert_state(st->cache, hash_key, CSO_RASTERIZER,
-                              (void*)created_state);
+      struct cso_rasterizer *cso = malloc(sizeof(struct cso_rasterizer));
+      memcpy(&cso->state, templ, sizeof(struct pipe_rasterizer_state));
+      cso->data = st->pipe->create_rasterizer_state(st->pipe, templ);
+      if (!cso->data)
+         cso->data = &cso->state;
+      iter = cso_insert_state(st->cache, hash_key, CSO_RASTERIZER, cso);
    }
-   return (struct pipe_rasterizer_state*)(cso_hash_iter_data(iter));
+   return (struct cso_rasterizer*)(cso_hash_iter_data(iter));
 }
 
 struct pipe_shader_state * st_cached_fs_state(
diff --git a/src/mesa/state_tracker/st_cache.h b/src/mesa/state_tracker/st_cache.h
index fb0ff0d4db..5b8c6168a8 100644
--- a/src/mesa/state_tracker/st_cache.h
+++ b/src/mesa/state_tracker/st_cache.h
@@ -51,9 +51,9 @@ struct pipe_depth_stencil_state *st_cached_depth_stencil_state(
    struct st_context *st,
    const struct pipe_depth_stencil_state *depth_stencil);
 
-struct pipe_rasterizer_state *st_cached_rasterizer_state(
-   struct st_context *st,
-   const struct pipe_rasterizer_state *raster);
+const struct cso_rasterizer *
+st_cached_rasterizer_state(struct st_context *st,
+                           const struct pipe_rasterizer_state *raster);
 
 struct pipe_shader_state *st_cached_fs_state(
    struct st_context *st,
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index 3a6991754a..5d5efd9eae 100644
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -345,7 +345,7 @@ clear_with_quad(GLcontext *ctx,
    /* setup state: nothing */
    {
       struct pipe_rasterizer_state raster;
-      const struct pipe_rasterizer_state *cached;
+      const struct cso_rasterizer *cso;
       memset(&raster, 0, sizeof(raster));
 #if 0
       /* don't do per-pixel scissor; we'll just draw a PIPE_PRIM_QUAD
@@ -354,8 +354,8 @@ clear_with_quad(GLcontext *ctx,
       if (ctx->Scissor.Enabled)
          raster.scissor = 1;
 #endif
-      cached = st_cached_rasterizer_state(ctx->st, &raster);
-      pipe->bind_rasterizer_state(pipe, cached);
+      cso = st_cached_rasterizer_state(ctx->st, &raster);
+      pipe->bind_rasterizer_state(pipe, cso->data);
    }
 
    /* fragment shader state: color pass-through program */
@@ -415,7 +415,7 @@ clear_with_quad(GLcontext *ctx,
    pipe->bind_depth_stencil_state(pipe, st->state.depth_stencil);
    pipe->bind_fs_state(pipe, st->state.fs);
    pipe->bind_vs_state(pipe, st->state.vs);
-   pipe->bind_rasterizer_state(pipe, st->state.rasterizer);
+   pipe->bind_rasterizer_state(pipe, st->state.rasterizer->data);
    pipe->set_viewport_state(pipe, &ctx->st->state.viewport);
    /* OR:
    st_invalidate_state(ctx, _NEW_COLOR | _NEW_DEPTH | _NEW_STENCIL);
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 4a554cd5a4..0fd728c930 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -328,12 +328,12 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
    /* setup state: just scissor */
    {
       struct pipe_rasterizer_state  setup;
-      struct pipe_rasterizer_state *cached;
+      const struct cso_rasterizer  *cso;
       memset(&setup, 0, sizeof(setup));
       if (ctx->Scissor.Enabled)
          setup.scissor = 1;
-      cached = st_cached_rasterizer_state(ctx->st, &setup);
-      pipe->bind_rasterizer_state(pipe, cached);
+      cso = st_cached_rasterizer_state(ctx->st, &setup);
+      pipe->bind_rasterizer_state(pipe, cso->data);
    }
 
    /* fragment shader state: TEX lookup program */
@@ -417,7 +417,7 @@ draw_textured_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
    draw_quad(ctx, x0, y0, z, x1, y1);
 
    /* restore GL state */
-   pipe->bind_rasterizer_state(pipe, ctx->st->state.rasterizer);
+   pipe->bind_rasterizer_state(pipe, ctx->st->state.rasterizer->data);
    pipe->bind_fs_state(pipe, ctx->st->state.fs);
    pipe->bind_vs_state(pipe, ctx->st->state.vs);
    pipe->set_texture_state(pipe, unit, ctx->st->state.texture[unit]);
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 966574b67c..93b6425480 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -78,7 +78,7 @@ struct st_context
       const struct cso_blend *blend;
       const struct pipe_sampler_state *sampler[PIPE_MAX_SAMPLERS];
       const struct pipe_depth_stencil_state *depth_stencil;
-      const struct pipe_rasterizer_state  *rasterizer;
+      const struct cso_rasterizer  *rasterizer;
       const struct pipe_shader_state *fs;
       const struct pipe_shader_state *vs;
 
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 6efe3ce8b8..e36c10d595 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -404,7 +404,7 @@ st_feedback_draw_vbo(GLcontext *ctx,
    assert(draw);
    draw_set_viewport_state(draw, &st->state.viewport);
    draw_set_clip_state(draw, &st->state.clip);
-   draw_set_rasterizer_state(draw, st->state.rasterizer);
+   draw_set_rasterizer_state(draw, st->state.rasterizer->data);
    draw_set_vertex_shader(draw, st->state.vs);
    /* XXX need to set vertex info too */