OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Check for alpha channel just like in gen6+.

Browse Source 
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 <rafael.antognolli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Rafael Antognolli
2017-06-02 14:41:19 -07:00
parent 1d2d3dbc8a
commit 5246d3eb83
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/drivers/dri/i965/brw_cc.c
View File

@@ -34,6 +34,7 @@
#include "brw_state.h" #include "brw_state.h"
#include "brw_defines.h" #include "brw_defines.h"
#include "brw_util.h" #include "brw_util.h"
#include "main/glformats.h"
#include "main/macros.h" #include "main/macros.h"
#include "main/stencil.h" #include "main/stencil.h"
#include "intel_batchbuffer.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 * 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. * 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); srcRGB = brw_fix_xRGB_alpha(srcRGB);
srcA = brw_fix_xRGB_alpha(srcA); srcA = brw_fix_xRGB_alpha(srcA);
dstRGB = brw_fix_xRGB_alpha(dstRGB); dstRGB = brw_fix_xRGB_alpha(dstRGB);