From 0da52015a17527200d10a5d93ffba9accdffb4b8 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 31 Jul 2019 14:05:14 -0700 Subject: panfrost: Unify payload_vertex/payload_tiler Rather than disparate variables, let's use an array of payloads indexed by the shader stage. Signed-off-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/pan_instancing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/panfrost/pan_instancing.c') diff --git a/src/gallium/drivers/panfrost/pan_instancing.c b/src/gallium/drivers/panfrost/pan_instancing.c index e74cc4365cb..cd93fa7be9c 100644 --- a/src/gallium/drivers/panfrost/pan_instancing.c +++ b/src/gallium/drivers/panfrost/pan_instancing.c @@ -175,8 +175,8 @@ panfrost_vertex_instanced( /* First, grab the padded vertex count */ struct pan_shift_odd o = { - .shift = batch->ctx->payload_tiler.instance_shift, - .odd = batch->ctx->payload_tiler.instance_odd, + .shift = batch->ctx->payloads[PIPE_SHADER_FRAGMENT].instance_shift, + .odd = batch->ctx->payloads[PIPE_SHADER_FRAGMENT].instance_odd, }; unsigned padded_count = batch->ctx->padded_count; @@ -337,7 +337,7 @@ panfrost_emit_vertex_data(struct panfrost_job *batch) /* Upload whatever we emitted and go */ - ctx->payload_vertex.postfix.attributes = + ctx->payloads[PIPE_SHADER_VERTEX].postfix.attributes = panfrost_upload_transient(ctx, attrs, k * sizeof(union mali_attr)); } -- cgit v1.2.3