fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-12 07:28:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r300g: adapt to blend changes

Browse source
This commit is contained in:
Roland Scheidegger 2010-01-25 16:37:51 +01:00
parent 4e0c825a79
commit d241964e47
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/r300/r300_state.c
View file

@ -164,15 +164,15 @@ static void* r300_create_blend_state(struct pipe_context* pipe,
{
struct r300_blend_state* blend = CALLOC_STRUCT(r300_blend_state);
if (state->blend_enable)
if (state->rt[0].blend_enable)
{
unsigned eqRGB = state->rgb_func;
unsigned srcRGB = state->rgb_src_factor;
unsigned dstRGB = state->rgb_dst_factor;
unsigned eqRGB = state->rt[0].rgb_func;
unsigned srcRGB = state->rt[0].rgb_src_factor;
unsigned dstRGB = state->rt[0].rgb_dst_factor;
unsigned eqA = state->alpha_func;
unsigned srcA = state->alpha_src_factor;
unsigned dstA = state->alpha_dst_factor;
unsigned eqA = state->rt[0].alpha_func;
unsigned srcA = state->rt[0].alpha_src_factor;
unsigned dstA = state->rt[0].alpha_dst_factor;
/* despite the name, ALPHA_BLEND_ENABLE has nothing to do with alpha,
* this is just the crappy D3D naming */
@ -290,16 +290,16 @@ static void* r300_create_blend_state(struct pipe_context* pipe,
}
/* Color Channel Mask */
if (state->colormask & PIPE_MASK_R) {
if (state->rt[0].colormask & PIPE_MASK_R) {
blend->color_channel_mask |= RB3D_COLOR_CHANNEL_MASK_RED_MASK0;
}
if (state->colormask & PIPE_MASK_G) {
if (state->rt[0].colormask & PIPE_MASK_G) {
blend->color_channel_mask |= RB3D_COLOR_CHANNEL_MASK_GREEN_MASK0;
}
if (state->colormask & PIPE_MASK_B) {
if (state->rt[0].colormask & PIPE_MASK_B) {
blend->color_channel_mask |= RB3D_COLOR_CHANNEL_MASK_BLUE_MASK0;
}
if (state->colormask & PIPE_MASK_A) {
if (state->rt[0].colormask & PIPE_MASK_A) {
blend->color_channel_mask |= RB3D_COLOR_CHANNEL_MASK_ALPHA_MASK0;
}