From bbe5eb43c77f14d5ba66f51ca14ad8840164ee2c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 24 Mar 2021 11:39:53 -0400 Subject: [PATCH] zink: don't generate sampled image type for non-sampled images this creates validation errors Reviewed-by: Jason Ekstrand Part-of: --- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 45be59b0d73..a010431fd9a 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 @@ -790,9 +790,7 @@ emit_image(struct ntv_context *ctx, struct nir_variable *var) is_ms, is_sampler ? 1 : 2, get_image_format(var->data.image.format)); - SpvId sampled_type = spirv_builder_type_sampled_image(&ctx->builder, - image_type); - SpvId var_type = is_sampler ? sampled_type : image_type; + SpvId var_type = is_sampler ? spirv_builder_type_sampled_image(&ctx->builder, image_type) : image_type; int index = var->data.driver_location; assert(!is_sampler || (!(ctx->samplers_used & (1 << index))));