From 62ad23239c2b122516e4ae67ff329cb35b9de25e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 26 Jan 2021 09:56:04 -0500 Subject: [PATCH] zink: reapply program refs automatically Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_context.c | 8 ++++++-- src/gallium/drivers/zink/zink_draw.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index d7adcb2b01c..a6173fea6c2 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1664,9 +1664,11 @@ void zink_update_descriptor_refs(struct zink_context *ctx, bool compute) { struct zink_batch *batch = &ctx->batch; - if (compute) + if (compute) { update_resource_refs_for_stage(ctx, PIPE_SHADER_COMPUTE); - else { + if (ctx->curr_compute) + zink_batch_reference_program(batch, &ctx->curr_compute->base); + } else { for (unsigned i = 0; i < ZINK_SHADER_COUNT; i++) update_resource_refs_for_stage(ctx, i); unsigned vertex_buffers_enabled_mask = ctx->gfx_pipeline_state.vertex_buffers_enabled_mask; @@ -1675,6 +1677,8 @@ zink_update_descriptor_refs(struct zink_context *ctx, bool compute) if (ctx->vertex_buffers[i].buffer.resource) zink_batch_reference_resource_rw(batch, zink_resource(ctx->vertex_buffers[i].buffer.resource), false); } + if (ctx->curr_program) + zink_batch_reference_program(batch, &ctx->curr_program->base); } ctx->descriptor_refs_dirty[compute] = false; } diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c index 81761eacf81..8ba06331532 100644 --- a/src/gallium/drivers/zink/zink_draw.c +++ b/src/gallium/drivers/zink/zink_draw.c @@ -178,8 +178,10 @@ get_compute_program(struct zink_context *ctx) if (!entry) return NULL; } - if (entry->data != ctx->curr_compute) + if (ctx->curr_compute != entry->data) { ctx->compute_pipeline_state.dirty = true; + zink_batch_reference_program(&ctx->batch, entry->data); + } ctx->curr_compute = entry->data; ctx->dirty_shader_stages &= bits; ctx->inlinable_uniforms_dirty_mask &= bits; @@ -217,8 +219,10 @@ get_gfx_program(struct zink_context *ctx) if (!entry) return NULL; } - if (ctx->curr_program != entry->data) + if (ctx->curr_program != entry->data) { ctx->gfx_pipeline_state.combined_dirty = true; + zink_batch_reference_program(&ctx->batch, entry->data); + } ctx->curr_program = entry->data; ctx->dirty_shader_stages &= ~bits; ctx->inlinable_uniforms_dirty_mask &= ~bits;