From 3db5c1bfc51f942559e34a3385005680915b7bef Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 3 Sep 2021 10:46:58 -0400 Subject: [PATCH] zink: remove bind_stages and bind_history from zink_resource these are no longer used Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_context.c | 8 -------- src/gallium/drivers/zink/zink_resource.h | 3 --- 2 files changed, 11 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 63483bead51..220efeee354 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1034,8 +1034,6 @@ zink_set_constant_buffer(struct pipe_context *pctx, if (new_res) { if (new_res != res) { unbind_ubo(ctx, res, shader, index); - new_res->bind_history |= BITFIELD_BIT(ZINK_DESCRIPTOR_TYPE_UBO); - new_res->bind_stages |= 1 << shader; new_res->ubo_bind_count[shader == PIPE_SHADER_COMPUTE]++; new_res->ubo_bind_mask[shader] |= BITFIELD_BIT(index); update_res_bind_count(ctx, new_res, shader == PIPE_SHADER_COMPUTE, false); @@ -1122,8 +1120,6 @@ zink_set_shader_buffers(struct pipe_context *pctx, struct zink_resource *new_res = zink_resource(buffers[i].buffer); if (new_res != res) { unbind_ssbo(ctx, res, p_stage, i, was_writable); - new_res->bind_history |= BITFIELD_BIT(ZINK_DESCRIPTOR_TYPE_SSBO); - new_res->bind_stages |= 1 << p_stage; new_res->ssbo_bind_mask[p_stage] |= BITFIELD_BIT(i); update_res_bind_count(ctx, new_res, p_stage == PIPE_SHADER_COMPUTE, false); } @@ -1264,8 +1260,6 @@ zink_set_shader_images(struct pipe_context *pctx, if (!old_res->obj->is_buffer && !old_res->image_bind_count[p_stage == PIPE_SHADER_COMPUTE]) check_for_layout_update(ctx, old_res, p_stage == PIPE_SHADER_COMPUTE); } - res->bind_history |= BITFIELD_BIT(ZINK_DESCRIPTOR_TYPE_IMAGE); - res->bind_stages |= 1 << p_stage; update_res_bind_count(ctx, res, p_stage == PIPE_SHADER_COMPUTE, false); } util_copy_image_view(&image_view->base, images + i); @@ -1370,8 +1364,6 @@ zink_set_sampler_views(struct pipe_context *pctx, if (a) unbind_samplerview(ctx, shader_type, start_slot + i); update_res_bind_count(ctx, res, shader_type == PIPE_SHADER_COMPUTE, false); - res->bind_history |= BITFIELD64_BIT(ZINK_DESCRIPTOR_TYPE_SAMPLER_VIEW); - res->bind_stages |= 1 << shader_type; } else if (a != b) { check_samplerview_for_batch_ref(ctx, a); } diff --git a/src/gallium/drivers/zink/zink_resource.h b/src/gallium/drivers/zink/zink_resource.h index eb8060cbc50..6a51f7c63a8 100644 --- a/src/gallium/drivers/zink/zink_resource.h +++ b/src/gallium/drivers/zink/zink_resource.h @@ -125,9 +125,6 @@ struct zink_resource { struct sw_displaytarget *dt; unsigned dt_stride; - uint32_t bind_history; // enum zink_descriptor_type bitmask - uint32_t bind_stages; - uint8_t modifiers_count; uint64_t *modifiers; };