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

auto merge of #4011 : glennw/servo/gleam-update, r=larsbergstrom

Browse source
This commit is contained in:
bors-servo 2014-11-16 16:09:28 -07:00
commit 3da9ad464d
5 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -251,7 +251,7 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.0.1"
source = "git+https://github.com/servo/gleam#8e77178eaebddfeae6557dfec2bcccbefaba93f3"
source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c"
dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
]

2
ports/android/glut_app/Cargo.lock generated
View file

@ -249,7 +249,7 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.0.1"
source = "git+https://github.com/servo/gleam#8e77178eaebddfeae6557dfec2bcccbefaba93f3"
source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c"
dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
]

2
ports/cef/Cargo.lock generated
View file

@ -259,7 +259,7 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.0.1"
source = "git+https://github.com/servo/gleam#8e77178eaebddfeae6557dfec2bcccbefaba93f3"
source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c"
dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
]

1
ports/glfw/lib.rs
View file

@ -13,6 +13,7 @@ extern crate alert;
extern crate cgl;
extern crate compositing;
extern crate geom;
extern crate gleam;
extern crate glfw;
extern crate layers;
extern crate libc;

3
ports/glfw/window.rs
View file

@ -20,6 +20,7 @@ use geom::point::{Point2D, TypedPoint2D};
use geom::scale_factor::ScaleFactor;
use geom::size::TypedSize2D;
use glfw::{mod, Context};
use gleam::gl;
use layers::geometry::DevicePixel;
use layers::platform::surface::NativeGraphicsMetadata;
use libc::c_int;
@ -63,6 +64,8 @@ impl Window {
.expect("Failed to create GLFW window");
glfw_window.make_current();
gl::load_with(|s| glfw_window.get_proc_address(s));
// Create our window object.
let window = Window {
glfw: glfw,