From ac2141a5b2f6270cf0a766254d321657d502d872 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sun, 26 Jun 2022 09:06:26 -0400 Subject: [PATCH] zink: handle bitsizes in get_bo_vars() analysis this allows it to be run repeatedly Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_compiler.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 9ab94efabf2..8427ba44b09 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -485,16 +485,17 @@ get_bo_vars(struct zink_shader *zs, nir_shader *shader) bo.first_ssbo = ffs(zs->ssbos_used) - 1; assert(bo.first_ssbo < PIPE_MAX_SHADER_BUFFERS); nir_foreach_variable_with_modes(var, shader, nir_var_mem_ssbo | nir_var_mem_ubo) { + unsigned idx = glsl_get_explicit_stride(glsl_get_struct_field(glsl_without_array(var->type), 0)) >> 1; if (var->data.mode == nir_var_mem_ssbo) { - assert(!bo.ssbo[32 >> 4]); - bo.ssbo[32 >> 4] = var; + assert(!bo.ssbo[idx]); + bo.ssbo[idx] = var; } else { if (var->data.driver_location) { - assert(!bo.ubo[32 >> 4]); - bo.ubo[32 >> 4] = var; + assert(!bo.ubo[idx]); + bo.ubo[idx] = var; } else { - assert(!bo.uniforms[32 >> 4]); - bo.uniforms[32 >> 4] = var; + assert(!bo.uniforms[idx]); + bo.uniforms[idx] = var; } } }