fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nak: Only use suld.constant on Ampere+

Browse source 
Turing doesn't support it so we'll use suld.weak instead.  While we're
here, get rid of an accidental copy+paste condition.

Fixes: ffdc0d8e98 ("nak: Use suld.constant when ACCESS_CAN_REORDER is set")
Reviewed-by: Mel Henning <drawoc@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33649>
(cherry picked from commit 13f7ea7b3d)
This commit is contained in:
Faith Ekstrand 2025-02-20 09:22:30 -06:00 • committed by Eric Engestrom
parent 43851b6850
commit ff0f49e0ba
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -444,7 +444,7 @@
"description": "nak: Only use suld.constant on Ampere+",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "ffdc0d8e98eeb68abcfff3c48b3691b999305004",
"notes": null

22
src/nouveau/compiler/nak/from_nir.rs
View file

@ -2305,11 +2305,12 @@ impl<'a> ShaderFromNir<'a> {
let coord = self.get_image_coord(intrin, dim);
// let sample = self.get_src(&srcs[2]);
let mem_order = if intrin.intrinsic
== nir_intrinsic_load_global_constant
|| (intrin.access() & ACCESS_CAN_REORDER) != 0
{
MemOrder::Constant
let mem_order = if (intrin.access() & ACCESS_CAN_REORDER) != 0 {
if self.sm.sm() >= 80 {
MemOrder::Constant
} else {
MemOrder::Weak
}
} else {
MemOrder::Strong(MemScope::System)
};
@ -2339,11 +2340,12 @@ impl<'a> ShaderFromNir<'a> {
let coord = self.get_image_coord(intrin, dim);
// let sample = self.get_src(&srcs[2]);
let mem_order = if intrin.intrinsic
== nir_intrinsic_load_global_constant
|| (intrin.access() & ACCESS_CAN_REORDER) != 0
{
MemOrder::Constant
let mem_order = if (intrin.access() & ACCESS_CAN_REORDER) != 0 {
if self.sm.sm() >= 80 {
MemOrder::Constant
} else {
MemOrder::Weak
}
} else {
MemOrder::Strong(MemScope::System)
};