Module: Mesa Branch: main Commit: 3000ca360b245fd5dae9ca25cf8e238444b9f81e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3000ca360b245fd5dae9ca25cf8e238444b9f81e
Author: Jason Ekstrand <[email protected]> Date: Tue May 10 10:52:53 2022 -0500 lavapipe: Set shader_info::samplers_used Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16435> --- src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c index 2aeead0ac79..a7fb9ccb782 100644 --- a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c +++ b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c @@ -194,9 +194,6 @@ lower_vri_instr_tex_deref(nir_tex_instr *tex, else tex->texture_index = value; - if (deref_src_type == nir_tex_src_sampler_deref) - return 0; - if (deref_instr->deref_type == nir_deref_type_array) { assert(glsl_type_is_array(var->type)); assert(value >= 0); @@ -212,9 +209,14 @@ static void lower_vri_instr_tex(struct nir_builder *b, nir_tex_instr *tex, void *data_cb) { struct lvp_pipeline_layout *layout = data_cb; - unsigned textures_used; + unsigned samplers_used, textures_used; + + samplers_used = lower_vri_instr_tex_deref(tex, nir_tex_src_sampler_deref, b->shader->info.stage, layout); + while (samplers_used) { + int i = u_bit_scan(&samplers_used); + BITSET_SET(b->shader->info.samplers_used, i); + } - lower_vri_instr_tex_deref(tex, nir_tex_src_sampler_deref, b->shader->info.stage, layout); textures_used = lower_vri_instr_tex_deref(tex, nir_tex_src_texture_deref, b->shader->info.stage, layout); while (textures_used) { int i = u_bit_scan(&textures_used);
