Skip to content
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

Define and enforce BLOCKS_PER_UV_RECT #2212

Merged
merged 1 commit into from Dec 11, 2017
Merged

Define and enforce BLOCKS_PER_UV_RECT #2212

merged 1 commit into from Dec 11, 2017

Conversation

@kvark
Copy link
Member

kvark commented Dec 10, 2017

A stronger version of the fix for #2208
Replaces #2211

TODO: try push

Note: I tried going all the way to type-level enforcement of the GPU block count for everything but faced a few run-time driven GPU layouts (clip sources, borders). Perhaps, next time...


This change is Reviewable

@kvark kvark requested a review from glennw Dec 10, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2017

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

@kvark kvark force-pushed the kvark:uv-block branch from df5f354 to 75030a3 Dec 10, 2017
@kvark
Copy link
Member Author

kvark commented Dec 10, 2017

Funny thing... in an attempt to get a try push with this change I figured I can just fetch the code from failed try pushes of @staktrace , fix it, and push again. What a mistake! Git-cinnabar-powered fetch went OOM on my 8gb RAM laptop after an hour of operation, with all apps except that console window closed...

@glennw
Copy link
Member

glennw commented Dec 10, 2017

Looks good, r=me. I'll leave it to you if you want to do a try push, but it doesn't seem necessary for this patch, I think.

@glennw
glennw approved these changes Dec 10, 2017
@kvark
Copy link
Member Author

kvark commented Dec 11, 2017

Now that #2211 is merged this PR doesn't change any logic, hence safe to merge.
@bors-servo r=glennw

@bors-servo
Copy link
Contributor

bors-servo commented Dec 11, 2017

📌 Commit 75030a3 has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Dec 11, 2017

Testing commit 75030a3 with merge 700ac28...

bors-servo added a commit that referenced this pull request Dec 11, 2017
Define and enforce BLOCKS_PER_UV_RECT

A stronger version of the fix for #2208
Replaces #2211

TODO: try push

Note: I tried going all the way to type-level enforcement of the GPU block count for everything but faced a few run-time driven GPU layouts (clip sources, borders). Perhaps, next time...

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

bors-servo commented Dec 11, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: glennw
Pushing 700ac28 to master...

@bors-servo bors-servo merged commit 75030a3 into servo:master Dec 11, 2017
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@kvark kvark deleted the kvark:uv-block branch Dec 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.