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

A couple of WebGL changes before lunch time #21747

Merged
merged 4 commits into from Sep 20, 2018
Merged

A couple of WebGL changes before lunch time #21747

merged 4 commits into from Sep 20, 2018
+140 −12

Conversation

@nox
Copy link
Member

nox commented Sep 19, 2018 •
edited by SimonSapin

This change is Reviewable
@highfive
Copy link

highfive commented Sep 19, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglprogram.rs
  • @jgraham: tests/wpt/webgl/meta/conformance/textures/misc/tex-input-validation.html.ini, tests/wpt/webgl/tests/conformance/textures/misc/canvas-teximage-after-multiple-drawimages.html, tests/wpt/webgl/meta/MANIFEST.json, tests/wpt/webgl/tests/conformance/textures/misc/00_test_list.txt, tests/wpt/webgl/meta/conformance/textures/misc/copy-tex-image-2d-formats.html.ini
  • @KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglprogram.rs
@jdm
Copy link
Member

jdm commented Sep 19, 2018

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

bors-servo commented Sep 19, 2018

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

bors-servo commented Sep 19, 2018

⌛ Testing commit 821d1a9 with merge 38d90f7...
bors-servo added a commit that referenced this pull request Sep 19, 2018
@bors-servo
Auto merge of #21747 - servo:webgl, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
38d90f7 
A couple of WebGL changes before lunch time

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

bors-servo commented Sep 19, 2018

💔 Test failed - arm64
@jdm
Copy link
Member

jdm commented Sep 19, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Sep 19, 2018

⌛ Testing commit 821d1a9 with merge 9b7ae98...
bors-servo added a commit that referenced this pull request Sep 19, 2018
@bors-servo
Auto merge of #21747 - servo:webgl, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9b7ae98 
A couple of WebGL changes before lunch time

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

bors-servo commented Sep 19, 2018

💔 Test failed - mac-rel-wpt3
@jdm
Copy link
Member

jdm commented Sep 20, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Sep 20, 2018

🔒 Merge conflict
@bors-servo
Copy link
Contributor

bors-servo commented Sep 20, 2018

☔ The latest upstream changes (presumably #21737) made this pull request unmergeable. Please resolve the merge conflicts.
nox added 4 commits Sep 19, 2018
@nox
Remove some misplaced framebuffer validations
943f95f
@nox
Fix the error when calling getProgramInfoLog on a deleted program (#2…
a3d8b5d 
…0561)
@nox
Update WebGL tests
2662739
@nox
Add some bug links
Loading status checks…
aeaf895
@nox nox force-pushed the webgl branch from 821d1a9 to aeaf895 Sep 20, 2018
@nox
Copy link
Member Author

nox commented Sep 20, 2018

@bors-servo retry
@nox
Copy link
Member Author

nox commented Sep 20, 2018

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

bors-servo commented Sep 20, 2018

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

bors-servo commented Sep 20, 2018

⌛ Testing commit aeaf895 with merge d60b14b...
bors-servo added a commit that referenced this pull request Sep 20, 2018
@bors-servo
Auto merge of #21747 - servo:webgl, r=jdm
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
d60b14b 
A couple of WebGL changes before lunch time

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

bors-servo commented Sep 20, 2018

☀️ Test successful - android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing d60b14b to master...
@bors-servo bors-servo merged commit aeaf895 into master Sep 20, 2018
1 of 4 checks passed
1 of 4 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
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

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