leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add with_vsync to WindowBuilder, plus the win32 implementation

Browse source
This commit is contained in:
Tomaka17 2014-10-26 10:32:51 +01:00
parent e887cf57b8
commit 8249e545f8
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/win32/ffi.rs
View file

@ -23,7 +23,8 @@ pub mod wgl_extra {
version: "1.0",
generator: "struct",
extensions: [
"WGL_ARB_create_context"
"WGL_ARB_create_context",
"WGL_EXT_swap_control"
]
}
}

10
src/win32/init.rs
View file

@ -16,7 +16,7 @@ local_data_key!(WINDOW: (ffi::HWND, Sender<Event>))
pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: String,
builder_monitor: Option<super::MonitorID>,
builder_gl_version: Option<(uint, uint)>,
builder_gl_version: Option<(uint, uint)>, builder_vsync: bool,
builder_headless: bool) -> Result<Window, String>
{
use std::mem;
@ -346,6 +346,14 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
lib
};
// handling vsync
if builder_vsync {
if extra_functions.SwapIntervalEXT.is_loaded() {
unsafe { ffi::wgl::MakeCurrent(hdc, context) };
extra_functions.SwapIntervalEXT(1);
}
}
// building the struct
let window = Window{
window: real_window,

6
src/win32/mod.rs
View file

@ -25,7 +25,7 @@ impl HeadlessContext {
/// See the docs in the crate root file.
pub fn new(builder: HeadlessRendererBuilder) -> Result<HeadlessContext, String> {
let HeadlessRendererBuilder { dimensions, gl_version } = builder;
init::new_window(Some(dimensions), "".to_string(), None, gl_version, true)
init::new_window(Some(dimensions), "".to_string(), None, gl_version, false, true)
.map(|w| HeadlessContext(w))
}
@ -68,8 +68,8 @@ pub struct Window {
impl Window {
/// See the docs in the crate root file.
pub fn new(builder: WindowBuilder) -> Result<Window, String> {
let WindowBuilder { dimensions, title, monitor, gl_version } = builder;
init::new_window(dimensions, title, monitor, gl_version, false)
let WindowBuilder { dimensions, title, monitor, gl_version, vsync } = builder;
init::new_window(dimensions, title, monitor, gl_version, vsync, false)
}
}