From 83011a92261cd80fd1ac1b5e87e7d818abfe2458 Mon Sep 17 00:00:00 2001 From: Charles Baker Date: Fri, 10 Dec 2021 09:22:28 +1300 Subject: [PATCH] zink: Output PackHalf2x16 to uint not float Fixes InconsistentSpirv validation errors reporting that PackHalf2x16 outputs uint rather than float. For example the previous code generates the following SPIR-V with PackHalf2x16 output as a float: %2018 = OpExtInst %float %1 PackHalf2x16 %2017 %2019 = OpBitcast %uint %2018 The new code generates: %2018 = OpExtInst %uint %1 PackHalf2x16 %2017 %2019 = OpBitcast %uint %2018 cc: mesa-stable Reviewed-By: Mike Blumenkrantz Part-of: (cherry picked from commit 985dae7f41b7f3454793fdcc11cdfb942f26ea55) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 37fbd456ae4..07047d70a5c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1408,7 +1408,7 @@ "description": "zink: Output PackHalf2x16 to uint not float", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": 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 e61a10743be..eed1fb57bdf 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 @@ -1742,7 +1742,13 @@ emit_alu(struct ntv_context *ctx, nir_alu_instr *alu) BUILTIN_UNOP(nir_op_ufind_msb, GLSLstd450FindUMsb) BUILTIN_UNOP(nir_op_find_lsb, GLSLstd450FindILsb) BUILTIN_UNOP(nir_op_ifind_msb, GLSLstd450FindSMsb) - BUILTIN_UNOPF(nir_op_pack_half_2x16, GLSLstd450PackHalf2x16) + + case nir_op_pack_half_2x16: + assert(nir_op_infos[alu->op].num_inputs == 1); + result = emit_builtin_unop(ctx, GLSLstd450PackHalf2x16, get_dest_type(ctx, &alu->dest.dest, nir_type_uint), src[0]); + force_float = true; + break; + BUILTIN_UNOPF(nir_op_unpack_half_2x16, GLSLstd450UnpackHalf2x16) BUILTIN_UNOPF(nir_op_pack_64_2x32, GLSLstd450PackDouble2x32) #undef BUILTIN_UNOP