From c0c5ced0d5a50e12ffa4f461bd05e7734903af97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Tue, 20 Sep 2022 15:02:22 +0200 Subject: [PATCH] intel/compiler: remove second shading rate lowering for mesh It's already called in brw_postprocess_nir and calling it the second time actually breaks shading rate. Initially, when I added this call here in 9acb30c8c40, I was testing it on an internal tree, which didn't have brw_nir_lower_shading_rate_output call in brw_postprocess_nir. Fixes: 9acb30c8c40 ("intel/compiler: implement primitive shading rate for mesh") Reviewed-by: Caio Oliveira Part-of: (cherry picked from commit cfd1e5a91e57a8a2ed7b6dfe9a07c5ef46ddc28f) --- .pick_status.json | 2 +- src/intel/compiler/brw_mesh.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4c8730fe9f2..d404fc70535 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3442,7 +3442,7 @@ "description": "intel/compiler: remove second shading rate lowering for mesh", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "9acb30c8c40a86e6f92810e1d149fbf2faeb655b" }, diff --git a/src/intel/compiler/brw_mesh.cpp b/src/intel/compiler/brw_mesh.cpp index 3c2c63fe51b..61ac55ab362 100644 --- a/src/intel/compiler/brw_mesh.cpp +++ b/src/intel/compiler/brw_mesh.cpp @@ -530,8 +530,6 @@ brw_nir_lower_mue_outputs(nir_shader *nir, const struct brw_mue_map *map) NIR_PASS(_, nir, nir_lower_io, nir_var_shader_out, type_size_scalar_dwords, nir_lower_io_lower_64bit_to_32); - - NIR_PASS(_, nir, brw_nir_lower_shading_rate_output); } static void