diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-24 09:21:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 09:21:07 -0500 |
| commit | bb310efbb9e84cf0bd44170c4e08bac664f0ce86 (patch) | |
| tree | 99b8fc41455a4c2446b4c77886bfe2d23217ed55 | |
| parent | df9286d67c51f7598862a275ebcf874eb83ec151 (diff) | |
| parent | 0235bf2c4d5c8fc22098d1ef7d338c777e33b50c (diff) | |
| download | servo-bb310efbb9e84cf0bd44170c4e08bac664f0ce86.tar.gz servo-bb310efbb9e84cf0bd44170c4e08bac664f0ce86.zip | |
Auto merge of #17015 - glennw:fix-batching, r=jdm
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.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17015)
<!-- Reviewable:end -->
| -rw-r--r-- | components/config/opts.rs | 6 |
1 files 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"), |