Update WR (accelerated webgl fix on mac, line decoration optimizations).

servo · Mar 22, 2018 · 30bb1cc · 30bb1cc
1 parent c20d0c0
commit 30bb1cc
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/canvas/canvas_paint_thread.rs b/components/canvas/canvas_paint_thread.rs
@@ -595,6 +595,7 @@ impl<'a> CanvasPaintThread<'a> {
                 format: webrender_api::ImageFormat::BGRA8,
                 offset: 0,
                 is_opaque: false,
+                allow_mipmaps: false,
             };
             let data = webrender_api::ImageData::Raw(Arc::new(element.into()));
 

diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs
@@ -494,6 +494,7 @@ impl<VR: WebVRRenderHandler + 'static, OB: WebGLThreadObserver> WebGLThread<VR,
             format: webrender_api::ImageFormat::BGRA8,
             offset: 0,
             is_opaque: !alpha,
+            allow_mipmaps: false,
         }
     }
 

diff --git a/components/config/opts.rs b/components/config/opts.rs
@@ -190,9 +190,6 @@ pub struct Opts {
     /// True to show webrender profiling stats on screen.
     pub webrender_stats: bool,
 
-    /// True to show webrender debug on screen.
-    pub webrender_debug: bool,
-
     /// True if webrender recording should be enabled.
     pub webrender_record: bool,
 
@@ -312,9 +309,6 @@ pub struct DebugOptions {
     /// Show webrender profiling stats on screen.
     pub webrender_stats: bool,
 
-    /// Show webrender debug on screen.
-    pub webrender_debug: bool,
-
     /// Enable webrender recording.
     pub webrender_record: bool,
 
@@ -366,7 +360,6 @@ impl DebugOptions {
                 "load-webfonts-synchronously" => self.load_webfonts_synchronously = true,
                 "disable-vsync" => self.disable_vsync = true,
                 "wr-stats" => self.webrender_stats = true,
-                "wr-debug" => self.webrender_debug = true,
                 "wr-record" => self.webrender_record = true,
                 "wr-no-batch" => self.webrender_disable_batch = true,
                 "msaa" => self.use_msaa = true,
@@ -549,7 +542,6 @@ pub fn default_opts() -> Opts {
         config_dir: None,
         full_backtraces: false,
         is_printing_version: false,
-        webrender_debug: false,
         webrender_record: false,
         webrender_batch: true,
         precache_shaders: false,
@@ -850,7 +842,6 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
         config_dir: opt_match.opt_str("config-dir").map(Into::into),
         full_backtraces: debug_options.full_backtraces,
         is_printing_version: is_printing_version,
-        webrender_debug: debug_options.webrender_debug,
         webrender_record: debug_options.webrender_record,
         webrender_batch: !debug_options.webrender_disable_batch,
         precache_shaders: debug_options.precache_shaders,

diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs
@@ -82,6 +82,7 @@ fn set_webrender_image_key(webrender_api: &webrender_api::RenderApi, image: &mut
         format: webrender_api::ImageFormat::BGRA8,
         offset: 0,
         is_opaque,
+        allow_mipmaps: true,
     };
     let data = webrender_api::ImageData::new(bytes);
     let image_key = webrender_api.generate_image_key();

diff --git a/components/servo/lib.rs b/components/servo/lib.rs
@@ -184,7 +184,6 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static {
                 resource_override_path: Some(resource_path),
                 enable_aa: opts.enable_text_antialiasing,
                 debug_flags: debug_flags,
-                debug: opts.webrender_debug,
                 recorder: recorder,
                 precache_shaders: opts.precache_shaders,
                 enable_scrollbars: opts.output_file.is_none(),