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

Add Mac OpenGL support to libsimpleservo

Browse source
This commit is contained in:
Paul Rouget 2019-02-06 04:21:01 +01:00
parent d81ff5704e
commit 399456665c
3 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -3936,6 +3936,7 @@ source = "git+https://github.com/pcwalton/signpost.git#7ed712507f343c38646b9d1fe
name = "simpleservo" name = "simpleservo"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
"libservo 0.0.1", "libservo 0.0.1",

3
ports/libsimpleservo/api/Cargo.toml
View file

@ -14,6 +14,9 @@ serde_json = "1.0"
[target.'cfg(not(target_os = "macos"))'.dependencies] [target.'cfg(not(target_os = "macos"))'.dependencies]
libc = "0.2" libc = "0.2"
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.6"
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
winapi = "0.3.2" winapi = "0.3.2"

40
ports/libsimpleservo/api/src/gl_glue.rs
View file

@ -2,9 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use std::rc::Rc; pub type ServoGl = std::rc::Rc<dyn servo::gl::Gl>;
pub type ServoGl = Rc<dyn servo::gl::Gl>;
#[cfg(any(target_os = "android", target_os = "windows"))] #[cfg(any(target_os = "android", target_os = "windows"))]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
@ -56,7 +54,7 @@ pub mod egl {
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
pub fn init() -> Result<Rc<Gl>, &'static str> { pub fn init() -> Result<crate::gl_glue::ServoGl, &'static str> {
info!("Loading EGL..."); info!("Loading EGL...");
let dll = b"libEGL.dll\0" as &[u8]; let dll = b"libEGL.dll\0" as &[u8];
@ -77,10 +75,38 @@ pub mod egl {
} }
} }
#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] #[cfg(any(target_os = "windows", target_os = "linux"))]
pub mod gl { pub mod gl {
pub fn init() -> Result<crate::gl_glue::ServoGl, &'static str> { pub fn init() -> Result<crate::gl_glue::ServoGl, &'static str> {
// FIXME: Add an OpenGL version unimplemented!();
unimplemented!() }
}
#[cfg(target_os = "macos")]
pub mod gl {
use core_foundation::base::TCFType;
use core_foundation::bundle::{
CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName,
};
use core_foundation::string::CFString;
use servo::gl::GlFns;
use std::os::raw::c_void;
use std::str;
pub fn init() -> Result<crate::gl_glue::ServoGl, &'static str> {
info!("Loading OpenGL...");
let gl = unsafe {
GlFns::load_with(|addr| {
let symbol_name: CFString = str::FromStr::from_str(addr).unwrap();
let framework_name: CFString = str::FromStr::from_str("com.apple.opengl").unwrap();
let framework =
CFBundleGetBundleWithIdentifier(framework_name.as_concrete_TypeRef());
let symbol =
CFBundleGetFunctionPointerForName(framework, symbol_name.as_concrete_TypeRef());
symbol as *const c_void
})
};
info!("OpenGL loaded");
Ok(gl)
} }
} }