From: Alyssa Rosenzweig Date: Mon, 6 Feb 2023 16:34:02 +0000 (-0500) Subject: pan/lower_framebuffer: Only call for FS X-Git-Tag: upstream/23.3.3~11144 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8059eb15775d44e995956678b7e38884be03b353;p=platform%2Fupstream%2Fmesa.git pan/lower_framebuffer: Only call for FS It doesn't make sense for shader stages other than fragment (and blend which is fragment-like), assert this. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon Part-of: --- diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 08cc62e..35e40ac 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -418,9 +418,11 @@ midgard_preprocess_nir(nir_shader *nir, NIR_PASS_V(nir, nir_lower_flrp, 16 | 32 | 64, false /* always_precise */); NIR_PASS_V(nir, nir_lower_var_copies); - NIR_PASS_V(nir, pan_lower_framebuffer, inputs->rt_formats, - inputs->raw_fmt_mask, inputs->is_blend, - quirks & MIDGARD_BROKEN_BLEND_LOADS); + if (nir->info.stage == MESA_SHADER_FRAGMENT) { + NIR_PASS_V(nir, pan_lower_framebuffer, inputs->rt_formats, + inputs->raw_fmt_mask, inputs->is_blend, + quirks & MIDGARD_BROKEN_BLEND_LOADS); + } } static void diff --git a/src/panfrost/util/pan_lower_framebuffer.c b/src/panfrost/util/pan_lower_framebuffer.c index d2a29e4..f0910bf 100644 --- a/src/panfrost/util/pan_lower_framebuffer.c +++ b/src/panfrost/util/pan_lower_framebuffer.c @@ -573,8 +573,7 @@ pan_lower_framebuffer(nir_shader *shader, const enum pipe_format *rt_fmts, uint8_t raw_fmt_mask, bool is_blend, bool broken_ld_special) { - if (shader->info.stage != MESA_SHADER_FRAGMENT) - return false; + assert(shader->info.stage == MESA_SHADER_FRAGMENT); bool progress = false;