зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #4011 - Update gleam submodule, and use glfw to load OpenGL function pointers (from glennw:gleam-update); r=larsbergstrom
Source-Repo: https://github.com/servo/servo Source-Revision: 3da9ad464db7e3a422e06f82285aff15b7375344
This commit is contained in:
Родитель
6da7215f3a
Коммит
7ecba6a00a
|
@ -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)",
|
||||
]
|
||||
|
|
|
@ -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)",
|
||||
]
|
||||
|
|
|
@ -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)",
|
||||
]
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче