From fc52f82c09e74068eb0481953ca5fe8e931f865a Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 1 Sep 2022 09:37:06 -0400 Subject: [PATCH] zink: remove batch usage from sampler states this was useless Reviewed-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/zink_context.c | 5 ----- src/gallium/drivers/zink/zink_types.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index e822a05..3349c30 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -709,7 +709,6 @@ zink_bind_sampler_states(struct pipe_context *pctx, (surface->base.format == PIPE_FORMAT_Z24_UNORM_S8_UINT && surface->ivci.format == VK_FORMAT_D32_SFLOAT_S8_UINT))) ctx->di.textures[shader][start_slot + i].sampler = state->sampler_clamped; } - zink_batch_usage_set(&state->batch_uses, ctx->batch.state); } else { ctx->di.textures[shader][start_slot + i].sampler = VK_NULL_HANDLE; } @@ -2634,10 +2633,6 @@ update_resource_refs_for_stage(struct zink_context *ctx, gl_shader_stage stage) res->obj->unordered_read = res->obj->unordered_write = false; else res->obj->unordered_read = false; - - struct zink_sampler_state *sampler_state = ctx->sampler_states[stage][j]; - if (sampler_state && i == ZINK_DESCRIPTOR_TYPE_SAMPLER_VIEW && j <= ctx->di.num_samplers[stage]) - zink_batch_usage_set(&sampler_state->batch_uses, ctx->batch.state); } } } diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index 6f25690..52d26c6 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -1252,7 +1252,6 @@ struct zink_framebuffer { struct zink_sampler_state { VkSampler sampler; VkSampler sampler_clamped; - struct zink_batch_usage *batch_uses; bool custom_border_color; bool emulate_nonseamless; }; -- 2.7.4