Skip to content

Tile external buffer images when they exceed the maximum texture size. #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2017

Conversation

nical
Copy link
Contributor

@nical nical commented Mar 30, 2017

Fixes issue #1027, and addresses a review comment from PR #1004 about explicitly enumerating all variants instead of using _ => { ... } in this match expression.

r? @kvark


This change is Reviewable

@kvark
Copy link
Member

kvark commented Mar 30, 2017

Much better, thanks!
@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit b556ba8 has been approved by kvark

@bors-servo
Copy link
Contributor

🔒 Merge conflict

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #997) made this pull request unmergeable. Please resolve the merge conflicts.

@nical nical force-pushed the tiled-external-buffer branch from b556ba8 to 16743c5 Compare March 30, 2017 14:01
@nical
Copy link
Contributor Author

nical commented Mar 30, 2017

Rebased. It doesn't read as nicely anymore due to the verbosity of ExternalImageData. I am tempted to change ImageData::External to be External(ExternalImageId, ExternalImageType) to reduce the noise.

&ImageData::Raw(_) => { size_check }
&ImageData::Blob(_) => { size_check }
&ImageData::External(ExternalImageData { image_type: ExternalImageType::ExternalBuffer, .. }) => {
size_check
Copy link
Member

@kvark kvark Mar 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could do data.image_type == ExternalImageType::ExternalBuffer && size_check instead of pattern matching

@nical nical force-pushed the tiled-external-buffer branch 2 times, most recently from 38b789e to 97cdf3e Compare March 30, 2017 15:52
@nical nical force-pushed the tiled-external-buffer branch from 97cdf3e to 48d7c6a Compare March 30, 2017 16:22
@kvark
Copy link
Member

kvark commented Mar 30, 2017

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 48d7c6a has been approved by kvark

@bors-servo
Copy link
Contributor

⌛ Testing commit 48d7c6a with merge 8722163...

bors-servo pushed a commit that referenced this pull request Mar 30, 2017
Tile external buffer images when they exceed the maximum texture size.

Fixes issue #1027, and addresses a review comment from PR #1004 about explicitly enumerating all variants instead of using ```_ => { ... }``` in this match expression.

r? @kvark

<!-- 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/1036)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - status-travis
Approved by: kvark
Pushing 8722163 to master...

@bors-servo bors-servo merged commit 48d7c6a into servo:master Mar 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants