diff options
| author | Brian <[email protected]> | 2008-01-01 15:09:16 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2008-01-01 15:18:04 -0700 |
| commit | 292bbd4a7250b96c4edadc2da5ebb7fc72b6159f (patch) | |
| tree | b792f8e6feac8b37bec9b413e81e0ddf898722f0 | |
| parent | 520a455f55f6c6c529dc6b725a5225793c0b4b01 (diff) | |
move SP_NEW_ #defines into sp_state.h
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_context.h | 16 | ||||
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_state.h | 21 |
2 files changed, 21 insertions, 16 deletions
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h index 8f14dd11d17..0b25e4c40b9 100644 --- a/src/mesa/pipe/softpipe/sp_context.h +++ b/src/mesa/pipe/softpipe/sp_context.h @@ -45,22 +45,6 @@ struct draw_stage; struct softpipe_tile_cache; -#define SP_NEW_VIEWPORT 0x1 -#define SP_NEW_RASTERIZER 0x2 -#define SP_NEW_FS 0x4 -#define SP_NEW_BLEND 0x8 -#define SP_NEW_CLIP 0x10 -#define SP_NEW_SCISSOR 0x20 -#define SP_NEW_STIPPLE 0x40 -#define SP_NEW_FRAMEBUFFER 0x80 -#define SP_NEW_DEPTH_STENCIL_ALPHA 0x100 -#define SP_NEW_CONSTANTS 0x200 -#define SP_NEW_SAMPLER 0x400 -#define SP_NEW_TEXTURE 0x800 -#define SP_NEW_VERTEX 0x1000 -#define SP_NEW_VS 0x2000 -#define SP_NEW_QUERY 0x4000 - struct sp_vertex_shader_state { struct pipe_shader_state *state; void *draw_data; diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/mesa/pipe/softpipe/sp_state.h index 76b79b52803..ed16228ea2d 100644 --- a/src/mesa/pipe/softpipe/sp_state.h +++ b/src/mesa/pipe/softpipe/sp_state.h @@ -35,10 +35,31 @@ #include "x86/rtasm/x86sse.h" + +#define SP_NEW_VIEWPORT 0x1 +#define SP_NEW_RASTERIZER 0x2 +#define SP_NEW_FS 0x4 +#define SP_NEW_BLEND 0x8 +#define SP_NEW_CLIP 0x10 +#define SP_NEW_SCISSOR 0x20 +#define SP_NEW_STIPPLE 0x40 +#define SP_NEW_FRAMEBUFFER 0x80 +#define SP_NEW_DEPTH_STENCIL_ALPHA 0x100 +#define SP_NEW_CONSTANTS 0x200 +#define SP_NEW_SAMPLER 0x400 +#define SP_NEW_TEXTURE 0x800 +#define SP_NEW_VERTEX 0x1000 +#define SP_NEW_VS 0x2000 +#define SP_NEW_QUERY 0x4000 + + + #ifdef MESA_LLVM struct gallivm_prog; #endif + + /** * Softpipe fs state is derived from pipe_shader_state. */ |