Skip to content

Commit

Permalink
servo: Merge #16958 - -Z wr-no-batch option (from kvark:no-batch); r=jdm
Browse files Browse the repository at this point in the history
<!-- Please describe your changes on the following line: -->

This new debug option exposes servo/webrender#1186

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because _____ it's a debug option

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: b42ee29c1bc66484406c289c70aa5c4795728743

UltraBlame original commit: b81b9a65cfa09fb8b55d5ce0d16f7346ee615eba
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent 8fc1ddb commit c0cfa7f
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 0 deletions.
48 changes: 48 additions & 0 deletions servo/components/config/opts.rs
Expand Up @@ -406,6 +406,10 @@ webrender_record
:
bool
pub
webrender_batch
:
bool
pub
precache_shaders
:
bool
Expand Down Expand Up @@ -620,6 +624,10 @@ webrender_record
:
bool
pub
webrender_batch
:
bool
pub
use_msaa
:
bool
Expand Down Expand Up @@ -1020,6 +1028,20 @@ webrender_record
=
true
"
wr
-
no
-
batch
"
=
>
self
.
webrender_batch
=
false
"
msaa
"
=
Expand Down Expand Up @@ -1678,6 +1700,24 @@ borders
print_option
(
"
wr
-
no
-
batch
"
"
Disable
webrender
instanced
batching
.
"
)
;
print_option
(
"
precache
-
shaders
Expand Down Expand Up @@ -2446,6 +2486,9 @@ false
webrender_record
:
false
webrender_batch
:
true
precache_shaders
:
false
Expand Down Expand Up @@ -5402,6 +5445,11 @@ webrender_record
debug_options
.
webrender_record
webrender_batch
:
debug_options
.
webrender_batch
precache_shaders
:
debug_options
Expand Down
5 changes: 5 additions & 0 deletions servo/components/servo/lib.rs
Expand Up @@ -997,6 +997,11 @@ enable_profiler
opts
.
webrender_stats
enable_batcher
:
opts
.
webrender_batch
debug
:
opts
Expand Down

0 comments on commit c0cfa7f

Please sign in to comment.