diff options
author | Tomaka17 <pierre.krieger1708@gmail.com> | 2014-07-30 18:12:39 +0200 |
---|---|---|
committer | Tomaka17 <pierre.krieger1708@gmail.com> | 2014-07-30 18:12:39 +0200 |
commit | 270e290af9f83590fe81504ec555d3a7da3cc303 (patch) | |
tree | 94b75cd9c28b7e9b76f217879d41df12f9961169 /src | |
parent | ec956688cd7fa43ccb3cbaf6b54890f400715662 (diff) | |
download | glutin-270e290af9f83590fe81504ec555d3a7da3cc303.tar.gz glutin-270e290af9f83590fe81504ec555d3a7da3cc303.zip |
make_current() is now unsafe
Diffstat (limited to 'src')
-rw-r--r-- | src/lib.rs | 5 | ||||
-rw-r--r-- | src/win32/mod.rs | 4 | ||||
-rw-r--r-- | src/x11/mod.rs | 4 |
3 files changed, 7 insertions, 6 deletions
@@ -34,7 +34,7 @@ pub struct MonitorID(uint); /// /// let window = Window::new(None, "Hello world!", &Default::default(), None).unwrap(); /// -/// window.make_current(); +/// unsafe { window.make_current() }; /// /// loop { /// for event in window.poll_events().move_iter() { // note: this may change in the future @@ -200,9 +200,10 @@ impl Window { self.window.wait_events() } + /// Sets the context as the current context. #[inline] #[experimental] - pub fn make_current(&self) { + pub unsafe fn make_current(&self) { self.window.make_current() } diff --git a/src/win32/mod.rs b/src/win32/mod.rs index cfa0992..65374b7 100644 --- a/src/win32/mod.rs +++ b/src/win32/mod.rs @@ -310,8 +310,8 @@ impl Window { } } - pub fn make_current(&self) { - unsafe { ffi::wglMakeCurrent(self.hdc, self.context) } + pub unsafe fn make_current(&self) { + ffi::wglMakeCurrent(self.hdc, self.context) } pub fn get_proc_address(&self, addr: &str) -> *const () { diff --git a/src/x11/mod.rs b/src/x11/mod.rs index 4c4d400..cc70a01 100644 --- a/src/x11/mod.rs +++ b/src/x11/mod.rs @@ -232,8 +232,8 @@ impl Window { } } - pub fn make_current(&self) { - let res = unsafe { ffi::glXMakeCurrent(self.display, self.window, self.context) }; + pub unsafe fn make_current(&self) { + let res = ffi::glXMakeCurrent(self.display, self.window, self.context); if res == 0 { fail!("glXMakeCurrent failed"); } |