diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-18 11:02:46 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-18 11:02:46 +1100 |
| commit | 015871a0753cb984f8a93232a7e8334a24b08406 (patch) | |
| tree | c5123bee6f600fbe44f15b77321fb9f60aea5392 /src/mesa/pipe/cell/ppu/cell_context.h | |
| parent | c5ffd8e9afd3df1d4daf189344ec8cbf8a021143 (diff) | |
| parent | 04a5a8b3bcba64c506ee5646a3a8b737e124a66a (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/cell/ppu/cell_context.h')
| -rw-r--r-- | src/mesa/pipe/cell/ppu/cell_context.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/pipe/cell/ppu/cell_context.h b/src/mesa/pipe/cell/ppu/cell_context.h index 96f000eef4..f8d6cc5d32 100644 --- a/src/mesa/pipe/cell/ppu/cell_context.h +++ b/src/mesa/pipe/cell/ppu/cell_context.h @@ -40,10 +40,9 @@ struct cell_context struct cell_winsys *winsys; - const struct pipe_alpha_test_state *alpha_test; const struct pipe_blend_state *blend; const struct pipe_sampler_state *sampler[PIPE_MAX_SAMPLERS]; - const struct pipe_depth_stencil_state *depth_stencil; + const struct pipe_depth_stencil_alpha_state *depth_stencil; const struct pipe_rasterizer_state *rasterizer; struct pipe_blend_color blend_color; |