Merge pull request #25 from glennw/cgl

Update to use CGL crate.
This commit is contained in:
Jack Moffitt
2014-10-28 23:07:39 -06:00
2 changed files with 6 additions and 1 deletions
+4
View File
@@ -15,3 +15,7 @@ git = "https://github.com/servo/rust-geom"
[dependencies.opengles]
git = "https://github.com/servo/rust-opengles"
[dependencies.cgl]
git = "https://github.com/servo/rust-cgl"
+2 -1
View File
@@ -14,6 +14,7 @@ extern crate libc;
extern crate core_foundation;
extern crate geom;
extern crate opengles;
extern crate cgl;
// Rust bindings to the IOSurface framework on Mac OS X.
@@ -26,7 +27,7 @@ use core_foundation::string::CFStringRef;
#[cfg(target_os="macos")]
use geom::size::Size2D;
#[cfg(target_os="macos")]
use opengles::cgl::{kCGLNoError, CGLGetCurrentContext, CGLTexImageIOSurface2D};
use cgl::{kCGLNoError, CGLGetCurrentContext, CGLTexImageIOSurface2D};
#[cfg(target_os="macos")]
use opengles::gl2::{BGRA, GLenum, GLsizei, RGBA, TEXTURE_RECTANGLE_ARB, UNSIGNED_INT_8_8_8_8_REV};
#[cfg(target_os="macos")]