From: Alyssa Rosenzweig Date: Fri, 14 Aug 2020 16:25:18 +0000 (-0400) Subject: panfrost: Hoist instance_shift/instance_odd fetch X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e9dc22512202f793f89d6cb86a780f81c2b88cd5;p=mesa.git panfrost: Hoist instance_shift/instance_odd fetch We'll want to pass it as an argument shortly. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Part-of: --- diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 1069dab5c1e..457c02cbbc1 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -1344,6 +1344,9 @@ panfrost_emit_vertex_data(struct panfrost_batch *batch, struct panfrost_context *ctx = batch->ctx; struct panfrost_vertex_state *so = ctx->vertex; + unsigned instance_shift = vertex_postfix->instance_shift; + unsigned instance_odd = vertex_postfix->instance_odd; + /* Staged mali_attr, and index into them. i =/= k, depending on the * vertex buffer mask and instancing. Twice as much room is allocated, * for a worst case of NPOT_DIVIDEs which take up extra slot */ @@ -1419,9 +1422,6 @@ panfrost_emit_vertex_data(struct panfrost_batch *batch, /* Normal, non-instanced attributes */ attrs[k++].elements |= MALI_ATTR_LINEAR; } else { - unsigned instance_shift = vertex_postfix->instance_shift; - unsigned instance_odd = vertex_postfix->instance_odd; - k += panfrost_vertex_instanced(ctx->padded_count, instance_shift, instance_odd,