Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to use CGL crate for mac. #3846

Closed
wants to merge 1 commit into from
Closed

Update to use CGL crate for mac. #3846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion ports/cef/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ports/glfw/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ path = "../../components/msg"
[dependencies.util]
path = "../../components/util"

[dependencies.opengles]
git = "https://github.com/servo/rust-opengles"
[dependencies.cgl]
git = "https://github.com/servo/rust-cgl"
3 changes: 2 additions & 1 deletion ports/glfw/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#![deny(unused_imports, unused_variable)]

extern crate alert;
#[cfg(target_os="macos")]
extern crate cgl;
extern crate compositing;
extern crate geom;
extern crate glfw;
Expand All @@ -17,7 +19,6 @@ extern crate libc;
extern crate msg;
extern crate time;
extern crate util;
extern crate opengles;

use geom::scale_factor::ScaleFactor;
use std::rc::Rc;
Expand Down
2 changes: 1 addition & 1 deletion ports/glfw/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ impl WindowMethods for Window {

#[cfg(target_os="macos")]
fn native_metadata(&self) -> NativeGraphicsMetadata {
use opengles::cgl::{CGLGetCurrentContext, CGLGetPixelFormat};
use cgl::{CGLGetCurrentContext, CGLGetPixelFormat};
unsafe {
NativeGraphicsMetadata {
pixel_format: CGLGetPixelFormat(CGLGetCurrentContext()),
Expand Down