fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 15:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

hook in state tracking for blend color

Browse source
This commit is contained in:
Brian 2007-07-03 17:19:30 -06:00
parent d378a2c0b8
commit 284efcfc27
6 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/pipe/p_context.h
View file

@ -66,6 +66,9 @@ struct pipe_context {
void (*set_blend_state)( struct pipe_context *,
const struct pipe_blend_state * );
void (*set_blend_color)( struct pipe_context *,
const struct pipe_blend_color * );
void (*set_clip_state)( struct pipe_context *,
const struct pipe_clip_state * );

1
src/mesa/pipe/softpipe/sp_context.c
View file

@ -67,6 +67,7 @@ struct pipe_context *softpipe_create( void )
softpipe->pipe.set_framebuffer_state = softpipe_set_framebuffer_state;
softpipe->pipe.set_alpha_test_state = softpipe_set_alpha_test_state;
softpipe->pipe.set_blend_state = softpipe_set_blend_state;
softpipe->pipe.set_blend_color = softpipe_set_blend_color;
softpipe->pipe.set_clip_state = softpipe_set_clip_state;
softpipe->pipe.set_clear_color_state = softpipe_set_clear_color_state;
softpipe->pipe.set_depth_state = softpipe_set_depth_test_state;

3
src/mesa/pipe/softpipe/sp_state.h
View file

@ -44,6 +44,9 @@ void softpipe_set_alpha_test_state( struct pipe_context *,
void softpipe_set_blend_state( struct pipe_context *,
const struct pipe_blend_state * );
void softpipe_set_blend_color( struct pipe_context *pipe,
const struct pipe_blend_color *blend_color );
void softpipe_set_clear_color_state( struct pipe_context *,
const struct pipe_clear_color_state * );

11
src/mesa/pipe/softpipe/sp_state_blend.c
View file

@ -46,6 +46,17 @@ void softpipe_set_blend_state( struct pipe_context *pipe,
}
void softpipe_set_blend_color( struct pipe_context *pipe,
const struct pipe_blend_color *blend_color )
{
struct softpipe_context *softpipe = softpipe_context(pipe);
softpipe->blend_color = *blend_color;
softpipe->dirty |= G_NEW_BLEND;
}
/** XXX move someday? Or consolidate all these simple state setters
* into one file.
*/

9
src/mesa/state_tracker/st_atom_blend.c
View file

@ -201,6 +201,15 @@ update_blend( struct st_context *st )
st->state.blend = blend; /* struct copy */
st->pipe->set_blend_state(st->pipe, &blend); /* set new state */
}
if (memcmp(st->ctx->Color.BlendColor, &st->state.blend_color, 4 * sizeof(GLfloat)) != 0) {
/* state has changed */
st->state.blend_color.color[0] = st->ctx->Color.BlendColor[0];
st->state.blend_color.color[1] = st->ctx->Color.BlendColor[1];
st->state.blend_color.color[2] = st->ctx->Color.BlendColor[2];
st->state.blend_color.color[3] = st->ctx->Color.BlendColor[3];
st->pipe->set_blend_color(st->pipe, (struct pipe_blend_color *) st->ctx->Color.BlendColor);
}
}

1
src/mesa/state_tracker/st_context.h
View file

@ -67,6 +67,7 @@ struct st_context
struct {
struct pipe_alpha_test_state alpha_test;
struct pipe_blend_state blend;
struct pipe_blend_color blend_color;
struct pipe_clear_color_state clear_color;
struct pipe_clip_state clip;
struct pipe_depth_state depth;