From 5c842f96fdf40a925e787be2707d5de425fcccf1 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 28 May 2020 14:41:17 +0200 Subject: [PATCH] zink: Use store_dest_raw instead of storing an uint I cleaned up the other similar call-sites, but somehow missed this one. There's nothing different with this, so let's also fix this. Fixes: 16339646f03 ("zink/spirv: rename functions a bit") Reviewed-by: Mike Blumenkrantz Part-of: (cherry picked from commit a21966837acd2e053ce183c5f145afcff2fd51b7) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 10f9ac74588..f12ea053606 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2299,7 +2299,7 @@ "description": "zink: Use store_dest_raw instead of storing an uint", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "16339646f03a5cb527f119ca572c9328fd5d3923" }, 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 e609a08caf6..857c7721f0d 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 @@ -1689,8 +1689,7 @@ emit_deref_var(struct ntv_context *ctx, nir_deref_instr *deref) struct hash_entry *he = _mesa_hash_table_search(ctx->vars, deref->var); assert(he); SpvId result = (SpvId)(intptr_t)he->data; - /* uint is a bit of a lie here, it's really just an opaque type */ - store_dest(ctx, &deref->dest, result, nir_type_uint); + store_dest_raw(ctx, &deref->dest, result); } static void