Module: Mesa Branch: main Commit: de6af39534c6372395e09134809b8d6d98bd4bc7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de6af39534c6372395e09134809b8d6d98bd4bc7
Author: Mike Blumenkrantz <[email protected]> Date: Sat Jun 11 10:59:59 2022 -0400 zink: fix cubemap lowering for array samplers each sampler is 1 driver location, so use the base variable Fixes: 2d745904ca7 ("zink: add a gently mangled version of the d3d12 cubemap -> array compiler pass") fixes: dEQP-GL45-ES31.functional.shaders.opaque_type_indexing.sampler.const_expression.*.samplercubearray Reviewed-by: Adam Jackson <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17008> --- src/gallium/drivers/zink/zink_lower_cubemap_to_array.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c index a9c2754df38..523ba186abd 100644 --- a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c +++ b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c @@ -391,7 +391,9 @@ rewrite_cube_var_type(nir_builder *b, nir_tex_instr *tex) nir_foreach_variable_with_modes(var, b->shader, nir_var_uniform) { if (!glsl_type_is_sampler(glsl_without_array(var->type))) continue; - if (var->data.driver_location == index) { + unsigned size = glsl_type_is_array(var->type) ? glsl_get_length(var->type) : 1; + if (var->data.driver_location == index || + (var->data.driver_location < index && var->data.driver_location + size > index)) { sampler = var; break; }
