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

servo · Oct 29, 2014 · b8de54b · b8de54b
2 parents f632f64 + 5e5f761
commit b8de54b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
diff --git a/ports/glfw/Cargo.toml b/ports/glfw/Cargo.toml
@@ -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"
diff --git a/ports/glfw/lib.rs b/ports/glfw/lib.rs
@@ -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;
@@ -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;

diff --git a/ports/glfw/window.rs b/ports/glfw/window.rs
@@ -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()),