From 17f0681ff990eba00a046af1b208c1a748d06b41 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Thu, 10 Sep 2020 11:58:04 +0100 Subject: [PATCH] nir: fix sampler_lod_parameters_pan indices Signed-off-by: Rhys Perry Reviewed-by: Jason Ekstrand Fixes: deaebc82a73 "nir: Add load_sampler_lod_paramaters_pan intrinsic" Part-of: (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 b51aa8ba6e7..2c1f0d394c3 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 2fa092d5f71..e3ec5108069 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -873,7 +873,7 @@ load("raw_output_pan", [1], [BASE], [CAN_ELIMINATE, CAN_REORDER]) # Loads the sampler paramaters # 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 #