Various simplifications, optimizations and features related to clipping. #1679
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Author
|
This change is probably easier to review by considering each commit as a separate improvement... |
This reduces a lot of memory copying and allocations, since the clip stack built each frame now just contains handles into the clip store, rather than copying the entire mask cache.
We no longer need to copy the border sources etc into the mask cache structures - they can be referenced directly from the clip sources. We also use a separate GPU cache handle for each clip now, so the ClipAddressRange code is no longer needed. This is possible since we use the GpuCache now, which doesn't need to allocate space during initialization. This also simplifies the code in the clip batcher that adds clip instances to the render targets. Add support for multiple image masks (a by-product of removing the init step of the mask cache code).
glennw
force-pushed
the
clip-store-6
branch
from
925d6ee to
fe7444e
Compare
kvark
approved these changes
Sep 11, 2017
Member
kvark
left a comment
kvark
left a comment
There was a problem hiding this comment.
Looks sensible (and rather elegant)!
Just one note to address/answer, after which r=me
webrender/src/clip.rs
Outdated
| clips: Vec<ClipSource>, | ||
| pub mask_cache_info: MaskCacheInfo, | ||
| pub clips: Vec<ClipSource>, | ||
| pub handles: Vec<GpuCacheHandle>, |
Member
There was a problem hiding this comment.
why don't we want to either simply include GpuCacheHandle into ClipSource or have it stored nearby, e.g. Vec<(ClipSrouce, GpuCacheHandle)>?
Member
Author
There was a problem hiding this comment.
I did consider including it in ClipSource but it seemed a bit cleaner conceptually to separate them. No real reason it couldn't be in a tuple though!
Member
Author
|
@kvark OK, pushed a commit that moves |
Member
|
Thank you! |
Contributor
|
📌 Commit e1ef408 has been approved by |
Contributor
bors-servo
pushed a commit
that referenced
this pull request
Sep 11, 2017
Various simplifications, optimizations and features related to clipping.
* Introduce ClipStore, an arena for storing clip sources.
This reduces a lot of memory copying and allocations, since the clip stack built each frame now just contains handles into the clip store, rather than copying the entire mask cache.
* Move remaining mask cache code into ClipSources, and simplify it.
We no longer need to copy the border sources etc into the mask cache structures - they can be referenced directly from the clip sources.
* Use a separate GPU cache handle for each clip, so ClipAddressRange code is no longer needed.
This is possible since we use the GpuCache now, which doesn't need to allocate space during initialization.
* Simplify the code in the clip batcher that adds clip instances to the render targets.
* Add support for multiple image masks (a by-product of removing the init step of the mask cache code).
* Move MaskBounds into the ClipSources (from the MaskCacheInfo struct).
* Add recycle() to free list, and support cloning weak handles.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1679)
<!-- Reviewable:end -->
Contributor
|
💔 Test failed - status-travis |
Member
Author
|
@bors-servo retry |
Contributor
bors-servo
pushed a commit
that referenced
this pull request
Sep 12, 2017
Various simplifications, optimizations and features related to clipping.
* Introduce ClipStore, an arena for storing clip sources.
This reduces a lot of memory copying and allocations, since the clip stack built each frame now just contains handles into the clip store, rather than copying the entire mask cache.
* Move remaining mask cache code into ClipSources, and simplify it.
We no longer need to copy the border sources etc into the mask cache structures - they can be referenced directly from the clip sources.
* Use a separate GPU cache handle for each clip, so ClipAddressRange code is no longer needed.
This is possible since we use the GpuCache now, which doesn't need to allocate space during initialization.
* Simplify the code in the clip batcher that adds clip instances to the render targets.
* Add support for multiple image masks (a by-product of removing the init step of the mask cache code).
* Move MaskBounds into the ClipSources (from the MaskCacheInfo struct).
* Add recycle() to free list, and support cloning weak handles.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1679)
<!-- Reviewable:end -->
Contributor
|
☀️ Test successful - status-travis |
This was referenced Sep 12, 2017
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reduces a lot of memory copying and allocations, since the clip stack built each frame now just contains handles into the clip store, rather than copying the entire mask cache.
We no longer need to copy the border sources etc into the mask cache structures - they can be referenced directly from the clip sources.
This is possible since we use the GpuCache now, which doesn't need to allocate space during initialization.
This change is