fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 06:40:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/deref: Handle RESTRICT for SSBO deref bindings

Browse source 
Tested-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: M Henning <drawoc@darkrefraction.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Cc: mesa-stable@lists.freedesktop.org
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16894>
(cherry picked from commit 4655ff1f5b)
This commit is contained in:
Jason Ekstrand 2022-06-06 12:29:15 -05:00 • committed by Dylan Baker
parent c1c7c02aa4
commit fa4d248595
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3973,7 +3973,7 @@
"description": "nir/deref: Handle RESTRICT for SSBO deref bindings",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

4
src/compiler/nir/nir_deref.c
View file

@ -612,7 +612,9 @@ nir_compare_deref_paths(nir_deref_path *a_path,
/* If the binding derefs can't alias and at least one is RESTRICT,
* then we know they can't alias.
*/
if (!(binding_compare & nir_derefs_may_alias_bit))
if (!(binding_compare & nir_derefs_may_alias_bit) &&
((a_var->data.access & ACCESS_RESTRICT) ||
(b_var->data.access & ACCESS_RESTRICT)))
return nir_derefs_do_not_alias;
return nir_derefs_may_alias_bit;