diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2020-06-03 14:35:02 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-06-09 11:02:04 -0700 |
| commit | 9ff455439b111d3a5f56936f7706156c3a42ed51 (patch) | |
| tree | c1eb5b6976d95d4d494424f873b09f913b300fb6 | |
| parent | 0f8fad7f3c407766b6862d348f060b6d64280d5d (diff) | |
nir/lower_explicit_io: fix NON_UNIFORM access for UBO loads
Make sure to propagate the NON_UNIFORM access for UBO loads, so
that non-uniform loads are correctly lowered.
Cc: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5311>
(cherry picked from commit 86f21e4eba7ad980109f13bd5480c02593ca19fe)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_io.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 652ff6cd683..f390d2e4b5a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -400,7 +400,7 @@ "description": "nir/lower_explicit_io: fix NON_UNIFORM access for UBO loads", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index 780d76748be..447d5f6ca5a 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -896,7 +896,7 @@ build_explicit_io_load(nir_builder *b, nir_intrinsic_instr *intrin, load->src[1] = nir_src_for_ssa(addr_to_offset(b, addr, addr_format)); } - if (mode != nir_var_mem_ubo && mode != nir_var_shader_in && mode != nir_var_mem_shared) + if (mode != nir_var_shader_in && mode != nir_var_mem_shared) nir_intrinsic_set_access(load, nir_intrinsic_access(intrin)); unsigned bit_size = intrin->dest.ssa.bit_size; |