diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2007-06-14 18:23:43 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-06-14 18:23:43 +0100 |
| commit | 943964a1e5bad86bdceb0a06d60fb3b302ebce6a (patch) | |
| tree | a4ed47408b6d7a856b510ae68230d0ba3479071f /src/mesa/state_tracker/st_context.h | |
| parent | 6393cda6766b707ef01e925d378239a66d143ae0 (diff) | |
Rename directories again?!
Some git wierdness going on.
Diffstat (limited to 'src/mesa/state_tracker/st_context.h')
| -rw-r--r-- | src/mesa/state_tracker/st_context.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 317d377371..6d9460e2f0 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -29,7 +29,7 @@ #define ST_CONTEXT_H #include "mtypes.h" -#include "softpipe/sp_state.h" +#include "pipe/p_state.h" struct st_context; @@ -58,23 +58,23 @@ struct st_context { GLcontext *ctx; - struct softpipe_context *softpipe; + struct pipe_context *pipe; - /* Eventually will use a cache to feed the softpipe with + /* Eventually will use a cache to feed the pipe with * create/bind/delete calls to constant state objects. Not yet * though, we just shove random objects across the interface. */ struct { - struct softpipe_viewport viewport; - struct softpipe_setup_state setup; - struct softpipe_fs_state fs; - struct softpipe_blend_state blend; - struct softpipe_surface cbuf; - struct softpipe_clip_state clip; - struct softpipe_depth_state depth; - struct softpipe_scissor_rect scissor; - struct softpipe_poly_stipple poly_stipple; - struct softpipe_stencil_state stencil; + struct pipe_viewport viewport; + struct pipe_setup_state setup; + struct pipe_fs_state fs; + struct pipe_blend_state blend; + struct pipe_surface cbuf; + struct pipe_clip_state clip; + struct pipe_depth_state depth; + struct pipe_scissor_rect scissor; + struct pipe_poly_stipple poly_stipple; + struct pipe_stencil_state stencil; } state; struct { |