OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rusticl/spirv: do not add additional new lines when joining logs

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30029>
This commit is contained in:
Karol Herbst
2024-07-04 13:26:47 +02:00
committed by Marge Bot
parent f283c38f9c
commit 80da990f22
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/frontends/rusticl/mesa/compiler/clc/spirv.rs
View File

@@ -175,7 +175,7 @@ impl SPIRVBin {
None None
}; };
(res, msgs.join("\n")) (res, msgs.join(""))
} }
// TODO cache linking, parsing is around 25% of link time // TODO cache linking, parsing is around 25% of link time
@@ -206,7 +206,7 @@ impl SPIRVBin {
spirv: out, spirv: out,
info: info, info: info,
}); });
(res, msgs.join("\n")) (res, msgs.join(""))
} }
pub fn validate(&self, options: &clc_validator_options) -> (bool, String) { pub fn validate(&self, options: &clc_validator_options) -> (bool, String) {
@@ -214,7 +214,7 @@ impl SPIRVBin {
let logger = create_clc_logger(&mut msgs); let logger = create_clc_logger(&mut msgs);
let res = unsafe { clc_validate_spirv(&self.spirv, &logger, options) }; let res = unsafe { clc_validate_spirv(&self.spirv, &logger, options) };
(res, msgs.join("\n")) (res, msgs.join(""))
} }
pub fn clone_on_validate(&self, options: &clc_validator_options) -> (Option<Self>, String) { pub fn clone_on_validate(&self, options: &clc_validator_options) -> (Option<Self>, String) {