From 3e2a3b402bbfce60dad4f0d4fec8eb17222d54c6 Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Thu, 10 Sep 2020 11:58:04 +0100
Subject: [PATCH] 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                  | 2 +-
 src/compiler/nir/nir_intrinsics.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index b762dbcef96..416554b27f0 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"
     },
diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index df9f22f0607..4b6eafa1d47 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -964,7 +964,7 @@ load("raw_output_pan", [1], [BASE], [CAN_ELIMINATE, CAN_REORDER])
 
 # 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
 #