diff options
| author | Rafael Antognolli <[email protected]> | 2017-06-02 14:41:19 -0700 |
|---|---|---|
| committer | Rafael Antognolli <[email protected]> | 2017-07-13 15:39:49 -0700 |
| commit | 5246d3eb835c8b5a9fe4fd65032f9d0f993efea7 (patch) | |
| tree | e9bf35dbe2c29ef689745825f87ded57ac4c391d | |
| parent | 1d2d3dbc8a13ee036794b0825543f65d66859630 (diff) | |
i965: Check for alpha channel just like in gen6+.
gen6+ uses _mesa_base_format_has_channel() to check for the alpha
channel, while gen4-5 use ctx->DrawBuffer->Visual.alphaBits. By using
_mesa_base_format_has_channel() here we keep the same behavior accross
all gen.
While initially both ways of checking the alpha channel seemed correct
to me, this change also seems to fix fbo-blending-formats piglit test on
gen4.
Signed-off-by: Rafael Antognolli <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_cc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_cc.c b/src/mesa/drivers/dri/i965/brw_cc.c index f0aa7b89704..1574788736c 100644 --- a/src/mesa/drivers/dri/i965/brw_cc.c +++ b/src/mesa/drivers/dri/i965/brw_cc.c @@ -34,6 +34,7 @@ #include "brw_state.h" #include "brw_defines.h" #include "brw_util.h" +#include "main/glformats.h" #include "main/macros.h" #include "main/stencil.h" #include "intel_batchbuffer.h" @@ -126,7 +127,9 @@ static void upload_cc_unit(struct brw_context *brw) * force the destination alpha to 1.0. This means replacing GL_DST_ALPHA * with GL_ONE and GL_ONE_MINUS_DST_ALPHA with GL_ZERO. */ - if (ctx->DrawBuffer->Visual.alphaBits == 0) { + const struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0]; + if (rb && !_mesa_base_format_has_channel(rb->_BaseFormat, + GL_TEXTURE_ALPHA_TYPE)) { srcRGB = brw_fix_xRGB_alpha(srcRGB); srcA = brw_fix_xRGB_alpha(srcA); dstRGB = brw_fix_xRGB_alpha(dstRGB); |