Merge pull request #211 from glennw/upstream-fixes

Upstream of various fixes and features (details below)

1 files changed, 8 insertions, 0 deletions

diff --git a/src/android/mod.rs b/src/android/mod.rs
index 6987f52..bde2417 100644
--- a/src/android/mod.rs
+++ b/src/android/mod.rs
@@ -63,6 +63,10 @@ impl HeadlessContext {
     pub fn get_proc_address(&self, _addr: &str) -> *const () {
         unimplemented!()
     }
+
+    pub fn get_api(&self) -> ::Api {
+        ::Api::OpenGlEs
+    }
 }
 
 #[cfg(feature = "headless")]
@@ -284,6 +288,10 @@ impl Window {
 
     pub fn set_cursor(&self, _: MouseCursor) {
     }
+
+    pub fn hidpi_factor(&self) -> f32 {
+        1.0
+    }
 }
 
 unsafe impl Send for Window {}