mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2025-01-09 21:01:29 +11:00
Update for rustc and gl-rs
This commit is contained in:
parent
0d0c14e6ec
commit
2ff393fe62
|
@ -7,13 +7,23 @@ use glutin;
|
|||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
mod gl {
|
||||
generate_gl_bindings!("gl", "core", "1.1", "struct")
|
||||
generate_gl_bindings! {
|
||||
api: "gl",
|
||||
profile: "core",
|
||||
version: "1.1",
|
||||
generator: "struct"
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
mod gl {
|
||||
pub use self::Gles1 as Gl;
|
||||
generate_gl_bindings!("gles1", "core", "1.1", "struct")
|
||||
generate_gl_bindings! {
|
||||
api: "gles1",
|
||||
profile: "core",
|
||||
version: "1.1",
|
||||
generator: "struct"
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Context {
|
||||
|
|
|
@ -18,10 +18,10 @@ pub mod egl {
|
|||
pub type NativeWindowType = super::EGLNativeWindowType;
|
||||
|
||||
generate_gl_bindings! {
|
||||
api: egl,
|
||||
profile: core,
|
||||
version: 1.5,
|
||||
generator: static
|
||||
api: "egl",
|
||||
profile: "core",
|
||||
version: "1.5",
|
||||
generator: "static"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -8,22 +8,22 @@ use libc;
|
|||
/// WGL bindings
|
||||
pub mod wgl {
|
||||
generate_gl_bindings! {
|
||||
api: wgl,
|
||||
profile: core,
|
||||
version: 1.0,
|
||||
generator: static
|
||||
api: "wgl",
|
||||
profile: "core",
|
||||
version: "1.0",
|
||||
generator: "static"
|
||||
}
|
||||
}
|
||||
|
||||
/// Functions that are not necessarly always available
|
||||
pub mod wgl_extra {
|
||||
generate_gl_bindings! {
|
||||
api: wgl,
|
||||
profile: core,
|
||||
version: 1.0,
|
||||
generator: struct,
|
||||
api: "wgl",
|
||||
profile: "core",
|
||||
version: "1.0",
|
||||
generator: "struct",
|
||||
extensions: [
|
||||
WGL_ARB_create_context
|
||||
"WGL_ARB_create_context"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ extern crate native;
|
|||
|
||||
use self::native::NativeTaskBuilder;
|
||||
use std::task::TaskBuilder;
|
||||
use std::sync::atomics::AtomicBool;
|
||||
use std::sync::atomic::AtomicBool;
|
||||
use std::ptr;
|
||||
use super::{event, ffi};
|
||||
use super::Window;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use std::sync::atomics::AtomicBool;
|
||||
use std::sync::atomic::AtomicBool;
|
||||
use std::ptr;
|
||||
use Event;
|
||||
|
||||
|
@ -75,7 +75,7 @@ impl Window {
|
|||
impl Window {
|
||||
/// See the docs in the crate root file.
|
||||
pub fn is_closed(&self) -> bool {
|
||||
use std::sync::atomics::Relaxed;
|
||||
use std::sync::atomic::Relaxed;
|
||||
self.is_closed.load(Relaxed)
|
||||
}
|
||||
|
||||
|
@ -170,7 +170,7 @@ impl Window {
|
|||
|
||||
// if one of the received events is `Closed`, setting `is_closed` to true
|
||||
if events.iter().find(|e| match e { &&::Closed => true, _ => false }).is_some() {
|
||||
use std::sync::atomics::Relaxed;
|
||||
use std::sync::atomic::Relaxed;
|
||||
self.is_closed.store(true, Relaxed);
|
||||
}
|
||||
|
||||
|
@ -185,7 +185,7 @@ impl Window {
|
|||
// if the received event is `Closed`, setting `is_closed` to true
|
||||
match ev {
|
||||
::Closed => {
|
||||
use std::sync::atomics::Relaxed;
|
||||
use std::sync::atomic::Relaxed;
|
||||
self.is_closed.store(true, Relaxed);
|
||||
},
|
||||
_ => ()
|
||||
|
@ -198,7 +198,7 @@ impl Window {
|
|||
},
|
||||
|
||||
Err(_) => {
|
||||
use std::sync::atomics::Relaxed;
|
||||
use std::sync::atomic::Relaxed;
|
||||
self.is_closed.store(true, Relaxed);
|
||||
vec![]
|
||||
}
|
||||
|
|
|
@ -9,22 +9,22 @@ use libc;
|
|||
/// GLX bindings
|
||||
pub mod glx {
|
||||
generate_gl_bindings! {
|
||||
api: glx,
|
||||
profile: core,
|
||||
version: 1.4,
|
||||
generator: static
|
||||
api: "glx",
|
||||
profile: "core",
|
||||
version: "1.4",
|
||||
generator: "static"
|
||||
}
|
||||
}
|
||||
|
||||
/// Functions that are not necessarly always available
|
||||
pub mod glx_extra {
|
||||
generate_gl_bindings! {
|
||||
api: glx,
|
||||
profile: core,
|
||||
version: 1.4,
|
||||
generator: struct,
|
||||
api: "glx",
|
||||
profile: "core",
|
||||
version: "1.4",
|
||||
generator: "struct",
|
||||
extensions: [
|
||||
GLX_ARB_create_context
|
||||
"GLX_ARB_create_context"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use {Event, WindowBuilder};
|
||||
use libc;
|
||||
use std::{mem, ptr};
|
||||
use std::sync::atomics::AtomicBool;
|
||||
use std::sync::atomic::AtomicBool;
|
||||
use super::ffi;
|
||||
|
||||
pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
|
||||
|
@ -260,7 +260,7 @@ impl Window {
|
|||
}
|
||||
|
||||
pub fn is_closed(&self) -> bool {
|
||||
use std::sync::atomics::Relaxed;
|
||||
use std::sync::atomic::Relaxed;
|
||||
self.is_closed.load(Relaxed)
|
||||
}
|
||||
|
||||
|
@ -340,7 +340,7 @@ impl Window {
|
|||
|
||||
ffi::ClientMessage => {
|
||||
use Closed;
|
||||
use std::sync::atomics::Relaxed;
|
||||
use std::sync::atomic::Relaxed;
|
||||
|
||||
let client_msg: &ffi::XClientMessageEvent = unsafe { mem::transmute(&xev) };
|
||||
|
||||
|
|
|
@ -7,7 +7,12 @@ extern crate glutin;
|
|||
extern crate libc;
|
||||
|
||||
mod gl {
|
||||
generate_gl_bindings!("gl", "core", "1.1", "struct")
|
||||
generate_gl_bindings! {
|
||||
api: "gl",
|
||||
profile: "core",
|
||||
version: "1.1",
|
||||
generator: "struct"
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "headless")]
|
||||
|
|
Loading…
Reference in a new issue