commit 3e2a3b402bbfce60dad4f0d4fec8eb17222d54c6
author Rhys Perry <pendingchaos02@gmail.com> Thu Sep 10 11:58:04 2020 +0100
committer Dylan Baker <dylan.c.baker@intel.com> Tue Dec 01 09:12:36 2020 -0800
tree a19794b46d1fa32530e8be7837d889e42d633b11
parent 1891d300310dc3385a365967057df433117f3b7f

nir: fix sampler_lod_parameters_pan indices

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Fixes: deaebc82a73 "nir: Add load_sampler_lod_paramaters_pan intrinsic"
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6587>
(cherry picked from commit f6407b9b7d311de0669375dc005cc4cfc42ffe1f)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index b762dbc..416554b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1876,7 +1876,7 @@
         "description": "nir: fix sampler_lod_parameters_pan indices",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "deaebc82a73ba3f34c4f2ecf97cedb7fc9b0b154"
     },

src/compiler/nir/nir_intrinsics.py

diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index df9f22f..4b6eafa 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -964,7 +964,7 @@
 
 # Loads the sampler paramaters <min_lod, max_lod, lod_bias>
 # src[] = { sampler_index }
-load("sampler_lod_parameters_pan", [1], [CAN_ELIMINATE, CAN_REORDER])
+load("sampler_lod_parameters_pan", [1], flags=[CAN_ELIMINATE, CAN_REORDER])
 
 # R600 specific instrincs
 #