From c9c8134d768751b2d82619fbcecc15c0b65042e4 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 15 Apr 2022 16:23:50 -0500 Subject: [PATCH] iris: Stop looking at textures_used for samplers Reviewed-by: Kenneth Graunke Part-of: --- src/gallium/drivers/iris/iris_program.c | 4 ++-- src/gallium/drivers/iris/iris_state.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index 4b01ad1e917..92d647b6092 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -2789,8 +2789,8 @@ bind_shader_state(struct iris_context *ice, const struct shader_info *old_info = iris_get_shader_info(ice, stage); const struct shader_info *new_info = ish ? &ish->nir->info : NULL; - if ((old_info ? BITSET_LAST_BIT(old_info->textures_used) : 0) != - (new_info ? BITSET_LAST_BIT(new_info->textures_used) : 0)) { + if ((old_info ? BITSET_LAST_BIT(old_info->samplers_used) : 0) != + (new_info ? BITSET_LAST_BIT(new_info->samplers_used) : 0)) { ice->state.stage_dirty |= IRIS_STAGE_DIRTY_SAMPLER_STATES_VS << stage; } diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index af1c36a7939..5bc3ea5fcac 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -2209,7 +2209,7 @@ iris_upload_sampler_states(struct iris_context *ice, gl_shader_stage stage) /* We assume gallium frontends will call pipe->bind_sampler_states() * if the program's number of textures changes. */ - unsigned count = info ? BITSET_LAST_BIT(info->textures_used) : 0; + unsigned count = info ? BITSET_LAST_BIT(info->samplers_used) : 0; if (!count) return;