updates for depth/stencil/alpha state

diff --git a/src/mesa/pipe/cell/ppu/cell_context.c b/src/mesa/pipe/cell/ppu/cell_context.c
index b448a8aa8cd6bbe7f4c05ab203832c6104199dcc..281fc6ec31f13dd9c270d12281b7dcf9e19e8a71 100644 (file)
--- a/src/mesa/pipe/cell/ppu/cell_context.c
+++ b/src/mesa/pipe/cell/ppu/cell_context.c
@@ -184,9 +184,9 @@ cell_create_context(struct pipe_winsys *winsys, struct cell_winsys *cws)
    cell->pipe.bind_sampler_state   = cell_bind_sampler_state;
    cell->pipe.delete_sampler_state = cell_delete_sampler_state;
 
-   cell->pipe.create_depth_stencil_state = cell_create_depth_stencil_state;
-   cell->pipe.bind_depth_stencil_state   = cell_bind_depth_stencil_state;
-   cell->pipe.delete_depth_stencil_state = cell_delete_depth_stencil_state;
+   cell->pipe.create_depth_stencil_alpha_state = cell_create_depth_stencil_alpha_state;
+   cell->pipe.bind_depth_stencil_alpha_state   = cell_bind_depth_stencil_alpha_state;
+   cell->pipe.delete_depth_stencil_alpha_state = cell_delete_depth_stencil_alpha_state;
 
    cell->pipe.create_rasterizer_state = cell_create_rasterizer_state;
    cell->pipe.bind_rasterizer_state   = cell_bind_rasterizer_state;

diff --git a/src/mesa/pipe/cell/ppu/cell_state.h b/src/mesa/pipe/cell/ppu/cell_state.h
index b01814202d99ce49598147538a2add909276e6fc..63dbac2f02d9bae3ca818bf2469cba13ed995a77 100644 (file)
--- a/src/mesa/pipe/cell/ppu/cell_state.h
+++ b/src/mesa/pipe/cell/ppu/cell_state.h
@@ -49,14 +49,14 @@ cell_delete_sampler_state(struct pipe_context *, void *);
 
 
 extern void *
-cell_create_depth_stencil_state(struct pipe_context *,
+cell_create_depth_stencil_alpha_state(struct pipe_context *,
                                 const struct pipe_depth_stencil_alpha_state *);
 
 extern void
-cell_bind_depth_stencil_state(struct pipe_context *, void *);
+cell_bind_depth_stencil_alpha_state(struct pipe_context *, void *);
 
 extern void
-cell_delete_depth_stencil_state(struct pipe_context *, void *);
+cell_delete_depth_stencil_alpha_state(struct pipe_context *, void *);
 
 
 void *cell_create_fs_state(struct pipe_context *,

diff --git a/src/mesa/pipe/cell/ppu/cell_state_blend.c b/src/mesa/pipe/cell/ppu/cell_state_blend.c
index efcb9e38a4c0a90610e14246218d776ba399e789..da3fcfd3a55143fb053d5668083d433561c2f2ab 100644 (file)
--- a/src/mesa/pipe/cell/ppu/cell_state_blend.c
+++ b/src/mesa/pipe/cell/ppu/cell_state_blend.c
@@ -71,8 +71,8 @@ void cell_set_blend_color( struct pipe_context *pipe,
 
 
 void *
-cell_create_depth_stencil_state(struct pipe_context *pipe,
-                              const struct pipe_depth_stencil_alpha_state *depth_stencil)
+cell_create_depth_stencil_alpha_state(struct pipe_context *pipe,
+                                      const struct pipe_depth_stencil_alpha_state *depth_stencil)
 {
    struct pipe_depth_stencil_alpha_state *state =
       MALLOC( sizeof(struct pipe_depth_stencil_alpha_state) );
@@ -81,8 +81,8 @@ cell_create_depth_stencil_state(struct pipe_context *pipe,
 }
 
 void
-cell_bind_depth_stencil_state(struct pipe_context *pipe,
-                                  void *depth_stencil)
+cell_bind_depth_stencil_alpha_state(struct pipe_context *pipe,
+                                    void *depth_stencil)
 {
    struct cell_context *cell = cell_context(pipe);
 
@@ -92,7 +92,7 @@ cell_bind_depth_stencil_state(struct pipe_context *pipe,
 }
 
 void
-cell_delete_depth_stencil_state(struct pipe_context *pipe, void *depth)
+cell_delete_depth_stencil_alpha_state(struct pipe_context *pipe, void *depth)
 {
    FREE( depth );
 }