summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarol Herbst <kherbst@redhat.com>2024-04-22 18:23:45 +0200
committerEric Engestrom <eric@engestrom.ch>2024-04-24 12:48:10 +0200
commit90b256f1467c84ef731a35075f0d548e9af53f92 (patch)
tree4fc5290f0f8fb09a7d433dcc6f44dac2c8c55cbe
parentf174be0a3e96c11522c8a947ecb950d8b005ed46 (diff)
rusticl/program: handle -cl-no-subgroup-ifp
As per spec we don't have to do anything with that flag. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28873> (cherry picked from commit cd5c9870ea1d7e73d05f125b229f34e5749c8345)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/frontends/rusticl/core/program.rs8
2 files changed, 6 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json
index c5ba3550b2a..bdf41145f8e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
"description": "rusticl/program: handle -cl-no-subgroup-ifp",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null
diff --git a/src/gallium/frontends/rusticl/core/program.rs b/src/gallium/frontends/rusticl/core/program.rs
index ce89962898c..93465c71c72 100644
--- a/src/gallium/frontends/rusticl/core/program.rs
+++ b/src/gallium/frontends/rusticl/core/program.rs
@@ -314,9 +314,11 @@ fn prepare_options(options: &str, dev: &Device) -> Vec<CString> {
res.push(&options[old..]);
res.iter()
- .map(|&a| match a {
- "-cl-denorms-are-zero" => "-fdenormal-fp-math=positive-zero",
- _ => a,
+ .filter_map(|&a| match a {
+ "-cl-denorms-are-zero" => Some("-fdenormal-fp-math=positive-zero"),
+ // We can ignore it as long as we don't support ifp
+ "-cl-no-subgroup-ifp" => None,
+ _ => Some(a),
})
.map(CString::new)
.map(Result::unwrap)