Merge commit 'origin/perrtblend'
Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h
This commit is contained in:
@@ -224,19 +224,19 @@ clear_with_quad(GLcontext *ctx,
|
||||
{
|
||||
struct pipe_blend_state blend;
|
||||
memset(&blend, 0, sizeof(blend));
|
||||
blend.rgb_src_factor = PIPE_BLENDFACTOR_ONE;
|
||||
blend.alpha_src_factor = PIPE_BLENDFACTOR_ONE;
|
||||
blend.rgb_dst_factor = PIPE_BLENDFACTOR_ZERO;
|
||||
blend.alpha_dst_factor = PIPE_BLENDFACTOR_ZERO;
|
||||
blend.rt[0].rgb_src_factor = PIPE_BLENDFACTOR_ONE;
|
||||
blend.rt[0].alpha_src_factor = PIPE_BLENDFACTOR_ONE;
|
||||
blend.rt[0].rgb_dst_factor = PIPE_BLENDFACTOR_ZERO;
|
||||
blend.rt[0].alpha_dst_factor = PIPE_BLENDFACTOR_ZERO;
|
||||
if (color) {
|
||||
if (ctx->Color.ColorMask[0][0])
|
||||
blend.colormask |= PIPE_MASK_R;
|
||||
blend.rt[0].colormask |= PIPE_MASK_R;
|
||||
if (ctx->Color.ColorMask[0][1])
|
||||
blend.colormask |= PIPE_MASK_G;
|
||||
blend.rt[0].colormask |= PIPE_MASK_G;
|
||||
if (ctx->Color.ColorMask[0][2])
|
||||
blend.colormask |= PIPE_MASK_B;
|
||||
blend.rt[0].colormask |= PIPE_MASK_B;
|
||||
if (ctx->Color.ColorMask[0][3])
|
||||
blend.colormask |= PIPE_MASK_A;
|
||||
blend.rt[0].colormask |= PIPE_MASK_A;
|
||||
if (st->ctx->Color.DitherFlag)
|
||||
blend.dither = 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user