aboutsummaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorGlenn Watson <gw@intuitionlibrary.com>2014-11-26 08:15:24 +1000
committerGlenn Watson <gw@intuitionlibrary.com>2014-11-26 08:17:09 +1000
commitd99ba30216c72390593476f1b58fb9852f7091a1 (patch)
treeb0db014cd3daa5f836deaa17fb303f040e9c3b88 /src/android
parentd7a7765638d4638c48e4b76477b32da6be7957b3 (diff)
downloadglutin-d99ba30216c72390593476f1b58fb9852f7091a1.tar.gz
glutin-d99ba30216c72390593476f1b58fb9852f7091a1.zip
Allows android to compile when headless feature is enabled.
Diffstat (limited to 'src/android')
-rw-r--r--src/android/mod.rs30
1 files changed, 27 insertions, 3 deletions
diff --git a/src/android/mod.rs b/src/android/mod.rs
index 2f6ffb1..27fc8e0 100644
--- a/src/android/mod.rs
+++ b/src/android/mod.rs
@@ -7,6 +7,9 @@ use events::ElementState::{Pressed, Released};
use events::Event::{MouseInput, MouseMoved};
use events::MouseButton::LeftMouseButton;
+#[cfg(feature = "headless")]
+use HeadlessRendererBuilder;
+
pub struct Window {
display: ffi::egl::types::EGLDisplay,
context: ffi::egl::types::EGLContext,
@@ -38,6 +41,27 @@ impl MonitorID {
}
}
+#[cfg(feature = "headless")]
+pub struct HeadlessContext(int);
+
+#[cfg(feature = "headless")]
+impl HeadlessContext {
+ /// See the docs in the crate root file.
+ pub fn new(builder: HeadlessRendererBuilder) -> Result<HeadlessContext, CreationError> {
+ unimplemented!()
+ }
+
+ /// See the docs in the crate root file.
+ pub unsafe fn make_current(&self) {
+ unimplemented!()
+ }
+
+ /// See the docs in the crate root file.
+ pub fn get_proc_address(&self, addr: &str) -> *const () {
+ unimplemented!()
+ }
+}
+
impl Window {
pub fn new(builder: WindowBuilder) -> Result<Window, CreationError> {
use std::{mem, ptr};
@@ -116,7 +140,7 @@ impl Window {
}
surface
};
-
+
android_glue::write_log("eglCreateWindowSurface succeeded");
let (tx, rx) = channel();
@@ -196,8 +220,8 @@ impl Window {
},
},
Err(_) => {
- break;
- },
+ break;
+ },
}
}
events