From 4b38684f60c41dbbd772fa4cc447dbce04dacaa4 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 23 Nov 2022 10:56:49 +0200 Subject: [PATCH] nir/divergence: add missing btd_shader_type_intel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Fixes: 6d9ae6ec1eaa ("intel: add a new intrinsic to get the shader stage from bindless shaders") Reviewed-by: Marcin Ślusarz Part-of: (cherry picked from commit 99dcdf4d648f337c6421050cb5f31025f69665ae) --- .pick_status.json | 2 +- src/compiler/nir/nir_divergence_analysis.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index b036520b448..8e68041d83a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -22,7 +22,7 @@ "description": "nir/divergence: add missing btd_shader_type_intel", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6d9ae6ec1eaae3ff3407a37262d4b0a68e69c826" }, diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index df4f4e7ddd2..a5142222e8c 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -201,6 +201,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr) case nir_intrinsic_load_provoking_vtx_in_prim_amd: case nir_intrinsic_load_lds_ngg_scratch_base_amd: case nir_intrinsic_load_lds_ngg_gs_out_vertex_base_amd: + case nir_intrinsic_load_btd_shader_type_intel: is_divergent = false; break;