From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Wed, 23 Nov 2022 08:56:49 +0000 (+0200)
Subject: nir/divergence: add missing btd_shader_type_intel
X-Git-Tag: upstream/22.3.5~361
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b38684f60c41dbbd772fa4cc447dbce04dacaa4;p=platform%2Fupstream%2Fmesa.git

nir/divergence: add missing btd_shader_type_intel

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 6d9ae6ec1eaa ("intel: add a new intrinsic to get the shader stage from bindless shaders")
Reviewed-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19948>
(cherry picked from commit 99dcdf4d648f337c6421050cb5f31025f69665ae)
---

diff --git a/.pick_status.json b/.pick_status.json
index b036520..8e68041 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 df4f4e7..a514222 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;