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

Add a feature for dithering #1172

Merged
merged 1 commit into from Apr 28, 2017
Merged

Add a feature for dithering #1172

merged 1 commit into from Apr 28, 2017

Conversation

@eqrion
Copy link
Contributor

eqrion commented Apr 27, 2017

In order to help pass all the reftests for enabling gradients by default in
Gecko, it would be nice to be able to disable dithering. Canvas2D gradients
and border gradients in Gecko don't use dithering, and that causes some
issues. Enabling dithering can be investigated as a follow up.


This change is Reviewable

Copy link
Member

kvark left a comment

I think it's reasonable to have it feature gated.
Let's make fewer changes to the shaders though.

@@ -837,4 +838,6 @@ vec4 dither(vec4 color) {

return color + vec4(noise, noise, noise, 0);
}
#endif

This comment has been minimized.

@kvark

kvark Apr 27, 2017

Member

I believe all you need on the shader side is

#else
vec4 dither(vec4 color) { return color; }

This comment has been minimized.

@eqrion

eqrion Apr 27, 2017

Author Contributor

Yes that makes sense, I've updated the PR.

@eqrion eqrion force-pushed the eqrion:gradient/dither branch from b04ce97 to 3db41b7 Apr 27, 2017
@kvark
Copy link
Member

kvark commented Apr 27, 2017

Thanks!
@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Apr 27, 2017

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

@glennw
Copy link
Member

glennw commented Apr 27, 2017

This needs a rebase, then should be ready to go.

@eqrion eqrion force-pushed the eqrion:gradient/dither branch from 3db41b7 to c36f1b6 Apr 28, 2017
@eqrion
Copy link
Contributor Author

eqrion commented Apr 28, 2017

Rebased.

@glennw
Copy link
Member

glennw commented Apr 28, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Apr 28, 2017

📌 Commit c36f1b6 has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Apr 28, 2017

Testing commit c36f1b6 with merge 7b499ba...

bors-servo added a commit that referenced this pull request Apr 28, 2017
Add a feature for dithering

In order to help pass all the reftests for enabling gradients by default in
Gecko, it would be nice to be able to disable dithering. Canvas2D gradients
and border gradients in Gecko don't use dithering, and that causes some
issues. Enabling dithering can be investigated as a follow up.

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

bors-servo commented Apr 28, 2017

☀️ Test successful - status-travis
Approved by: glennw
Pushing 7b499ba to master...

@bors-servo bors-servo merged commit c36f1b6 into servo:master Apr 28, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@eqrion eqrion deleted the eqrion:gradient/dither branch Apr 28, 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

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