diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-21 20:09:12 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-21 20:09:12 -0500 |
| commit | 3a1bf45dea2ee7a9f4d8f299a2f1d05912b5e0a7 (patch) | |
| tree | 964d57565c2a05e56fd5b15d97fb8124171249df | |
| parent | 5502b5147f1e539032e6739fe8aa96c495ca2fae (diff) | |
| parent | a20bc3364c39d9e68fa839114ab5b7ac57db8acb (diff) | |
| download | servo-3a1bf45dea2ee7a9f4d8f299a2f1d05912b5e0a7.tar.gz servo-3a1bf45dea2ee7a9f4d8f299a2f1d05912b5e0a7.zip | |
Auto merge of #5788 - mbrubeck:gl-version, r=glennw
Fixes #5785. r? @glennw or @larsbergstrom
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5788)
<!-- Reviewable:end -->
| -rw-r--r-- | ports/glutin/window.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 98243c48f1c..f144206db84 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -27,7 +27,7 @@ use compositing::windowing::{MouseWindowEvent, WindowNavigateMsg}; #[cfg(feature = "window")] use geom::point::{Point2D, TypedPoint2D}; #[cfg(feature = "window")] -use glutin::{ElementState, Event, MouseButton, VirtualKeyCode}; +use glutin::{Api, ElementState, Event, GlRequest, MouseButton, VirtualKeyCode}; #[cfg(feature = "window")] use msg::constellation_msg::{KeyState, CONTROL, SHIFT, ALT}; #[cfg(feature = "window")] @@ -77,7 +77,7 @@ impl Window { let mut glutin_window = glutin::WindowBuilder::new() .with_title("Servo".to_string()) .with_dimensions(window_size.to_untyped().width, window_size.to_untyped().height) - .with_gl_version(Window::gl_version()) + .with_gl(Window::gl_version()) .with_visibility(is_foreground) .build() .unwrap(); @@ -119,13 +119,13 @@ impl Window { } #[cfg(not(target_os="android"))] - fn gl_version() -> (u32, u32) { - (3, 0) + fn gl_version() -> GlRequest { + GlRequest::Specific(Api::OpenGl, (3, 0)) } #[cfg(target_os="android")] - fn gl_version() -> (u32, u32) { - (2, 0) + fn gl_version() -> GlRequest { + GlRequest::Specific(Api::OpenGlEs, (2, 0)) } #[cfg(not(target_os="android"))] |