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

Auto merge of #5788 - mbrubeck:gl-version, r=glennw

Browse source 
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 -->
This commit is contained in:
bors-servo 2015-04-21 20:09:12 -05:00
commit 3a1bf45dea
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ports/glutin/window.rs
View file

@ -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"))]