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

Fix android GL crash #22234

Merged
merged 1 commit into from Nov 23, 2018
Merged

Fix android GL crash #22234

merged 1 commit into from Nov 23, 2018

Conversation

@jdm
Copy link
Member

jdm commented Nov 20, 2018 •
edited by SimonSapin

There were two issues, fundamentally:

  1. POINT_SPRITE is not supported on GLES, which was causing the GL_INVALID_ENUM error when using any WebGL API.
  2. The version check was using the wrong version value to determine if enabling point sprites was necessary.
  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #22162
  • There are tests for these changes

This change is Reviewable
@jdm
Copy link
Member Author

jdm commented Nov 20, 2018

@bors-servo try=wpt
@bors-servo
Copy link
Contributor

bors-servo commented Nov 20, 2018

⌛ Trying commit 837267a with merge 4ffaa2a...
bors-servo added a commit that referenced this pull request Nov 20, 2018
@bors-servo
Auto merge of #22234 - jdm:android-gl-crash, r=<try>
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…
4ffaa2a 
Fix android GL crash

There were two issues, fundamentally:
1. POINT_SPRITE is not supported on GLES, which was causing the GL_INVALID_ENUM error when using any WebGL API.
2. The version check was using the wrong version value to determine if enabling point sprites was necessary.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22162
- [x] There are tests for these changes
@bors-servo
Copy link
Contributor

bors-servo commented Nov 20, 2018

☀️ Test successful - linux-rel-css, linux-rel-wpt
State: approved= try=True
@jdm
webgl: Don't unnecessarily enable point sprites on GLES.
Loading status checks…
9c29e13
@jdm jdm force-pushed the jdm:android-gl-crash branch from 837267a to 9c29e13 Nov 21, 2018
@Manishearth
Copy link
Member

Manishearth commented Nov 21, 2018

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

bors-servo commented Nov 21, 2018

📌 Commit 9c29e13 has been approved by Manishearth
@highfive highfive assigned Manishearth and unassigned emilio Nov 21, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2018

⌛ Testing commit 9c29e13 with merge 2d5c6d8...
bors-servo added a commit that referenced this pull request Nov 21, 2018
@bors-servo
Auto merge of #22234 - jdm:android-gl-crash, r=Manishearth
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…
2d5c6d8 
Fix android GL crash

There were two issues, fundamentally:
1. POINT_SPRITE is not supported on GLES, which was causing the GL_INVALID_ENUM error when using any WebGL API.
2. The version check was using the wrong version value to determine if enabling point sprites was necessary.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22162
- [x] There are tests for these changes

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

bors-servo commented Nov 21, 2018

💔 Test failed - android
@Manishearth
Copy link
Member

Manishearth commented Nov 21, 2018

Incorrect sha1 hash for /home/servo/buildbot/slave/android/build/android-toolchains/android-ndk-r12b-linux-x86_64.zip

in bootstrap-android

not an issue with this PR, but something is broken on infra (or maybe the download was interrupted?)
@Manishearth
Copy link
Member

Manishearth commented Nov 21, 2018

@bors-servo retry

network issue
bors-servo added a commit that referenced this pull request Nov 21, 2018
@bors-servo
Auto merge of #22234 - jdm:android-gl-crash, r=Manishearth
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…
9e2483a 
Fix android GL crash

There were two issues, fundamentally:
1. POINT_SPRITE is not supported on GLES, which was causing the GL_INVALID_ENUM error when using any WebGL API.
2. The version check was using the wrong version value to determine if enabling point sprites was necessary.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22162
- [x] There are tests for these changes

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

bors-servo commented Nov 21, 2018

⌛ Testing commit 9c29e13 with merge 9e2483a...
@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2018

💔 Test failed - status-taskcluster
@jdm
Copy link
Member Author

jdm commented Nov 21, 2018

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

bors-servo commented Nov 21, 2018

💣 Failed to start rebuilding: Unknown error
@jdm
Copy link
Member Author

jdm commented Nov 22, 2018

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

bors-servo commented Nov 22, 2018

⌛ Testing commit 9c29e13 with merge 355a8bc...
bors-servo added a commit that referenced this pull request Nov 22, 2018
@bors-servo
Auto merge of #22234 - jdm:android-gl-crash, r=Manishearth
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…
355a8bc 
Fix android GL crash

There were two issues, fundamentally:
1. POINT_SPRITE is not supported on GLES, which was causing the GL_INVALID_ENUM error when using any WebGL API.
2. The version check was using the wrong version value to determine if enabling point sprites was necessary.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22162
- [x] There are tests for these changes

<!-- 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/22234)
<!-- Reviewable:end -->
@jdm
Copy link
Member Author

jdm commented Nov 23, 2018

@bors-servo retry
bors-servo added a commit that referenced this pull request Nov 23, 2018
@bors-servo
Auto merge of #22234 - jdm:android-gl-crash, r=Manishearth
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…
f24144b 
Fix android GL crash

There were two issues, fundamentally:
1. POINT_SPRITE is not supported on GLES, which was causing the GL_INVALID_ENUM error when using any WebGL API.
2. The version check was using the wrong version value to determine if enabling point sprites was necessary.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22162
- [x] There are tests for these changes

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

bors-servo commented Nov 23, 2018

⌛ Testing commit 9c29e13 with merge f24144b...
@bors-servo
Copy link
Contributor

bors-servo commented Nov 23, 2018

💔 Test failed - linux-dev
@jdm
Copy link
Member Author

jdm commented Nov 23, 2018

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

bors-servo commented Nov 23, 2018

⌛ Testing commit 9c29e13 with merge 1ca0558...
bors-servo added a commit that referenced this pull request Nov 23, 2018
@bors-servo
Auto merge of #22234 - jdm:android-gl-crash, r=Manishearth
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…
1ca0558 
Fix android GL crash

There were two issues, fundamentally:
1. POINT_SPRITE is not supported on GLES, which was causing the GL_INVALID_ENUM error when using any WebGL API.
2. The version check was using the wrong version value to determine if enabling point sprites was necessary.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22162
- [x] There are tests for these changes

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

bors-servo commented Nov 23, 2018

💔 Test failed - mac-rel-css2
@jdm
Copy link
Member Author

jdm commented Nov 23, 2018

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

bors-servo commented Nov 23, 2018

⌛ Testing commit 9c29e13 with merge c96f07a...
bors-servo added a commit that referenced this pull request Nov 23, 2018
@bors-servo
Auto merge of #22234 - jdm:android-gl-crash, r=Manishearth
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…
c96f07a 
Fix android GL crash

There were two issues, fundamentally:
1. POINT_SPRITE is not supported on GLES, which was causing the GL_INVALID_ENUM error when using any WebGL API.
2. The version check was using the wrong version value to determine if enabling point sprites was necessary.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22162
- [x] There are tests for these changes

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

bors-servo commented Nov 23, 2018

☀️ Test successful - android, android-mac, 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, magicleap, status-taskcluster, windows-msvc-dev
Approved by: Manishearth
Pushing c96f07a to master...
@bors-servo bors-servo merged commit 9c29e13 into servo:master Nov 23, 2018
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
@nox
Copy link
Member

nox commented Nov 24, 2018

Thanks for fixing this @jdm.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

WebGL on android invalid enum errors for everything
6 participants
@jdm @bors-servo @Manishearth @nox @emilio @highfive
You can’t perform that action at this time.