Skip to content

/ servo

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 offscreen_gl_context #16867

Merged
merged 1 commit into from May 27, 2017
Merged

Update offscreen_gl_context #16867

merged 1 commit into from May 27, 2017

Conversation

@MortimerGoro
Copy link
Contributor

MortimerGoro commented May 15, 2017 •
edited by larsbergstrom

Adds servo/surfman#97 and servo/surfman#98 required to run some WebGL demos

  • ./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 _____

This change is Reviewable
@nox
Copy link
Member

nox commented May 15, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented May 15, 2017

📌 Commit f53c8ae has been approved by nox
@highfive highfive assigned nox and unassigned mbrubeck May 15, 2017
@bors-servo
Copy link
Contributor

bors-servo commented May 15, 2017

⌛ Testing commit f53c8ae with merge e77712e1fc2aecb3b0a5365f155f024fc2d2b871...
@bors-servo
Copy link
Contributor

bors-servo commented May 15, 2017

💔 Test failed - linux-rel-wpt
@nox
Copy link
Member

nox commented May 15, 2017

Many many failures. What happened there? Cc @emilio
@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 15, 2017

It's because some tests were exiting early when canvas.getContext("webgl") was failing when setting antialias or depth + stencil.

There are a lot of errors but they come from the same 2 files:

  • context-attributes-alpha-depth-stencil-antialias.html
  • copy-tex-image-and-sub-image-2d.html

I'll check if they are easy to fix
@MortimerGoro MortimerGoro mentioned this pull request May 15, 2017
Merged
@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 15, 2017 •
edited

I checked the failing tests and they're quite easy to fix.

We'll need to wait for servo/webrender#1255 (this fixes 99% of context-attributes-alpha-depth-stencil-antialias.html tests)

The remaining tests just fail because now enabling antialias doesn't fail to create the WebGL context (as the spec says) and some tests expect a bit different colors in that case. I'll update expectations for those tests, which can't be passed until real antialias is implemented.
bors-servo added a commit to servo/webrender that referenced this pull request May 16, 2017
@bors-servo
Auto merge of #1255 - MortimerGoro:webgl_get_x_bits, r=glennw
Loading status checks…
4ab9b9b 
Enable gl::XXX_BITS constants in WebGL getParameter command.

Required to pass some WebGL conformance tests. See servo/servo#16867

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

bors-servo commented May 16, 2017

☔ The latest upstream changes (presumably #16860) made this pull request unmergeable. Please resolve the merge conflicts.
@MortimerGoro MortimerGoro mentioned this pull request May 19, 2017
Closed
@MortimerGoro MortimerGoro force-pushed the MortimerGoro:update_offscreen_gl_ctx branch from f53c8ae to 752c825 May 22, 2017
@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 22, 2017 •
edited

servo/webrender#1255 landed and I updated test expectations.

Ready for retry
@jdm
Copy link
Member

jdm commented May 22, 2017

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented May 22, 2017

📌 Commit 752c825 has been approved by jdm
@highfive highfive assigned jdm and unassigned nox May 22, 2017
@jdm jdm mentioned this pull request May 25, 2017
Closed
@jdm
Copy link
Member

jdm commented May 25, 2017

@bors-servo: r+
Filed #17038.
@bors-servo
Copy link
Contributor

bors-servo commented May 25, 2017

📌 Commit 72ed377 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented May 25, 2017

⌛ Testing commit 72ed377 with merge 861a66e...
bors-servo added a commit that referenced this pull request May 25, 2017
@bors-servo
Auto merge of #16867 - MortimerGoro:update_offscreen_gl_ctx, r=jdm
Loading status checks…
861a66e 
Update offscreen_gl_context to 0.8.8

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

Adds servo/surfman#97 and servo/surfman#98 required to run some WebGL demos

---
<!-- 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: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

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

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

bors-servo commented May 25, 2017

💔 Test failed - android
@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 25, 2017 

wget https://www.openssl.org/source/openssl-1.0.1t.tar.gz
--2017-05-25 16:20:11--  https://www.openssl.org/source/openssl-1.0.1t.tar.gz
Resolving www.openssl.org (www.openssl.org)... 104.126.148.122, 2600:1405:6:180::c1e, 2600:1405:6:18b::c1e
Connecting to www.openssl.org (www.openssl.org)|104.126.148.122|:443... connected.
HTTP request sent, awaiting response... 404 Not Found
2017-05-25 16:20:12 ERROR 404: Not Found.

make: *** [openssl-1.0.1t/Configure] Error 8
program finished with exit code 2
elapsedTime=2.563634
@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 25, 2017 •
edited

OpenSSL has published some new versions today: https://www.openssl.org/source/

Maybe they have deleted the one used in Servo for Android? If that's the case all PRs will fail until fixed.
@jdm
Copy link
Member

jdm commented May 25, 2017 •
edited by nox

Yes, we need to use https://www.openssl.org/source/old/1.0.1/openssl-1.0.1t.tar.gz now.
@bors-servo
Copy link
Contributor

bors-servo commented May 26, 2017

☔ The latest upstream changes (presumably #17042) made this pull request unmergeable. Please resolve the merge conflicts.
@MortimerGoro
Update offscreen_gl_context to 0.8.9
Loading status checks…
a3e6db1
@MortimerGoro MortimerGoro force-pushed the MortimerGoro:update_offscreen_gl_ctx branch from 72ed377 to a3e6db1 May 26, 2017
@MortimerGoro MortimerGoro changed the title Update offscreen_gl_context to 0.8.8 Update offscreen_gl_context May 26, 2017
@nox
Copy link
Member

nox commented May 27, 2017

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

bors-servo commented May 27, 2017

📌 Commit a3e6db1 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented May 27, 2017

⌛ Testing commit a3e6db1 with merge 00a5da3...
bors-servo added a commit that referenced this pull request May 27, 2017
@bors-servo
Auto merge of #16867 - MortimerGoro:update_offscreen_gl_ctx, r=jdm
Loading status checks…
00a5da3 
Update offscreen_gl_context

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

Adds servo/surfman#97 and servo/surfman#98 required to run some WebGL demos

---
<!-- 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: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

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

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

bors-servo commented May 27, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: jdm
Pushing 00a5da3 to master...
@bors-servo bors-servo merged commit a3e6db1 into servo:master May 27, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@MortimerGoro @nox @bors-servo @jdm @mbrubeck @highfive
You can’t perform that action at this time.