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

auto merge of #3846 : glennw/servo/cgl, r=metajack

Browse source
This commit is contained in:
bors-servo 2014-10-29 09:24:40 -06:00
commit b8de54bc63
5 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -48,6 +48,14 @@ dependencies = [
"util 0.0.1", "util 0.0.1",
] ]
[[package]]
name = "cgl"
version = "0.0.1"
source = "git+https://github.com/servo/rust-cgl#0a8d726e57b4cd55bee9f7c743d29ae1cf8f3fc2"
dependencies = [
"opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)",
]
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.1.0" version = "0.1.0"
@ -220,12 +228,12 @@ name = "glfw_app"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"alert 0.1.0 (git+https://github.com/servo/rust-alert#fdc24f13be8d8a2d15214ec228d166b3221b809e)", "alert 0.1.0 (git+https://github.com/servo/rust-alert#fdc24f13be8d8a2d15214ec228d166b3221b809e)",
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl#0a8d726e57b4cd55bee9f7c743d29ae1cf8f3fc2)",
"compositing 0.0.1", "compositing 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)",
"glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#a15c2d04b8969aea653841d1d79e5fdf68de664b)", "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#a15c2d04b8969aea653841d1d79e5fdf68de664b)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)",
"msg 0.0.1", "msg 0.0.1",
"opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)",
"util 0.0.1", "util 0.0.1",
] ]

10
ports/cef/Cargo.lock generated
View file

@ -59,6 +59,14 @@ dependencies = [
"util 0.0.1", "util 0.0.1",
] ]
[[package]]
name = "cgl"
version = "0.0.1"
source = "git+https://github.com/servo/rust-cgl#0a8d726e57b4cd55bee9f7c743d29ae1cf8f3fc2"
dependencies = [
"opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)",
]
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.1.0" version = "0.1.0"
@ -231,12 +239,12 @@ name = "glfw_app"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"alert 0.1.0 (git+https://github.com/servo/rust-alert#fdc24f13be8d8a2d15214ec228d166b3221b809e)", "alert 0.1.0 (git+https://github.com/servo/rust-alert#fdc24f13be8d8a2d15214ec228d166b3221b809e)",
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl#0a8d726e57b4cd55bee9f7c743d29ae1cf8f3fc2)",
"compositing 0.0.1", "compositing 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)",
"glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#a15c2d04b8969aea653841d1d79e5fdf68de664b)", "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#a15c2d04b8969aea653841d1d79e5fdf68de664b)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)",
"msg 0.0.1", "msg 0.0.1",
"opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)",
"util 0.0.1", "util 0.0.1",
] ]

4
ports/glfw/Cargo.toml
View file

@ -29,5 +29,5 @@ path = "../../components/msg"
[dependencies.util] [dependencies.util]
path = "../../components/util" path = "../../components/util"
[dependencies.opengles] [dependencies.cgl]
git = "https://github.com/servo/rust-opengles" git = "https://github.com/servo/rust-cgl"

3
ports/glfw/lib.rs
View file

@ -9,6 +9,8 @@
#![deny(unused_imports, unused_variable)] #![deny(unused_imports, unused_variable)]
extern crate alert; extern crate alert;
#[cfg(target_os="macos")]
extern crate cgl;
extern crate compositing; extern crate compositing;
extern crate geom; extern crate geom;
extern crate glfw; extern crate glfw;
@ -17,7 +19,6 @@ extern crate libc;
extern crate msg; extern crate msg;
extern crate time; extern crate time;
extern crate util; extern crate util;
extern crate opengles;
use geom::scale_factor::ScaleFactor; use geom::scale_factor::ScaleFactor;
use std::rc::Rc; use std::rc::Rc;

2
ports/glfw/window.rs
View file

@ -162,7 +162,7 @@ impl WindowMethods for Window {
#[cfg(target_os="macos")] #[cfg(target_os="macos")]
fn native_metadata(&self) -> NativeGraphicsMetadata { fn native_metadata(&self) -> NativeGraphicsMetadata {
use opengles::cgl::{CGLGetCurrentContext, CGLGetPixelFormat}; use cgl::{CGLGetCurrentContext, CGLGetPixelFormat};
unsafe { unsafe {
NativeGraphicsMetadata { NativeGraphicsMetadata {
pixel_format: CGLGetPixelFormat(CGLGetCurrentContext()), pixel_format: CGLGetPixelFormat(CGLGetCurrentContext()),