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

Update angle shader validation features and add a missing newline #2873

Merged
merged 1 commit into from Jul 10, 2018

Conversation

@zakorgy
Copy link
Contributor

zakorgy commented Jul 6, 2018

This adds the missing new line to the end of the the feature strings, which I described in #2872.
Also updated the features which the angle validator uses for testing, since TRANSFORM is no longer a Primitive shader feature and Brush shaders have their own feature set too.

Fixes #2872


This change is Reviewable

@kvark
Copy link
Member

kvark commented Jul 6, 2018

This is blocked until we figure out the exact situation happening in #2872

@zakorgy zakorgy changed the title Add a missing new line to shader feature strings in angle Update angle shader validation features and add a missing newline Jul 6, 2018
@kvark kvark removed the status: blocked label Jul 6, 2018
@@ -43,7 +44,7 @@ const SHADERS: &[Shader] = &[
// Cache shaders
Shader {
name: "cs_blur",
features: CACHE_FEATURES,
features: &[ "ALPHA_TARGET", "COLOR_TARGET" ],

This comment has been minimized.

@kvark

kvark Jul 6, 2018

Member

don't we need the same for cs_border_segment?

},
Shader {
name: "brush_radial_gradient",
features: &[ "DITHERING" ],
features: &[ "", "DITHERING", "ALPHA_PASS", "DITHERING,ALPHA_PASS" ],

This comment has been minimized.

@kvark

kvark Jul 6, 2018

Member

let's have a GRADIENT_FEATURES define

},
Shader {
name: "brush_linear_gradient",
features: &[],
features: &[ "", "DITHERING", "ALPHA_PASS", "DITHERING,ALPHA_PASS" ],

This comment has been minimized.

@kvark

kvark Jul 6, 2018

Member

dithering wasn't used here before, why is this needed now?

This comment has been minimized.

@zakorgy

zakorgy Jul 6, 2018

Author Contributor

I just tought it is a good idea to test both gradient tests with all the possible features.

This comment has been minimized.

@kvark

kvark Jul 6, 2018

Member

yeah, if the dithering is indeed used, we should test for it :) let's just have a common define for those feature sets

@kvark
Copy link
Member

kvark commented Jul 6, 2018

Strongly related to #2436

…dation, and update shader features
@zakorgy zakorgy force-pushed the zakorgy:angle-validator-fix branch from e93bdcf to 68b7da2 Jul 6, 2018
@zakorgy
Copy link
Contributor Author

zakorgy commented Jul 10, 2018

@kvark Could you please take a look at this PR? I think, I have addressed all of your comments.

@kvark
kvark approved these changes Jul 10, 2018
Copy link
Member

kvark left a comment

Yes, thank you!

@kvark
Copy link
Member

kvark commented Jul 10, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Jul 10, 2018

📌 Commit 68b7da2 has been approved by kvark

@bors-servo
Copy link
Contributor

bors-servo commented Jul 10, 2018

Testing commit 68b7da2 with merge 5f0967e...

bors-servo added a commit that referenced this pull request Jul 10, 2018
Update angle shader validation features and add a missing newline

This adds the missing new line to the end of the the feature strings, which I described in #2872.
Also updated the features which the angle validator uses for testing, since `TRANSFORM` is no longer a Primitive shader feature and Brush shaders have their own feature set too.

Fixes #2872

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

bors-servo commented Jul 10, 2018

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: kvark
Pushing 5f0967e to master...

@bors-servo bors-servo merged commit 68b7da2 into servo:master Jul 10, 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
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.