From 0235bf2c4d5c8fc22098d1ef7d338c777e33b50c Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 24 May 2017 13:27:38 +1000 Subject: [PATCH] Fix the -Z wr-no-batch option. The DebugOpts struct uses the Default trait to set all the values to false initialily. So bools in the DebugOpts struct must be negative verbs to work correctly. This drops the draw call count on HN from ~2000 back to ~5. --- components/config/opts.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/config/opts.rs b/components/config/opts.rs index 84a8a649969..2a51577b14a 100644 --- a/components/config/opts.rs +++ b/components/config/opts.rs @@ -310,7 +310,7 @@ pub struct DebugOptions { pub webrender_record: bool, /// Enable webrender instanced draw call batching. - pub webrender_batch: bool, + pub webrender_disable_batch: bool, /// Use multisample antialiasing in WebRender. pub use_msaa: bool, @@ -359,7 +359,7 @@ impl DebugOptions { "wr-stats" => self.webrender_stats = true, "wr-debug" => self.webrender_debug = true, "wr-record" => self.webrender_record = true, - "wr-no-batch" => self.webrender_batch = false, + "wr-no-batch" => self.webrender_disable_batch = true, "msaa" => self.use_msaa = true, "full-backtraces" => self.full_backtraces = true, "precache-shaders" => self.precache_shaders = true, @@ -827,7 +827,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult { is_printing_version: is_printing_version, webrender_debug: debug_options.webrender_debug, webrender_record: debug_options.webrender_record, - webrender_batch: debug_options.webrender_batch, + webrender_batch: !debug_options.webrender_disable_batch, precache_shaders: debug_options.precache_shaders, signpost: debug_options.signpost, certificate_path: opt_match.opt_str("certificate-path"),