Skip to content

/ webrender

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

Add simplier border shader for solid borders. #3011

Merged
merged 2 commits into from Sep 5, 2018
Merged

Add simplier border shader for solid borders. #3011

merged 2 commits into from Sep 5, 2018
+280 −10

Conversation

@djg
Copy link
Contributor

djg commented Sep 3, 2018 •
edited by larsbergstrom

This fixes #3003

This change is Reviewable
@gw3583
Copy link
Collaborator

gw3583 commented Sep 4, 2018

@djg Could you do a try run and paste the link?
@djg
Copy link
Contributor Author

djg commented Sep 4, 2018

@gw3583 I can. I think. :-)
@djg
Copy link
Contributor Author

djg commented Sep 4, 2018

https://treeherder.mozilla.org/#/jobs?repo=try&revision=e408a5e4f74ff9908b879e4913f777fe2509d353&selectedJob=197291382

Looks like so reftest failures to cleanup.
@kvark
Copy link
Member

kvark commented Sep 4, 2018

@djg there is a bunch of unexpected passes (🎉 ), and all the failures are marked as intermittent.
@kvark
kvark reviewed Sep 4, 2018
View changes
webrender/res/cs_border_solid.glsl Outdated Show resolved Hide resolved
webrender/src/tiling.rs Outdated Show resolved Hide resolved
webrender/src/tiling.rs Outdated Show resolved Hide resolved
@djg
Copy link
Contributor Author

djg commented Sep 4, 2018

https://treeherder.mozilla.org/#/jobs?repo=try&revision=9a6cd6951e21d025d791e7aeef0ef7897c55649a&selectedJob=197318957 is just the changes from this patch and not all of webrender. The transform-3d reftest failure goes away.
@djg djg force-pushed the djg:split-cs-border-segment branch from dbbdc66 to 8370ab6 Sep 5, 2018
@djg
Add simplier border shader for solid borders.
Loading status checks…
3428fc3
@djg djg force-pushed the djg:split-cs-border-segment branch from 8370ab6 to 3428fc3 Sep 5, 2018
@djg
Clarify 'Should never get hit' comment in cs_border shaders.
Loading status checks…
133026f
@kvark
kvark approved these changes Sep 5, 2018
View changes
@gw3583
Copy link
Collaborator

gw3583 commented Sep 5, 2018

@bors-servo r=kvark
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2018

📌 Commit 133026f has been approved by kvark
@bors-servo
Copy link
Contributor

bors-servo commented Sep 5, 2018

⌛ Testing commit 133026f with merge 226d23e...
bors-servo added a commit that referenced this pull request Sep 5, 2018
@bors-servo
Auto merge of #3011 - djg:split-cs-border-segment, r=kvark
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
226d23e 
Add simplier border shader for solid borders.

This fixes #3003

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

bors-servo commented Sep 5, 2018

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: kvark
Pushing 226d23e to master...
@bors-servo bors-servo merged commit 133026f into servo:master Sep 5, 2018
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
emilio added a commit that referenced this pull request Sep 7, 2018
@emilio
renderer: Fix border profiling.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
7a0887e 
Was broken by #3011.

Also while at it, avoid setting and unsetting blend modes unnecessarily.
@emilio emilio mentioned this pull request Sep 7, 2018
Merged
bors-servo added a commit that referenced this pull request Sep 7, 2018
@bors-servo
Auto merge of #3032 - servo:border-profile, r=kvark
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
ced2718 
renderer: Fix border profiling.

Was broken by #3011.

Also while at it, avoid setting and unsetting blend modes unnecessarily.

<!-- 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/3032)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvark kvark

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Consider splitting up cs_border_segment shader
4 participants
@djg @gw3583 @kvark @bors-servo
You can’t perform that action at this time.