Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24128 - asajeffrey:webgl-extensions-fallback, r=Manishearth

Browse source 
Fallback to old extensions API if NUM_EXTENSIONS errors

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

Fixes a panic querying extensions in WebGL 1.

---
<!-- 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
- [x] These changes fix #21993
- [x] These changes do not require tests because it fixes a panic

<!-- 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/24128)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-09-03 20:50:47 -04:00 • committed by GitHub
commit dc3b0b7c9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/canvas/webgl_thread.rs
View file

@ -1727,6 +1727,11 @@ impl WebGLImpl {
unsafe { unsafe {
gl.get_integer_v(gl::NUM_EXTENSIONS, &mut ext_count); gl.get_integer_v(gl::NUM_EXTENSIONS, &mut ext_count);
} }
// Fall back to the depricated extensions API if that fails
if gl.get_error() != gl::NO_ERROR {
chan.send(gl.get_string(gl::EXTENSIONS)).unwrap();
return;
}
let ext_count = ext_count[0] as usize; let ext_count = ext_count[0] as usize;
let mut extensions = Vec::with_capacity(ext_count); let mut extensions = Vec::with_capacity(ext_count);
for idx in 0..ext_count { for idx in 0..ext_count {