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 WR version, add latest shaders to resources. #13256

Closed
wants to merge 1 commit into from

Conversation

@samuknet
Copy link
Contributor

samuknet commented Sep 13, 2016


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because webrender update

Signed-off-by: Sam swood@mozilla.com


This change is Reviewable

Signed-off-by: Sam <swood@mozilla.com>
@highfive
Copy link

highfive commented Sep 13, 2016

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @SimonSapin (or someone else) soon.

@samuknet
Copy link
Contributor Author

samuknet commented Sep 13, 2016

@jdm
Copy link
Member

jdm commented Sep 13, 2016

@bors-servo: r=glennw

@bors-servo
Copy link
Contributor

bors-servo commented Sep 13, 2016

📌 Commit 174272b has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Sep 13, 2016

Testing commit 174272b with merge d77d34a...

bors-servo added a commit that referenced this pull request Sep 13, 2016
Update WR version, add latest shaders to resources.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because webrender update

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Signed-off-by: Sam <swood@mozilla.com>

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13256)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 13, 2016

💔 Test failed - mac-rel-wpt

@jdm
Copy link
Member

jdm commented Sep 13, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Sep 13, 2016

Previous build results for arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, windows-dev are reusable. Rebuilding only mac-rel-wpt...

@bors-servo
Copy link
Contributor

bors-servo commented Sep 13, 2016

💔 Test failed - mac-rel-wpt

@highfive
Copy link

highfive commented Sep 13, 2016

  ▶ TIMEOUT [expected OK] /webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html
@jdm
Copy link
Member

jdm commented Sep 13, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Sep 15, 2016

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

@jdm
Copy link
Member

jdm commented Sep 15, 2016

Superseded by #13273.

@jdm jdm closed this Sep 15, 2016
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

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