From 31e9893f64d7d5a13128d5d9874a16f8328ce0b7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 7 Apr 2025 13:22:25 -0400 Subject: [PATCH] zink: stop setting ArrayStride on image arrays this is illegal cc: mesa-stable Part-of: (cherry picked from commit b4e35356509663816dc3239902c2c61243edae7f) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9d0f3283fcd..3161dc3f216 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -984,7 +984,7 @@ "description": "zink: stop setting ArrayStride on image arrays", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c index 94256a468ae..a838cddf872 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c +++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c @@ -1202,7 +1202,6 @@ emit_image(struct ntv_context *ctx, struct nir_variable *var, SpvId image_type) if (glsl_type_is_array(var->type)) { var_type = spirv_builder_type_array(&ctx->builder, var_type, emit_uint_const(ctx, 32, glsl_get_aoa_size(var->type))); - spirv_builder_emit_array_stride(&ctx->builder, var_type, sizeof(void*)); } SpvId pointer_type = spirv_builder_type_pointer(&ctx->builder, SpvStorageClassUniformConstant,