updated AMD diagnostics regex

This commit is contained in:
Noah Santschi-Cooney 2022-04-09 18:11:50 +01:00
parent d3365c3bff
commit 3b865dfda2
No known key found for this signature in database
GPG key ID: 3B22282472C8AE48

View file

@ -32,7 +32,7 @@ impl<'a, T: opengl::ShaderValidator + ?Sized> DiagnosticsParser<'a, T> {
"NVIDIA Corporation" => { "NVIDIA Corporation" => {
Regex::new(r#"^(?P<filepath>\d+)\((?P<linenum>\d+)\) : (?P<severity>error|warning) [A-C]\d+: (?P<output>.+)"#).unwrap() Regex::new(r#"^(?P<filepath>\d+)\((?P<linenum>\d+)\) : (?P<severity>error|warning) [A-C]\d+: (?P<output>.+)"#).unwrap()
} }
_ => Regex::new(r#"^(?P<severity>ERROR|WARNING): (?P<filepath>[^?<>*|"\n]+):(?P<linenum>\d+): '[a-z]*' : (?P<output>.+)$"#) _ => Regex::new(r#"^(?P<severity>ERROR|WARNING): (?P<filepath>[^?<>*|"\n]+):(?P<linenum>\d+): (?:'.*' :|[a-z]+\(#\d+\)) +(?P<output>.+)$"#)
.unwrap(), .unwrap(),
}) })
} }
@ -122,7 +122,7 @@ impl<'a, T: opengl::ShaderValidator + ?Sized> DiagnosticsParser<'a, T> {
mod diagnostics_test { mod diagnostics_test {
use std::path::PathBuf; use std::path::PathBuf;
use slog::{slog_o, Level}; use slog::slog_o;
use url::Url; use url::Url;
use crate::{ use crate::{