diff --git a/src/panfrost/lib/pan_blend.c b/src/panfrost/lib/pan_blend.c index f8830303a46..191575a605c 100644 --- a/src/panfrost/lib/pan_blend.c +++ b/src/panfrost/lib/pan_blend.c @@ -486,7 +486,7 @@ pan_blend_create_shader(const struct panfrost_device *dev, .colormask = rt_state->equation.color_mask, .half = nir_type == nir_type_float16, .format = rt_state->format, - .is_bifrost = pan_is_bifrost(dev), + .scalar = pan_is_bifrost(dev), }; if (!rt_state->equation.blend_enable) { diff --git a/src/panfrost/util/nir_lower_blend.c b/src/panfrost/util/nir_lower_blend.c index 0bf3c166215..c1e0af9d1ac 100644 --- a/src/panfrost/util/nir_lower_blend.c +++ b/src/panfrost/util/nir_lower_blend.c @@ -262,10 +262,7 @@ nir_blend( /* Grab the blend constant ahead of time */ nir_ssa_def *bconst; - if (options.is_bifrost) { - /* Bifrost is a scalar architecture, so let's split loads now to avoid a - * lowering pass. - */ + if (options.scalar) { bconst = nir_vec4(b, nir_load_blend_const_color_r_float(b), nir_load_blend_const_color_g_float(b), diff --git a/src/panfrost/util/nir_lower_blend.h b/src/panfrost/util/nir_lower_blend.h index 7d89d8cfcee..4b788c970b4 100644 --- a/src/panfrost/util/nir_lower_blend.h +++ b/src/panfrost/util/nir_lower_blend.h @@ -56,7 +56,7 @@ typedef struct { /* Use fp16 instead of fp32 */ bool half; - bool is_bifrost; + bool scalar; nir_ssa_def *src1; } nir_lower_blend_options;