diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-07-12 15:03:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-12 15:03:00 -0400 |
| commit | 2f1e822de84c6af65576fc238d34219fcae1861c (patch) | |
| tree | 8493b7aa58d3e19cf558ebd5d346e5ea2ae897c4 /components/servo | |
| parent | 812bf8d816d29ecf132ff15a2da6a83c690e2e48 (diff) | |
| parent | dbaed5ed9276843ae3aa10f8671f65db839b7ffe (diff) | |
| download | servo-2f1e822de84c6af65576fc238d34219fcae1861c.tar.gz servo-2f1e822de84c6af65576fc238d34219fcae1861c.zip | |
Auto merge of #23744 - jdm:gles-fixes, r=asajeffrey
Make GL/GLES decisions based on the API in use
These changes remove a number of assumptions about whether GL/GLES is in use, improving the support for running WebGL in Servo under ANGLE.
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because no tests on Windows.
<!-- 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/23744)
<!-- Reviewable:end -->
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs index f31cc1fcd24..2f67d563991 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -747,7 +747,7 @@ fn create_constellation( GLContextFactory::current_osmesa_handle() } else { let dispatcher = Box::new(MainThreadDispatcher::new(compositor_proxy.clone())) as Box<_>; - GLContextFactory::current_native_handle(dispatcher) + GLContextFactory::current_native_handle(dispatcher, window_gl.get_type()) }; let (external_image_handlers, external_images) = WebrenderExternalImageHandlers::new(); |