Module: Mesa Branch: staging/22.2 Commit: 4bbf83a4a815ade2dc505f8eee3a1623d1adff71 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4bbf83a4a815ade2dc505f8eee3a1623d1adff71
Author: Mike Blumenkrantz <[email protected]> Date: Mon Aug 22 17:41:21 2022 -0400 zink: ignore nir_texop_lod for tex dest matching this doesn't need fixing Fixes: 3a475766876 ("zink: add a compiler pass to match up tex op dest types") Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18196> (cherry picked from commit 585fa6bf406e064877baf4b2b106e116bee21c6b) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_compiler.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0b167face69..bb3833a32b0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -12046,7 +12046,7 @@ "description": "zink: ignore nir_texop_lod for tex dest matching", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3a47576687624e1ed4661d7f5b6c0e54998ada48" }, diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 8665630e499..4a500e6cbbe 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -2881,7 +2881,7 @@ match_tex_dests_instr(nir_builder *b, nir_instr *in, void *data) if (in->type != nir_instr_type_tex) return false; nir_tex_instr *tex = nir_instr_as_tex(in); - if (tex->op == nir_texop_txs) + if (tex->op == nir_texop_txs || tex->op == nir_texop_lod) return false; int handle = nir_tex_instr_src_index(tex, nir_tex_src_texture_handle); nir_variable *var = NULL;
