aboutsummaryrefslogtreecommitdiffstats
path: root/src/platform
diff options
context:
space:
mode:
authorPierre Krieger <pierre.krieger1708@gmail.com>2016-02-09 15:20:06 +0100
committerPierre Krieger <pierre.krieger1708@gmail.com>2016-02-09 15:20:06 +0100
commit9238a48ffca5be87b27bca9c6bc391930871b823 (patch)
treecfca45fed6902d43703ff70d183572e1a0b787f3 /src/platform
parent5cce3f9640b9ec3e78619d3e8f41f0e7b316dde0 (diff)
parent75a940d4f1240fff9adeed9b0ff869e9aa0f5814 (diff)
downloadglutin-9238a48ffca5be87b27bca9c6bc391930871b823.tar.gz
glutin-9238a48ffca5be87b27bca9c6bc391930871b823.zip
Merge branch 'master' of http://github.com/tomaka/gl-init-rs
Diffstat (limited to 'src/platform')
-rw-r--r--src/platform/emscripten/mod.rs11
-rw-r--r--src/platform/mod.rs5
2 files changed, 13 insertions, 3 deletions
diff --git a/src/platform/emscripten/mod.rs b/src/platform/emscripten/mod.rs
index 270cdaf..1a78dfb 100644
--- a/src/platform/emscripten/mod.rs
+++ b/src/platform/emscripten/mod.rs
@@ -1,7 +1,12 @@
#![cfg(target_os = "emscripten")]
+use Api;
use ContextError;
+use CreationError;
+use GlAttributes;
use GlContext;
+use PixelFormat;
+use PixelFormatRequirements;
pub use api::emscripten::{Window, WindowProxy, MonitorId, get_available_monitors};
pub use api::emscripten::{get_primary_monitor, WaitEventsIterator, PollEventsIterator};
@@ -11,8 +16,10 @@ pub struct HeadlessContext(Window);
impl HeadlessContext {
/// See the docs in the crate root file.
#[inline]
- pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
- Window::new(builder).map(|w| HeadlessContext(w))
+ pub fn new(_: (u32, u32), _: &PixelFormatRequirements, _: &GlAttributes<&HeadlessContext>)
+ -> Result<HeadlessContext, CreationError>
+ {
+ unimplemented!()
}
}
diff --git a/src/platform/mod.rs b/src/platform/mod.rs
index 4855765..8527da2 100644
--- a/src/platform/mod.rs
+++ b/src/platform/mod.rs
@@ -15,8 +15,11 @@ mod platform;
#[cfg(target_os = "ios")]
#[path="ios/mod.rs"]
mod platform;
+#[cfg(target_os = "emscripten")]
+#[path="emscripten/mod.rs"]
+mod platform;
#[cfg(all(not(target_os = "ios"), not(target_os = "windows"), not(target_os = "linux"),
not(target_os = "macos"), not(target_os = "android"), not(target_os = "dragonfly"),
- not(target_os = "freebsd")))]
+ not(target_os = "freebsd"), not(target_os = "emscripten")))]
use this_platform_is_not_supported;