From ae42991b83d03fd3776f8fd4e926a3b4017ebf54 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 1 Jul 2019 16:44:49 -0700 Subject: [PATCH] panfrost/midgard: Fix blend constant scheduling bug Blend constant conflicts run in two directions. Signed-off-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/midgard/midgard_schedule.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/panfrost/midgard/midgard_schedule.c b/src/gallium/drivers/panfrost/midgard/midgard_schedule.c index 7059f7bbe2a..c0dd5764595 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard_schedule.c +++ b/src/gallium/drivers/panfrost/midgard/midgard_schedule.c @@ -257,6 +257,10 @@ schedule_bundle(compiler_context *ctx, midgard_block *block, midgard_instruction * the swizzle */ if (ains->has_blend_constant) { + /* Everything conflicts with the blend constant */ + if (bundle.has_embedded_constants) + break; + bundle.has_blend_constant = 1; bundle.has_embedded_constants = 1; } else if (ains->has_constants) { -- 2.30.2