AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Faith Ekstrand
2025-02-20 09:22:30 -06:00
committed by Marge Bot
parent 61911b6a4b
commit 13f7ea7b3d
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/compiler/nak/from_nir.rs
+12 -10
View File
@@ -2338,11 +2338,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)
};
@@ -2372,11 +2373,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)
};