Module: Mesa Branch: main Commit: 263faa3dfbf6bc55854b4123ce9d225b8f17266e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=263faa3dfbf6bc55854b4123ce9d225b8f17266e
Author: Emma Anholt <[email protected]> Date: Wed Jan 19 15:28:10 2022 -0800 softpipe: respect !independent_blend_enable for color masks. blend_buf is the resolved "are we using independent blending?" index, cbuf is the RT we're drawing to. Cc: mesa-stable. Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14627> --- src/gallium/drivers/softpipe/ci/softpipe-fails.txt | 1 - src/gallium/drivers/softpipe/ci/softpipe-flakes.txt | 1 - src/gallium/drivers/softpipe/sp_quad_blend.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt index 81848c71248..51a10e11c2f 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt @@ -440,7 +440,6 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.blit_framebuffer dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.read_pixels_fbo_format_mismatch,Fail dEQP-GLES31.functional.debug.negative_coverage.log.buffer.read_pixels_fbo_format_mismatch,Fail dEQP-GLES31.functional.draw_base_vertex.draw_elements_instanced_base_vertex.line_loop.instanced_attributes,Fail -dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_color_mask_buffer_color_mask,Fail dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.0,Fail dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.1,Fail dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.10,Fail diff --git a/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt b/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt index 0b92b692b82..5d2d50b547c 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-flakes.txt @@ -1,3 +1,2 @@ -dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_color_mask_buffer_color_mask dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.geometry.isampler2darray dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.geometry.isampler3d diff --git a/src/gallium/drivers/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp_quad_blend.c index f355e690869..1a3f92a9105 100644 --- a/src/gallium/drivers/softpipe/sp_quad_blend.c +++ b/src/gallium/drivers/softpipe/sp_quad_blend.c @@ -1005,7 +1005,7 @@ blend_fallback(struct quad_stage *qs, rebase_colors(bqs->base_format[cbuf], quadColor); if (blend->rt[blend_buf].colormask != 0xf) - colormask_quad( blend->rt[cbuf].colormask, quadColor, dest); + colormask_quad( blend->rt[blend_buf].colormask, quadColor, dest); /* Output color values */
