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

Properly support PACK_ALIGNMENT in WebGL 1 #21683

Merged
merged 6 commits into from Sep 13, 2018
Merged

Properly support PACK_ALIGNMENT in WebGL 1 #21683

merged 6 commits into from Sep 13, 2018

Conversation

@nox
Copy link
Member

nox commented Sep 11, 2018 •
edited by SimonSapin

This change is Reviewable
@highfive
Copy link

highfive commented Sep 11, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs
  • @jgraham: tests/wpt/webgl/meta/conformance/reading/read-pixels-pack-alignment.html.ini, tests/wpt/webgl/meta/conformance2/reading/read-pixels-pack-parameters.html.ini
  • @KiChjang: components/script/dom/webglrenderingcontext.rs
@highfive
Copy link

highfive commented Sep 11, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@nox nox force-pushed the webgl branch from 2f25029 to 14bdb51 Sep 12, 2018
@jdm
jdm reviewed Sep 12, 2018
View changes
components/script/dom/webglrenderingcontext.rs Outdated Show resolved Hide resolved
@nox nox force-pushed the webgl branch from 5d3c0cb to 8e69a55 Sep 12, 2018
@nox
Copy link
Member Author

nox commented Sep 12, 2018

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

bors-servo commented Sep 12, 2018

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

bors-servo commented Sep 12, 2018

☔ The latest upstream changes (presumably #21461) made this pull request unmergeable. Please resolve the merge conflicts.
nox added 6 commits Sep 10, 2018
@nox
Simplify WebGLRenderingContext::PixelStorei
452d850
@nox
Clean up some expectations for WebGL tests in WPT
7fc8899
@nox
Properly support PACK_ALIGNMENT in WebGL 1
d5f3b21
@nox
Annotate yet another expectation with a bug link
7ccb2d8
@nox
Update WebGL tests
a02a6de 
This brings in KhronosGroup/WebGL#2708.
@nox
Kill WebGLThreadObserver
Loading status checks…
6e4bf75
@nox nox force-pushed the webgl branch from 8e69a55 to 6e4bf75 Sep 12, 2018
@nox nox dismissed jdm’s stale review Sep 12, 2018

I fixed the issue.

@nox
Copy link
Member Author

nox commented Sep 12, 2018

Rebased.

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

bors-servo commented Sep 12, 2018

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

bors-servo commented Sep 13, 2018

⌛ Testing commit 6e4bf75 with merge 48fecf7...
bors-servo added a commit that referenced this pull request Sep 13, 2018
@bors-servo
Auto merge of #21683 - 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…
48fecf7 
Properly support PACK_ALIGNMENT in WebGL 1

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

bors-servo commented Sep 13, 2018

💔 Test failed - linux-rel-css
@jdm
Copy link
Member

jdm commented Sep 13, 2018

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

bors-servo commented Sep 13, 2018

⌛ Testing commit 6e4bf75 with merge 60b926a...
bors-servo added a commit that referenced this pull request Sep 13, 2018
@bors-servo
Auto merge of #21683 - 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…
60b926a 
Properly support PACK_ALIGNMENT in WebGL 1

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

bors-servo commented Sep 13, 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 60b926a to master...
@bors-servo bors-servo merged commit 6e4bf75 into master Sep 13, 2018
2 of 4 checks passed
2 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 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
Reviewers

@jdm jdm

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 @bors-servo @jdm
You can’t perform that action at this time.