From cb48612355a8bc914e5c4d94930ca29a6e0cc8d9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 8 Aug 2022 14:12:11 -0400 Subject: [PATCH] lavapipe: use cso for compute samplers too somehow I missed this? Reviewed-by: Konstantin Seurer Acked-by: Dave Airlie Part-of: --- src/gallium/frontends/lavapipe/lvp_execute.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 4ca7af1..de324a1 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -152,7 +152,6 @@ struct rendering_state { uint32_t color_write_disables:8; uint32_t pad:13; - void *ss_cso[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS]; void *velems_cso; uint8_t push_constants[128 * 4]; @@ -389,12 +388,7 @@ static void emit_compute_state(struct rendering_state *state) } if (state->ss_dirty[PIPE_SHADER_COMPUTE]) { - for (unsigned i = 0; i < state->num_sampler_states[PIPE_SHADER_COMPUTE]; i++) { - if (state->ss_cso[PIPE_SHADER_COMPUTE][i]) - state->pctx->delete_sampler_state(state->pctx, state->ss_cso[PIPE_SHADER_COMPUTE][i]); - state->ss_cso[PIPE_SHADER_COMPUTE][i] = state->pctx->create_sampler_state(state->pctx, &state->ss[PIPE_SHADER_COMPUTE][i]); - } - state->pctx->bind_sampler_states(state->pctx, PIPE_SHADER_COMPUTE, 0, state->num_sampler_states[PIPE_SHADER_COMPUTE], state->ss_cso[PIPE_SHADER_COMPUTE]); + cso_set_samplers(state->cso, PIPE_SHADER_COMPUTE, state->num_sampler_states[PIPE_SHADER_COMPUTE], state->cso_ss_ptr[PIPE_SHADER_COMPUTE]); state->ss_dirty[PIPE_SHADER_COMPUTE] = false; } } @@ -4199,12 +4193,6 @@ VkResult lvp_execute_cmds(struct lvp_device *device, } } - for (unsigned i = 0; - i < ARRAY_SIZE(state->cso_ss_ptr[PIPE_SHADER_COMPUTE]); i++) { - if (state->cso_ss_ptr[PIPE_SHADER_COMPUTE][i]) - state->pctx->delete_sampler_state(state->pctx, state->ss_cso[PIPE_SHADER_COMPUTE][i]); - } - free(state->color_att); return VK_SUCCESS; } -- 2.7.4