diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/pipe/softpipe/sp_context.h | 24 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_state_blend.c | 8 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_state_clip.c | 6 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_state_derived.c | 4 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_state_fs.c | 2 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_state_sampler.c | 4 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_state_setup.c | 2 | ||||
-rw-r--r-- | src/mesa/pipe/softpipe/sp_state_surface.c | 2 |
8 files changed, 26 insertions, 26 deletions
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h index 0c082978bd..21d17c474f 100644 --- a/src/mesa/pipe/softpipe/sp_context.h +++ b/src/mesa/pipe/softpipe/sp_context.h @@ -51,18 +51,18 @@ enum interp_mode { }; -#define G_NEW_VIEWPORT 0x1 -#define G_NEW_SETUP 0x2 -#define G_NEW_FS 0x4 -#define G_NEW_BLEND 0x8 -#define G_NEW_CLIP 0x20 -#define G_NEW_SCISSOR 0x40 -#define G_NEW_STIPPLE 0x80 -#define G_NEW_FRAMEBUFFER 0x100 -#define G_NEW_ALPHA_TEST 0x200 -#define G_NEW_DEPTH_TEST 0x400 -#define G_NEW_SAMPLER 0x800 -#define G_NEW_TEXTURE 0x1000 +#define SP_NEW_VIEWPORT 0x1 +#define SP_NEW_SETUP 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_ALPHA_TEST 0x100 +#define SP_NEW_DEPTH_TEST 0x200 +#define SP_NEW_SAMPLER 0x400 +#define SP_NEW_TEXTURE 0x800 struct softpipe_context { diff --git a/src/mesa/pipe/softpipe/sp_state_blend.c b/src/mesa/pipe/softpipe/sp_state_blend.c index e0ff549d70..ae8950e386 100644 --- a/src/mesa/pipe/softpipe/sp_state_blend.c +++ b/src/mesa/pipe/softpipe/sp_state_blend.c @@ -40,7 +40,7 @@ void softpipe_set_blend_state( struct pipe_context *pipe, softpipe->blend = *blend; - softpipe->dirty |= G_NEW_BLEND; + softpipe->dirty |= SP_NEW_BLEND; } @@ -51,7 +51,7 @@ void softpipe_set_blend_color( struct pipe_context *pipe, softpipe->blend_color = *blend_color; - softpipe->dirty |= G_NEW_BLEND; + softpipe->dirty |= SP_NEW_BLEND; } @@ -66,7 +66,7 @@ softpipe_set_depth_test_state(struct pipe_context *pipe, softpipe->depth_test = *depth; - softpipe->dirty |= G_NEW_DEPTH_TEST; + softpipe->dirty |= SP_NEW_DEPTH_TEST; } void @@ -77,6 +77,6 @@ softpipe_set_alpha_test_state(struct pipe_context *pipe, softpipe->alpha_test = *alpha; - softpipe->dirty |= G_NEW_ALPHA_TEST; + softpipe->dirty |= SP_NEW_ALPHA_TEST; } diff --git a/src/mesa/pipe/softpipe/sp_state_clip.c b/src/mesa/pipe/softpipe/sp_state_clip.c index 3b69d3e7a7..8cf4383d3f 100644 --- a/src/mesa/pipe/softpipe/sp_state_clip.c +++ b/src/mesa/pipe/softpipe/sp_state_clip.c @@ -54,7 +54,7 @@ void softpipe_set_viewport_state( struct pipe_context *pipe, struct softpipe_context *softpipe = softpipe_context(pipe); softpipe->viewport = *viewport; /* struct copy */ - softpipe->dirty |= G_NEW_VIEWPORT; + softpipe->dirty |= SP_NEW_VIEWPORT; /* pass the viewport info to the draw module */ draw_set_viewport_state(softpipe->draw, viewport); @@ -71,7 +71,7 @@ void softpipe_set_scissor_state( struct pipe_context *pipe, struct softpipe_context *softpipe = softpipe_context(pipe); memcpy( &softpipe->scissor, scissor, sizeof(*scissor) ); - softpipe->dirty |= G_NEW_SCISSOR; + softpipe->dirty |= SP_NEW_SCISSOR; } @@ -81,5 +81,5 @@ void softpipe_set_polygon_stipple( struct pipe_context *pipe, struct softpipe_context *softpipe = softpipe_context(pipe); memcpy( &softpipe->poly_stipple, stipple, sizeof(*stipple) ); - softpipe->dirty |= G_NEW_STIPPLE; + softpipe->dirty |= SP_NEW_STIPPLE; } diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c index 4454dd9ba9..dd8a490f3b 100644 --- a/src/mesa/pipe/softpipe/sp_state_derived.c +++ b/src/mesa/pipe/softpipe/sp_state_derived.c @@ -131,10 +131,10 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe ) */ void softpipe_update_derived( struct softpipe_context *softpipe ) { - if (softpipe->dirty & (G_NEW_SETUP | G_NEW_FS)) + if (softpipe->dirty & (SP_NEW_SETUP | SP_NEW_FS)) calculate_vertex_layout( softpipe ); - if (softpipe->dirty & (G_NEW_BLEND | G_NEW_DEPTH_TEST | G_NEW_ALPHA_TEST | G_NEW_FS)) + if (softpipe->dirty & (SP_NEW_BLEND | SP_NEW_DEPTH_TEST | SP_NEW_ALPHA_TEST | SP_NEW_FS)) sp_build_quad_pipeline(softpipe); softpipe->dirty = 0; diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/mesa/pipe/softpipe/sp_state_fs.c index 29f965e50e..c7ef1f1cfc 100644 --- a/src/mesa/pipe/softpipe/sp_state_fs.c +++ b/src/mesa/pipe/softpipe/sp_state_fs.c @@ -37,7 +37,7 @@ void softpipe_set_fs_state( struct pipe_context *pipe, memcpy(&softpipe->fs, fs, sizeof(*fs)); - softpipe->dirty |= G_NEW_FS; + softpipe->dirty |= SP_NEW_FS; } diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c index 62ff5c50b8..9ef71f73cb 100644 --- a/src/mesa/pipe/softpipe/sp_state_sampler.c +++ b/src/mesa/pipe/softpipe/sp_state_sampler.c @@ -46,7 +46,7 @@ softpipe_set_sampler_state(struct pipe_context *pipe, assert(unit < PIPE_MAX_SAMPLERS); softpipe->sampler[unit] = *sampler; - softpipe->dirty |= G_NEW_SAMPLER; + softpipe->dirty |= SP_NEW_SAMPLER; } @@ -60,5 +60,5 @@ softpipe_set_texture_state(struct pipe_context *pipe, assert(unit < PIPE_MAX_SAMPLERS); softpipe->texture[unit] = texture; /* ptr, not struct */ - softpipe->dirty |= G_NEW_TEXTURE; + softpipe->dirty |= SP_NEW_TEXTURE; } diff --git a/src/mesa/pipe/softpipe/sp_state_setup.c b/src/mesa/pipe/softpipe/sp_state_setup.c index 2dea49c86d..6dbb87ae79 100644 --- a/src/mesa/pipe/softpipe/sp_state_setup.c +++ b/src/mesa/pipe/softpipe/sp_state_setup.c @@ -103,7 +103,7 @@ void softpipe_set_setup_state( struct pipe_context *pipe, #if 0 validate_prim_pipe( softpipe ); #endif - softpipe->dirty |= G_NEW_SETUP; + softpipe->dirty |= SP_NEW_SETUP; } diff --git a/src/mesa/pipe/softpipe/sp_state_surface.c b/src/mesa/pipe/softpipe/sp_state_surface.c index 4d27814e1b..8ce81eb2b0 100644 --- a/src/mesa/pipe/softpipe/sp_state_surface.c +++ b/src/mesa/pipe/softpipe/sp_state_surface.c @@ -45,7 +45,7 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe, softpipe->framebuffer = *fb; /* struct copy */ - softpipe->dirty |= G_NEW_FRAMEBUFFER; + softpipe->dirty |= SP_NEW_FRAMEBUFFER; } |