Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 6 deletions

diff --git a/gfx/wr/webrender/src/device/gl.rs b/gfx/wr/webrender/src/device/gl.rs
index 04a7e13023..c17a16a757 100644
--- a/gfx/wr/webrender/src/device/gl.rs
+++ b/gfx/wr/webrender/src/device/gl.rs
@@ -199,10 +199,6 @@ pub fn get_unoptimized_shader_source(shader_name: &str, base_path: Option<&PathB
     }
 }
 
-pub trait FileWatcherHandler: Send {
-    fn file_changed(&self, path: PathBuf);
-}
-
 impl VertexAttributeKind {
     fn size_in_bytes(&self) -> u32 {
         match *self {
@@ -938,7 +934,7 @@ impl VertexUsageHint {
 }
 
 #[derive(Copy, Clone, Debug)]
-pub struct UniformLocation(gl::GLint);
+pub struct UniformLocation(#[allow(dead_code)] gl::GLint);
 
 impl UniformLocation {
     pub const INVALID: Self = UniformLocation(-1);
@@ -1412,7 +1408,8 @@ fn parse_mali_version(version_string: &str) -> Option<(u32, u32, u32)> {
     let (r_str, version_string) = version_string.split_once("p")?;
     let r = r_str.parse().ok()?;
 
-    let (p_str, _) = version_string.split_once("-")?;
+    // Not all devices have the trailing string following the "p" number.
+    let (p_str, _) = version_string.split_once("-").unwrap_or((version_string, ""));
     let p = p_str.parse().ok()?;
 
     Some((v, r, p))