alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-23 22:01:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

make_current() is now unsafe

Browse source
This commit is contained in:
Tomaka17 2014-07-30 18:12:39 +02:00
parent ec956688cd
commit 270e290af9
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -23,7 +23,7 @@ fn main() {
let window = init::Window::new(None, "Hello world!", &Default::default(), None).unwrap(); let window = init::Window::new(None, "Hello world!", &Default::default(), None).unwrap();
window.make_current(); unsafe { window.make_current() };
gl::load_with(|symbol| window.get_proc_address(symbol) as *const libc::c_void); gl::load_with(|symbol| window.get_proc_address(symbol) as *const libc::c_void);

2
examples/window.rs
View file

@ -7,7 +7,7 @@ fn main() {
let window = init::Window::new(None, "Hello world!", &Default::default(), None).unwrap(); let window = init::Window::new(None, "Hello world!", &Default::default(), None).unwrap();
window.make_current(); unsafe { window.make_current() };
gl::load_with(|symbol| window.get_proc_address(symbol) as *const libc::c_void); gl::load_with(|symbol| window.get_proc_address(symbol) as *const libc::c_void);

5
src/lib.rs
View file

@ -34,7 +34,7 @@ pub struct MonitorID(uint);
/// ///
/// let window = Window::new(None, "Hello world!", &Default::default(), None).unwrap(); /// let window = Window::new(None, "Hello world!", &Default::default(), None).unwrap();
/// ///
/// window.make_current(); /// unsafe { window.make_current() };
/// ///
/// loop { /// loop {
/// for event in window.poll_events().move_iter() { // note: this may change in the future /// 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() self.window.wait_events()
} }
/// Sets the context as the current context.
#[inline] #[inline]
#[experimental] #[experimental]
pub fn make_current(&self) { pub unsafe fn make_current(&self) {
self.window.make_current() self.window.make_current()
} }

4
src/win32/mod.rs
View file

@ -310,8 +310,8 @@ impl Window {
} }
} }
pub fn make_current(&self) { pub unsafe fn make_current(&self) {
unsafe { ffi::wglMakeCurrent(self.hdc, self.context) } ffi::wglMakeCurrent(self.hdc, self.context)
} }
pub fn get_proc_address(&self, addr: &str) -> *const () { pub fn get_proc_address(&self, addr: &str) -> *const () {

4
src/x11/mod.rs
View file

@ -232,8 +232,8 @@ impl Window {
} }
} }
pub fn make_current(&self) { pub unsafe fn make_current(&self) {
let res = unsafe { ffi::glXMakeCurrent(self.display, self.window, self.context) }; let res = ffi::glXMakeCurrent(self.display, self.window, self.context);
if res == 0 { if res == 0 {
fail!("glXMakeCurrent failed"); fail!("glXMakeCurrent failed");
} }