diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-09-10 14:37:51 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-09-11 11:40:04 -0400 |
| commit | 1cefae71817924e375626802c5e639fe80f66c66 (patch) | |
| tree | 2e9d3c47fd724204501560f61f9b4a25eb6cefa4 /components/servo | |
| parent | ec1da1d01c0f48544084d9cba4398b592c58e1fe (diff) | |
| download | servo-1cefae71817924e375626802c5e639fe80f66c66.tar.gz servo-1cefae71817924e375626802c5e639fe80f66c66.zip | |
Replace use of gleam in webgl with sparkle.
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/Cargo.toml | 3 | ||||
| -rw-r--r-- | components/servo/lib.rs | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index c747fe84984..10bb31d2405 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -62,7 +62,7 @@ media = {path = "../media"} msg = {path = "../msg"} net = {path = "../net"} net_traits = {path = "../net_traits"} -offscreen_gl_context = "0.23" +offscreen_gl_context = "0.25" profile = {path = "../profile"} profile_traits = {path = "../profile_traits"} script = {path = "../script"} @@ -72,6 +72,7 @@ servo_config = {path = "../config"} servo_geometry = {path = "../geometry"} servo-media = {git = "https://github.com/servo/media"} servo_url = {path = "../url"} +sparkle = "0.1" style = {path = "../style", features = ["servo"]} style_traits = {path = "../style_traits", features = ["servo"]} webrender = {git = "https://github.com/servo/webrender"} diff --git a/components/servo/lib.rs b/components/servo/lib.rs index e2ce15fa39f..9ae3212d98c 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -412,7 +412,11 @@ where } else { let dispatcher = Box::new(MainThreadDispatcher::new(compositor_proxy.clone())) as Box<_>; - GLContextFactory::current_native_handle(dispatcher, window.gl().get_type()) + let gl_type = match window.gl().get_type() { + gl::GlType::Gl => sparkle::gl::GlType::Gl, + gl::GlType::Gles => sparkle::gl::GlType::Gles, + }; + GLContextFactory::current_native_handle(dispatcher, gl_type) }; let (external_image_handlers, external_images) = WebrenderExternalImageHandlers::new(); |