Rename G_NEW_* tokens to SP_NEW_*
This commit is contained in:
@@ -51,18 +51,18 @@ enum interp_mode {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define G_NEW_VIEWPORT 0x1
|
#define SP_NEW_VIEWPORT 0x1
|
||||||
#define G_NEW_SETUP 0x2
|
#define SP_NEW_SETUP 0x2
|
||||||
#define G_NEW_FS 0x4
|
#define SP_NEW_FS 0x4
|
||||||
#define G_NEW_BLEND 0x8
|
#define SP_NEW_BLEND 0x8
|
||||||
#define G_NEW_CLIP 0x20
|
#define SP_NEW_CLIP 0x10
|
||||||
#define G_NEW_SCISSOR 0x40
|
#define SP_NEW_SCISSOR 0x20
|
||||||
#define G_NEW_STIPPLE 0x80
|
#define SP_NEW_STIPPLE 0x40
|
||||||
#define G_NEW_FRAMEBUFFER 0x100
|
#define SP_NEW_FRAMEBUFFER 0x80
|
||||||
#define G_NEW_ALPHA_TEST 0x200
|
#define SP_NEW_ALPHA_TEST 0x100
|
||||||
#define G_NEW_DEPTH_TEST 0x400
|
#define SP_NEW_DEPTH_TEST 0x200
|
||||||
#define G_NEW_SAMPLER 0x800
|
#define SP_NEW_SAMPLER 0x400
|
||||||
#define G_NEW_TEXTURE 0x1000
|
#define SP_NEW_TEXTURE 0x800
|
||||||
|
|
||||||
|
|
||||||
struct softpipe_context {
|
struct softpipe_context {
|
||||||
|
@@ -40,7 +40,7 @@ void softpipe_set_blend_state( struct pipe_context *pipe,
|
|||||||
|
|
||||||
softpipe->blend = *blend;
|
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->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->depth_test = *depth;
|
||||||
|
|
||||||
softpipe->dirty |= G_NEW_DEPTH_TEST;
|
softpipe->dirty |= SP_NEW_DEPTH_TEST;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -77,6 +77,6 @@ softpipe_set_alpha_test_state(struct pipe_context *pipe,
|
|||||||
|
|
||||||
softpipe->alpha_test = *alpha;
|
softpipe->alpha_test = *alpha;
|
||||||
|
|
||||||
softpipe->dirty |= G_NEW_ALPHA_TEST;
|
softpipe->dirty |= SP_NEW_ALPHA_TEST;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -54,7 +54,7 @@ void softpipe_set_viewport_state( struct pipe_context *pipe,
|
|||||||
struct softpipe_context *softpipe = softpipe_context(pipe);
|
struct softpipe_context *softpipe = softpipe_context(pipe);
|
||||||
|
|
||||||
softpipe->viewport = *viewport; /* struct copy */
|
softpipe->viewport = *viewport; /* struct copy */
|
||||||
softpipe->dirty |= G_NEW_VIEWPORT;
|
softpipe->dirty |= SP_NEW_VIEWPORT;
|
||||||
|
|
||||||
/* pass the viewport info to the draw module */
|
/* pass the viewport info to the draw module */
|
||||||
draw_set_viewport_state(softpipe->draw, viewport);
|
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);
|
struct softpipe_context *softpipe = softpipe_context(pipe);
|
||||||
|
|
||||||
memcpy( &softpipe->scissor, scissor, sizeof(*scissor) );
|
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);
|
struct softpipe_context *softpipe = softpipe_context(pipe);
|
||||||
|
|
||||||
memcpy( &softpipe->poly_stipple, stipple, sizeof(*stipple) );
|
memcpy( &softpipe->poly_stipple, stipple, sizeof(*stipple) );
|
||||||
softpipe->dirty |= G_NEW_STIPPLE;
|
softpipe->dirty |= SP_NEW_STIPPLE;
|
||||||
}
|
}
|
||||||
|
@@ -131,10 +131,10 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
|
|||||||
*/
|
*/
|
||||||
void softpipe_update_derived( 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 );
|
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);
|
sp_build_quad_pipeline(softpipe);
|
||||||
|
|
||||||
softpipe->dirty = 0;
|
softpipe->dirty = 0;
|
||||||
|
@@ -37,7 +37,7 @@ void softpipe_set_fs_state( struct pipe_context *pipe,
|
|||||||
|
|
||||||
memcpy(&softpipe->fs, fs, sizeof(*fs));
|
memcpy(&softpipe->fs, fs, sizeof(*fs));
|
||||||
|
|
||||||
softpipe->dirty |= G_NEW_FS;
|
softpipe->dirty |= SP_NEW_FS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -46,7 +46,7 @@ softpipe_set_sampler_state(struct pipe_context *pipe,
|
|||||||
assert(unit < PIPE_MAX_SAMPLERS);
|
assert(unit < PIPE_MAX_SAMPLERS);
|
||||||
softpipe->sampler[unit] = *sampler;
|
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);
|
assert(unit < PIPE_MAX_SAMPLERS);
|
||||||
softpipe->texture[unit] = texture; /* ptr, not struct */
|
softpipe->texture[unit] = texture; /* ptr, not struct */
|
||||||
|
|
||||||
softpipe->dirty |= G_NEW_TEXTURE;
|
softpipe->dirty |= SP_NEW_TEXTURE;
|
||||||
}
|
}
|
||||||
|
@@ -103,7 +103,7 @@ void softpipe_set_setup_state( struct pipe_context *pipe,
|
|||||||
#if 0
|
#if 0
|
||||||
validate_prim_pipe( softpipe );
|
validate_prim_pipe( softpipe );
|
||||||
#endif
|
#endif
|
||||||
softpipe->dirty |= G_NEW_SETUP;
|
softpipe->dirty |= SP_NEW_SETUP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -45,7 +45,7 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
|
|||||||
|
|
||||||
softpipe->framebuffer = *fb; /* struct copy */
|
softpipe->framebuffer = *fb; /* struct copy */
|
||||||
|
|
||||||
softpipe->dirty |= G_NEW_FRAMEBUFFER;
|
softpipe->dirty |= SP_NEW_FRAMEBUFFER;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user