From 3e6938696aed4bb8f7106267c198fa79d2c6277c Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 26 Sep 2023 12:43:37 +1000 Subject: [PATCH] llvmpipe/fs: fix regression in sample mask handling from tgsi removal. This got the bits the wrong way, dEQP-VK.rasterization.frag_side_effects.color_at_beginning.sample_mask_after Fixes: a63c2daf7ad7 ("llvmpipe/fs: start using nir info in some places.") Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/llvmpipe/lp_state_fs.c | 2 +- src/virtio/ci/venus-fails.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index b644a9d5f8a..b380f4cd964 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -3782,7 +3782,7 @@ generate_variant(struct llvmpipe_context *lp, !key->blend.alpha_to_coverage && !key->depth.enabled && !nir->info.fs.uses_discard && - (nir->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)) && + !(nir->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)) && !nir->info.fs.uses_fbfetch_output; variant->opaque = diff --git a/src/virtio/ci/venus-fails.txt b/src/virtio/ci/venus-fails.txt index 6bb57c4de41..1ccf418ff9f 100644 --- a/src/virtio/ci/venus-fails.txt +++ b/src/virtio/ci/venus-fails.txt @@ -1,3 +1,2 @@ # New CTS failures in 1.3.6.3 dEQP-VK.api.info.image_format_properties.2d.linear.g8_b8r8_2plane_420_unorm,Fail -dEQP-VK.rasterization.frag_side_effects.color_at_beginning.sample_mask_after,Fail