Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upVarious simplifications, optimizations and features related to clipping. #1679
Conversation
|
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).
|
Looks sensible (and rather elegant)! |
webrender/src/clip.rs
Outdated
| clips: Vec<ClipSource>, | ||
| pub mask_cache_info: MaskCacheInfo, | ||
| pub clips: Vec<ClipSource>, | ||
| pub handles: Vec<GpuCacheHandle>, |
This comment has been minimized.
This comment has been minimized.
kvark
Sep 11, 2017
Member
why don't we want to either simply include GpuCacheHandle into ClipSource or have it stored nearby, e.g. Vec<(ClipSrouce, GpuCacheHandle)>?
This comment has been minimized.
This comment has been minimized.
glennw
Sep 11, 2017
Author
Member
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!
This comment has been minimized.
This comment has been minimized.
|
@kvark OK, pushed a commit that moves |
|
Thank you! |
|
|
bors-servo
added 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 -->
|
|
|
@bors-servo retry |
bors-servo
added 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 -->
|
|
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
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.
glennw commentedSep 8, 2017
•
edited by larsbergstrom
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