aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-09-21 22:34:17 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-09-21 22:34:17 +0200
commit48f3962a01278f13f5af5d3aa14bf7a32c5c8326 (patch)
tree27f94e8c2158572fb79ebf998d1e98b049ba6ade
parent1b28e32e3130f58db62da6d6f6fa5e7c31043798 (diff)
parent9f6806ba2e698a5163484004cad829b37e0d71dd (diff)
downloadglutin-48f3962a01278f13f5af5d3aa14bf7a32c5c8326.tar.gz
glutin-48f3962a01278f13f5af5d3aa14bf7a32c5c8326.zip
Merge pull request #609 from TimNN/ios-compile-fixes
make glutin compile on all iOS targets (again)
-rw-r--r--Cargo.toml3
-rw-r--r--src/api/ios/mod.rs37
-rw-r--r--src/lib.rs5
-rw-r--r--src/platform/ios/mod.rs11
4 files changed, 37 insertions, 19 deletions
diff --git a/Cargo.toml b/Cargo.toml
index a74d1d5..40986b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,6 +30,9 @@ clock_ticks = "0.0.5"
[target.arm-linux-androideabi.dependencies.android_glue]
version = "0"
+[target.i386-apple-ios.dependencies]
+objc = "0.1"
+
[target.x86_64-apple-ios.dependencies]
objc = "0.1"
diff --git a/src/api/ios/mod.rs b/src/api/ios/mod.rs
index 0163f45..ef34955 100644
--- a/src/api/ios/mod.rs
+++ b/src/api/ios/mod.rs
@@ -64,6 +64,7 @@
use std::collections::VecDeque;
use std::ptr;
+use std::io;
use std::mem;
use std::ffi::CString;
@@ -71,7 +72,8 @@ use libc;
use objc::runtime::{Class, BOOL, YES, NO };
use native_monitor::NativeMonitorId;
-use { Api, PixelFormat, CreationError, BuilderAttribs, GlContext, CursorState, MouseCursor, Event };
+use { Api, PixelFormat, CreationError, GlContext, CursorState, MouseCursor, Event };
+use { PixelFormatRequirements, GlAttributes, WindowAttributes, ContextError };
use CreationError::OsError;
mod delegate;
@@ -102,6 +104,7 @@ use self::ffi::{
static mut jmpbuf: [libc::c_int;27] = [0;27];
+#[derive(Clone)]
pub struct MonitorID;
pub struct Window {
@@ -172,7 +175,7 @@ impl MonitorID {
impl Window {
- pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> {
+ pub fn new(builder: &WindowAttributes, _: &PixelFormatRequirements, _: &GlAttributes<&Window>) -> Result<Window, CreationError> {
unsafe {
if setjmp(mem::transmute(&mut jmpbuf)) != 0 {
let app: id = msg_send![Class::get("UIApplication").unwrap(), sharedApplication];
@@ -200,7 +203,7 @@ impl Window {
Err(CreationError::OsError(format!("Couldn't create UIApplication")))
}
- unsafe fn init_context(&mut self, builder: BuilderAttribs) {
+ unsafe fn init_context(&mut self, builder: &WindowAttributes) {
let draw_props: id = msg_send![Class::get("NSDictionary").unwrap(), alloc];
let draw_props: id = msg_send![draw_props,
initWithObjects:
@@ -215,11 +218,11 @@ impl Window {
].as_ptr()
count: 2
];
- self.make_current();
+ let _ = self.make_current();
let state = &mut *self.delegate_state;
- if builder.window.multitouch {
+ if builder.multitouch {
let _: () = msg_send![state.view, setMultipleTouchEnabled:YES];
}
@@ -265,10 +268,6 @@ impl Window {
}
}
- pub fn is_closed(&self) -> bool {
- false
- }
-
pub fn set_title(&self, _: &str) {
}
@@ -345,8 +344,13 @@ impl Window {
}
impl GlContext for Window {
- unsafe fn make_current(&self) {
- let _:BOOL = msg_send![Class::get("EAGLContext").unwrap(), setCurrentContext: self.eagl_context];
+ unsafe fn make_current(&self) -> Result<(), ContextError> {
+ let res: BOOL = msg_send![Class::get("EAGLContext").unwrap(), setCurrentContext: self.eagl_context];
+ if res == YES {
+ Ok(())
+ } else {
+ Err(ContextError::IoError(io::Error::new(io::ErrorKind::Other, "EAGLContext::setCurrentContext unsuccessful")))
+ }
}
fn is_current(&self) -> bool {
@@ -362,8 +366,15 @@ impl GlContext for Window {
}
}
- fn swap_buffers(&self) {
- unsafe { let _:BOOL = msg_send![self.eagl_context, presentRenderbuffer: gles::RENDERBUFFER]; }
+ fn swap_buffers(&self) -> Result<(), ContextError> {
+ unsafe {
+ let res: BOOL = msg_send![self.eagl_context, presentRenderbuffer: gles::RENDERBUFFER];
+ if res == YES {
+ Ok(())
+ } else {
+ Err(ContextError::IoError(io::Error::new(io::ErrorKind::Other, "EAGLContext.presentRenderbuffer unsuccessful")))
+ }
+ }
}
fn get_api(&self) -> Api {
diff --git a/src/lib.rs b/src/lib.rs
index a75a47a..0d0e6ef 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -362,7 +362,7 @@ pub struct PixelFormat {
pub multisampling: Option<u16>,
pub srgb: bool,
}
-
+
/// VERY UNSTABLE! Describes how the backend should choose a pixel format.
#[derive(Clone, Debug)]
#[allow(missing_docs)]
@@ -526,7 +526,8 @@ pub struct WindowAttributes {
/// The default is `true`.
pub decorations: bool,
- /// ??? TODO: document me
+ /// [iOS only] Enable multitouch, see [UIView#multipleTouchEnabled]
+ /// (https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIView_Class/#//apple_ref/occ/instp/UIView/multipleTouchEnabled)
pub multitouch: bool,
}
diff --git a/src/platform/ios/mod.rs b/src/platform/ios/mod.rs
index 7cbdd84..95fa7e1 100644
--- a/src/platform/ios/mod.rs
+++ b/src/platform/ios/mod.rs
@@ -1,9 +1,11 @@
#![cfg(target_os = "ios")]
use libc::c_void;
-use BuilderAttribs;
+use GlAttributes;
use CreationError;
use PixelFormat;
+use PixelFormatRequirements;
+use ContextError;
pub use api::ios::*;
@@ -11,16 +13,17 @@ pub struct HeadlessContext(i32);
impl HeadlessContext {
/// See the docs in the crate root file.
- pub fn new(_builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
+ pub fn new(_: (u32, u32), _: &PixelFormatRequirements, _: &GlAttributes<&HeadlessContext>)
+ -> Result<HeadlessContext, CreationError> {
unimplemented!()
}
/// See the docs in the crate root file.
- pub unsafe fn make_current(&self) {
+ pub unsafe fn make_current(&self) -> Result<(), ContextError> {
unimplemented!()
}
- pub fn swap_buffers(&self) {
+ pub fn swap_buffers(&self) -> Result<(), ContextError> {
unimplemented!()
}