From b6ba24cd6291eaf07734e2da6c68e339f21c43ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Fri, 6 May 2022 14:38:43 +0200 Subject: [PATCH] anv: disable injection of primitive shading rate for mesh It's not needed and causes issues for mesh code (it doesn't mark the output as per-primitive, which confuses brw_compute_mue_map) Fixes many tests matching: dEQP-VK.fragment_shading_rate.dynamic_rendering.*.ms Fixes: 1542ab70eb4 ("anv: handle primitive shading rate for mesh") Acked-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_pipeline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 0c97ab53722..7df6e4a94fe 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -1751,7 +1751,8 @@ anv_pipeline_compile_graphics(struct anv_graphics_pipeline *pipeline, const struct intel_device_info *devinfo = &pipeline->base.device->info; if (devinfo->has_coarse_pixel_primitive_and_cb && stages[MESA_SHADER_FRAGMENT].entrypoint && - stages[MESA_SHADER_FRAGMENT].key.wm.coarse_pixel) { + stages[MESA_SHADER_FRAGMENT].key.wm.coarse_pixel && + stages[MESA_SHADER_MESH].entrypoint == NULL) { struct anv_pipeline_stage *last_psr = NULL; for (unsigned i = 0; i < ARRAY_SIZE(shader_order); i++) {