From: Alyssa Rosenzweig Date: Tue, 2 Jul 2019 02:49:51 +0000 (-0700) Subject: panfrost/midgard: Fix fp16 embedded constants X-Git-Tag: android-x86-9.0-r1~4515 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=64df54d8944276687685d6d1261dd5448608b0f3;p=android-x86%2Fexternal-mesa.git panfrost/midgard: Fix fp16 embedded constants Signed-off-by: Alyssa Rosenzweig --- diff --git a/src/gallium/drivers/panfrost/midgard/midgard_schedule.c b/src/gallium/drivers/panfrost/midgard/midgard_schedule.c index caa29b7a2e4..ebbabae10bf 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard_schedule.c +++ b/src/gallium/drivers/panfrost/midgard/midgard_schedule.c @@ -272,6 +272,25 @@ schedule_bundle(compiler_context *ctx, midgard_block *block, midgard_instruction bundle.has_blend_constant = 1; bundle.has_embedded_constants = 1; + } else if (ains->has_constants && ains->alu.reg_mode == midgard_reg_mode_16) { + /* TODO: DRY with the analysis pass */ + + if (bundle.has_blend_constant) + break; + + if (constant_count) + break; + + /* TODO: Fix packing XXX */ + uint16_t *bundles = (uint16_t *) bundle.constants; + uint32_t *constants = (uint32_t *) ains->constants; + + /* Copy them wholesale */ + for (unsigned i = 0; i < 4; ++i) + bundles[i] = constants[i]; + + bundle.has_embedded_constants = true; + constant_count = 4; } else if (ains->has_constants) { /* By definition, blend constants conflict with * everything, so if there are already