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.

Sign up for GitHub

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

Jump to bottom

Fix brush_blend on SandyBridge iGPU #2530

Merged
merged 1 commit into from
Mar 16, 2018
Merged

Fix brush_blend on SandyBridge iGPU #2530

merged 1 commit into from
Mar 16, 2018

Conversation

kvark
Copy link
Member

@kvark kvark commented Mar 15, 2018 •
edited
Loading

Dividing by zero is not a good idea in GLSL.
Also fixes #2088 since we are at it.
r? @jrmuizel

Edit: wiki entry - https://github.com/servo/webrender/wiki/Driver-issues#division-by-zero-on-sandybridge-in-the-fragment-shader

This change is Reviewable

@jrmuizel
Copy link
Collaborator

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit d22e0d6 has been approved by jrmuizel

@kvark
Copy link
Member Author

kvark commented Mar 15, 2018

hold on, I missed one thing
@bors-servo r-

@kvark
Copy link
Member Author

kvark commented Mar 15, 2018

(was missing the filter functions changed from vec4 to vec3)
@bors-servo r=jrmuizel

@bors-servo
Copy link
Contributor

📌 Commit c9752d6 has been approved by jrmuizel

@kvark
Copy link
Member Author

kvark commented Mar 15, 2018

Upon checking with @mstange , it appears that having the color matrix affecting alpha is only needed for SVG color filters, and we don't quite support it in WR anyway, and we'll need way more logic to support SVG filters (not covered by brush_blend). Thus, we figured the test case that modifies the alpha via color matrix needs to be removed.
@bors-servo r=jrmuizel,mstange

@bors-servo
Copy link
Contributor

📌 Commit 6d92644 has been approved by jrmuizel,mstange

@jrmuizel
Copy link
Collaborator

This still needs the test case removed.

@kvark
Copy link
Member Author

kvark commented Mar 15, 2018

Should be good now.
@bors-servo r=jrmuizel,mstange

@bors-servo
Copy link
Contributor

📌 Commit 3e6a6d3 has been approved by jrmuizel,mstange

@bors-servo
Copy link
Contributor

⌛ Testing commit 3e6a6d3 with merge 486ee5f...

bors-servo pushed a commit that referenced this pull request Mar 16, 2018
Auto merge of #2530 - kvark:sandy-bridge, r=jrmuizel,mstange
486ee5f 
Fix brush_blend on SandyBridge iGPU

Dividing by zero is not a good idea in GLSL.
Also fixes #2088 since we are at it.
r? @jrmuizel

Edit: wiki entry - https://github.com/servo/webrender/wiki/Driver-issues#division-by-zero-on-sandybridge-in-the-fragment-shader

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

☀️ Test successful - status-appveyor, status-taskcluster, status-travis
Approved by: jrmuizel,mstange
Pushing 486ee5f to master...

@bors-servo bors-servo merged commit 3e6a6d3 into servo:master Mar 16, 2018
@glennw glennw mentioned this pull request Mar 16, 2018
Closed
16 tasks
@kvark kvark deleted the sandy-bridge branch March 16, 2018 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ps_blend.glsl could be using a mat3 instead of a mat4
3 participants
@kvark @jrmuizel @bors-servo