Mesa (master): softpipe: fix multi-drawbuffers regression
Brian Paul
brianp at kemper.freedesktop.org
Sat Oct 10 15:24:42 UTC 2009
Module: Mesa
Branch: master
Commit: 39daa763b59cc80d862709e99ee3619bd0f7a14d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39daa763b59cc80d862709e99ee3619bd0f7a14d
Author: Brian Paul <brianp at vmware.com>
Date: Sat Oct 10 09:12:00 2009 -0600
softpipe: fix multi-drawbuffers regression
This is part of the fix for bug 24401.
---
src/gallium/drivers/softpipe/sp_quad_blend.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp_quad_blend.c
index e243c63..0ad0b98 100644
--- a/src/gallium/drivers/softpipe/sp_quad_blend.c
+++ b/src/gallium/drivers/softpipe/sp_quad_blend.c
@@ -946,15 +946,15 @@ choose_blend_quad(struct quad_stage *qs,
qs->run = blend_noop;
}
else if (!softpipe->blend->logicop_enable &&
- softpipe->blend->colormask == 0xf)
+ softpipe->blend->colormask == 0xf &&
+ softpipe->framebuffer.nr_cbufs == 1)
{
if (!blend->blend_enable) {
qs->run = single_output_color;
}
else if (blend->rgb_src_factor == blend->alpha_src_factor &&
blend->rgb_dst_factor == blend->alpha_dst_factor &&
- blend->rgb_func == blend->alpha_func &&
- softpipe->framebuffer.nr_cbufs == 1)
+ blend->rgb_func == blend->alpha_func)
{
if (blend->alpha_func == PIPE_BLEND_ADD) {
if (blend->rgb_src_factor == PIPE_BLENDFACTOR_ONE &&
More information about the mesa-commit
mailing list