From 717d0184c0da42aee24b9041a73d9505016c9c29 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Tue, 8 Mar 2016 22:59:15 -0700 Subject: Pin core-graphics to 0.2 since cocoa 0.2.4 does --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index a282b60..cda4d75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ objc = "0.1.8" cgl = "0.1" cocoa = "0.2.4" core-foundation = "0" -core-graphics = "0" +core-graphics = "0.2" [target.i686-pc-windows-gnu.dependencies] winapi = "0.2" -- cgit v1.2.3 From c0adb8d87eb929db037c2cce2082bfb5f7627119 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Mon, 14 Mar 2016 20:22:16 -0400 Subject: Fix Mac build by bumping core-graphics. At the time of writing, Glutin requires 0.2.x and cocoa requires 0.3.x. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index cda4d75..3a251c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ objc = "0.1.8" cgl = "0.1" cocoa = "0.2.4" core-foundation = "0" -core-graphics = "0.2" +core-graphics = "0.3" [target.i686-pc-windows-gnu.dependencies] winapi = "0.2" -- cgit v1.2.3 From 1de66e4efbd428e5cefa422e6c771e225cab1829 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sat, 27 Feb 2016 15:29:06 +0530 Subject: Add support for navigation keys --- Cargo.toml | 18 +++++++++--------- src/api/win32/event.rs | 8 ++++---- src/api/x11/events.rs | 3 +++ src/events.rs | 2 ++ 4 files changed, 18 insertions(+), 13 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 3a251c2..294d55d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,60 +81,60 @@ osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" [target.i586-unknown-linux-gnu.dependencies] osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" [target.x86_64-unknown-linux-gnu.dependencies] osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" [target.arm-unknown-linux-gnueabihf.dependencies] osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" [target.armv7-unknown-linux-gnueabihf.dependencies] osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" [target.aarch64-unknown-linux-gnu.dependencies] osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" [target.x86_64-unknown-dragonfly.dependencies] osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" [target.x86_64-unknown-freebsd.dependencies] osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" [target.x86_64-unknown-openbsd.dependencies] osmesa-sys = "0.0.5" wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] } wayland-kbd = "0.3.3" wayland-window = "0.2.2" -x11-dl = "~2.3" +x11-dl = "~2.4" diff --git a/src/api/win32/event.rs b/src/api/win32/event.rs index ad4598a..f60ec7e 100644 --- a/src/api/win32/event.rs +++ b/src/api/win32/event.rs @@ -148,10 +148,10 @@ pub fn vkeycode_to_element(wparam: winapi::WPARAM, lparam: winapi::LPARAM) -> (S winapi::VK_LCONTROL => Some(VirtualKeyCode::Lcontrol), winapi::VK_RCONTROL => Some(VirtualKeyCode::Rcontrol), winapi::VK_LMENU => Some(VirtualKeyCode::Lmenu), - winapi::VK_RMENU => Some(VirtualKeyCode::Rmenu), - winapi::VK_BROWSER_BACK => Some(VirtualKeyCode::Browser_back), - winapi::VK_BROWSER_FORWARD => Some(VirtualKeyCode::Browser_forward), - winapi::VK_BROWSER_REFRESH => Some(VirtualKeyCode::Browser_refresh), + winapi::VK_RMENU => Some(VirtualKeyCode::Rmenu),*/ + winapi::VK_BROWSER_BACK => Some(VirtualKeyCode::NavigateBackward), + winapi::VK_BROWSER_FORWARD => Some(VirtualKeyCode::NavigateForward), + /*winapi::VK_BROWSER_REFRESH => Some(VirtualKeyCode::Browser_refresh), winapi::VK_BROWSER_STOP => Some(VirtualKeyCode::Browser_stop), winapi::VK_BROWSER_SEARCH => Some(VirtualKeyCode::Browser_search), winapi::VK_BROWSER_FAVORITES => Some(VirtualKeyCode::Browser_favorites), diff --git a/src/api/x11/events.rs b/src/api/x11/events.rs index 408a3ec..d497319 100644 --- a/src/api/x11/events.rs +++ b/src/api/x11/events.rs @@ -3,6 +3,7 @@ use super::ffi; use VirtualKeyCode; pub fn keycode_to_element(scancode: libc::c_uint) -> Option { + println!("{:?}", scancode); Some(match scancode { ffi::XK_BackSpace => events::VirtualKeyCode::Back, ffi::XK_Tab => events::VirtualKeyCode::Tab, @@ -997,6 +998,8 @@ pub fn keycode_to_element(scancode: libc::c_uint) -> Option { //ffi::XK_hebrew_taw => events::VirtualKeyCode::Hebrew_taw, //ffi::XK_hebrew_taf => events::VirtualKeyCode::Hebrew_taf, //ffi::XK_Hebrew_switch => events::VirtualKeyCode::Hebrew_switch, + ffi::XF86XK_Back => VirtualKeyCode::NavigateBackward, + ffi::XF86XK_Forward => VirtualKeyCode::NavigateForward, _ => return None }) } diff --git a/src/events.rs b/src/events.rs index 8049c16..9fff1fb 100644 --- a/src/events.rs +++ b/src/events.rs @@ -264,6 +264,8 @@ pub enum VirtualKeyCode { Multiply, Mute, MyComputer, + NavigateForward, // also called "Prior" + NavigateBackward, // also called "Next" NextTrack, NoConvert, NumpadComma, -- cgit v1.2.3 From c5268309c39933e13e86bd33a9fe0b7fa8c88b14 Mon Sep 17 00:00:00 2001 From: Steven Sheldon Date: Sun, 20 Mar 2016 16:04:11 -0700 Subject: Update objc to 0.2. --- Cargo.toml | 14 +++++++------- src/api/cocoa/mod.rs | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 294d55d..ddf8160 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,24 +23,24 @@ khronos_api = "1.0" version = "0.1" [target.i386-apple-ios.dependencies] -objc = "0.1.8" +objc = "0.2" [target.x86_64-apple-ios.dependencies] -objc = "0.1.8" +objc = "0.2" [target.aarch64-apple-ios.dependencies] -objc = "0.1.8" +objc = "0.2" [target.armv7s-apple-ios.dependencies] -objc = "0.1.8" +objc = "0.2" [target.armv7-apple-ios.dependencies] -objc = "0.1.8" +objc = "0.2" [target.x86_64-apple-darwin.dependencies] -objc = "0.1.8" +objc = "0.2" cgl = "0.1" -cocoa = "0.2.4" +cocoa = "0.3" core-foundation = "0" core-graphics = "0.3" diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index bec56d2..e935805 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -79,11 +79,12 @@ struct WindowDelegate { impl WindowDelegate { /// Get the delegate class, initiailizing it neccessary fn class() -> *const Class { + use std::os::raw::c_void; use std::sync::{Once, ONCE_INIT}; extern fn window_should_close(this: &Object, _: Sel, _: id) -> BOOL { unsafe { - let state: *mut libc::c_void = *this.get_ivar("glutinState"); + let state: *mut c_void = *this.get_ivar("glutinState"); let state = state as *mut DelegateState; (*state).pending_events.lock().unwrap().push_back(Closed); } @@ -92,7 +93,7 @@ impl WindowDelegate { extern fn window_did_resize(this: &Object, _: Sel, _: id) { unsafe { - let state: *mut libc::c_void = *this.get_ivar("glutinState"); + let state: *mut c_void = *this.get_ivar("glutinState"); let state = &mut *(state as *mut DelegateState); let _: () = msg_send![*state.context, update]; @@ -111,7 +112,7 @@ impl WindowDelegate { // TODO: center the cursor if the window had mouse grab when it // lost focus - let state: *mut libc::c_void = *this.get_ivar("glutinState"); + let state: *mut c_void = *this.get_ivar("glutinState"); let state = state as *mut DelegateState; (*state).pending_events.lock().unwrap().push_back(Focused(true)); } @@ -119,7 +120,7 @@ impl WindowDelegate { extern fn window_did_resign_key(this: &Object, _: Sel, _: id) { unsafe { - let state: *mut libc::c_void = *this.get_ivar("glutinState"); + let state: *mut c_void = *this.get_ivar("glutinState"); let state = state as *mut DelegateState; (*state).pending_events.lock().unwrap().push_back(Focused(false)); } @@ -131,7 +132,7 @@ impl WindowDelegate { INIT.call_once(|| unsafe { // Create new NSWindowDelegate let superclass = Class::get("NSObject").unwrap(); - let mut decl = ClassDecl::new(superclass, "GlutinWindowDelegate").unwrap(); + let mut decl = ClassDecl::new("GlutinWindowDelegate", superclass).unwrap(); // Add callback methods decl.add_method(sel!(windowShouldClose:), @@ -145,7 +146,7 @@ impl WindowDelegate { window_did_resign_key as extern fn(&Object, Sel, id)); // Store internal state as user data - decl.add_ivar::<*mut libc::c_void>("glutinState"); + decl.add_ivar::<*mut c_void>("glutinState"); delegate_class = decl.register(); }); @@ -162,7 +163,7 @@ impl WindowDelegate { unsafe { let delegate = IdRef::new(msg_send![WindowDelegate::class(), new]); - (&mut **delegate).set_ivar("glutinState", state_ptr as *mut libc::c_void); + (&mut **delegate).set_ivar("glutinState", state_ptr as *mut ::std::os::raw::c_void); let _: () = msg_send![*state.window, setDelegate:*delegate]; WindowDelegate { state: state, _this: delegate } @@ -673,8 +674,8 @@ impl Window { let sel = Sel::register(cursor_name); let cls = Class::get("NSCursor").unwrap(); unsafe { - use objc::MessageArguments; - let cursor: id = ().send(cls as *const _ as id, sel); + use objc::Message; + let cursor: id = cls.send_message(sel, ()).unwrap(); let _: () = msg_send![cursor, set]; } } -- cgit v1.2.3 From e8b3570db411b6e39596553c5c13febc153a60a6 Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Thu, 24 Mar 2016 14:03:38 +1100 Subject: Update gl_generator to v0.5 --- Cargo.toml | 3 +- build.rs | 242 ++++++++++++++++++++++++++----------------------------------- 2 files changed, 102 insertions(+), 143 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index ddf8160..f1434d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,8 +16,7 @@ libc = "0.2" shared_library = "0.1.0" [build-dependencies] -gl_generator = "0.4" -khronos_api = "1.0" +gl_generator = "0.5" [target.arm-linux-androideabi.dependencies.android_glue] version = "0.1" diff --git a/build.rs b/build.rs index 5367173..7d911f5 100644 --- a/build.rs +++ b/build.rs @@ -1,6 +1,6 @@ extern crate gl_generator; -extern crate khronos_api; +use gl_generator::{Registry, Api, Profile, Fallbacks}; use std::env; use std::fs::File; use std::path::PathBuf; @@ -13,175 +13,135 @@ fn main() { if target.contains("windows") { let mut file = File::create(&dest.join("wgl_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StaticGenerator, - gl_generator::registry::Ns::Wgl, - gl_generator::Fallbacks::All, - khronos_api::WGL_XML, vec![], - "1.0", "core", &mut file).unwrap(); + Registry::new(Api::Wgl, (1, 0), Profile::Core, Fallbacks::All, []) + .write_bindings(gl_generator::StaticGenerator, &mut file) + .unwrap(); let mut file = File::create(&dest.join("wgl_extra_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StructGenerator, - gl_generator::registry::Ns::Wgl, - gl_generator::Fallbacks::All, - khronos_api::WGL_XML, - vec![ - "WGL_ARB_create_context".to_string(), - "WGL_ARB_create_context_profile".to_string(), - "WGL_ARB_create_context_robustness".to_string(), - "WGL_ARB_context_flush_control".to_string(), - "WGL_ARB_extensions_string".to_string(), - "WGL_ARB_framebuffer_sRGB".to_string(), - "WGL_ARB_multisample".to_string(), - "WGL_ARB_pixel_format".to_string(), - "WGL_ARB_pixel_format_float".to_string(), - "WGL_EXT_create_context_es2_profile".to_string(), - "WGL_EXT_extensions_string".to_string(), - "WGL_EXT_framebuffer_sRGB".to_string(), - "WGL_EXT_swap_control".to_string(), - ], - "1.0", "core", &mut file).unwrap(); + Registry::new(Api::Wgl, (1, 0), Profile::Core, Fallbacks::All, [ + "WGL_ARB_create_context", + "WGL_ARB_create_context_profile", + "WGL_ARB_create_context_robustness", + "WGL_ARB_context_flush_control", + "WGL_ARB_extensions_string", + "WGL_ARB_framebuffer_sRGB", + "WGL_ARB_multisample", + "WGL_ARB_pixel_format", + "WGL_ARB_pixel_format_float", + "WGL_EXT_create_context_es2_profile", + "WGL_EXT_extensions_string", + "WGL_EXT_framebuffer_sRGB", + "WGL_EXT_swap_control", + ]) + .write_bindings(gl_generator::StructGenerator, &mut file).unwrap(); let mut file = File::create(&dest.join("egl_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StructGenerator, - gl_generator::registry::Ns::Egl, - gl_generator::Fallbacks::All, - khronos_api::EGL_XML, - vec![ - "EGL_KHR_create_context".to_string(), - "EGL_EXT_create_context_robustness".to_string(), - "EGL_KHR_create_context_no_error".to_string(), - "EGL_KHR_platform_x11".to_string(), - "EGL_KHR_platform_android".to_string(), - "EGL_KHR_platform_wayland".to_string(), - "EGL_KHR_platform_gbm".to_string(), - "EGL_EXT_platform_base".to_string(), - "EGL_EXT_platform_x11".to_string(), - "EGL_MESA_platform_gbm".to_string(), - "EGL_EXT_platform_wayland".to_string(), - "EGL_EXT_platform_device".to_string(), - ], - "1.5", "core", &mut file).unwrap(); + Registry::new(Api::Egl, (1, 5), Profile::Core, Fallbacks::All, [ + "EGL_KHR_create_context", + "EGL_EXT_create_context_robustness", + "EGL_KHR_create_context_no_error", + "EGL_KHR_platform_x11", + "EGL_KHR_platform_android", + "EGL_KHR_platform_wayland", + "EGL_KHR_platform_gbm", + "EGL_EXT_platform_base", + "EGL_EXT_platform_x11", + "EGL_MESA_platform_gbm", + "EGL_EXT_platform_wayland", + "EGL_EXT_platform_device", + ]) + .write_bindings(gl_generator::StructGenerator, &mut file).unwrap(); } if target.contains("linux") || target.contains("dragonfly") || target.contains("freebsd") || target.contains("openbsd") { let mut file = File::create(&dest.join("glx_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StructGenerator, - gl_generator::registry::Ns::Glx, - gl_generator::Fallbacks::All, - khronos_api::GLX_XML, vec![], - "1.4", "core", &mut file).unwrap(); + Registry::new(Api::Glx, (1, 4), Profile::Core, Fallbacks::All, []) + .write_bindings(gl_generator::StructGenerator, &mut file).unwrap(); let mut file = File::create(&dest.join("glx_extra_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StructGenerator, - gl_generator::registry::Ns::Glx, - gl_generator::Fallbacks::All, - khronos_api::GLX_XML, - vec![ - "GLX_ARB_create_context".to_string(), - "GLX_ARB_create_context_profile".to_string(), - "GLX_ARB_create_context_robustness".to_string(), - "GLX_ARB_context_flush_control".to_string(), - "GLX_ARB_fbconfig_float".to_string(), - "GLX_ARB_framebuffer_sRGB".to_string(), - "GLX_EXT_framebuffer_sRGB".to_string(), - "GLX_ARB_multisample".to_string(), - "GLX_EXT_swap_control".to_string(), - "GLX_SGI_swap_control".to_string() - ], - "1.4", "core", &mut file).unwrap(); + Registry::new(Api::Glx, (1, 4), Profile::Core, Fallbacks::All, [ + "GLX_ARB_create_context", + "GLX_ARB_create_context_profile", + "GLX_ARB_create_context_robustness", + "GLX_ARB_context_flush_control", + "GLX_ARB_fbconfig_float", + "GLX_ARB_framebuffer_sRGB", + "GLX_EXT_framebuffer_sRGB", + "GLX_ARB_multisample", + "GLX_EXT_swap_control", + "GLX_SGI_swap_control" + ]) + .write_bindings(gl_generator::StructGenerator, &mut file).unwrap(); let mut file = File::create(&dest.join("egl_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StructGenerator, - gl_generator::registry::Ns::Egl, - gl_generator::Fallbacks::All, - khronos_api::EGL_XML, - vec![ - "EGL_KHR_create_context".to_string(), - "EGL_EXT_create_context_robustness".to_string(), - "EGL_KHR_create_context_no_error".to_string(), - "EGL_KHR_platform_x11".to_string(), - "EGL_KHR_platform_android".to_string(), - "EGL_KHR_platform_wayland".to_string(), - "EGL_KHR_platform_gbm".to_string(), - "EGL_EXT_platform_base".to_string(), - "EGL_EXT_platform_x11".to_string(), - "EGL_MESA_platform_gbm".to_string(), - "EGL_EXT_platform_wayland".to_string(), - "EGL_EXT_platform_device".to_string(), - ], - "1.5", "core", &mut file).unwrap(); + Registry::new(Api::Egl, (1, 5), Profile::Core, Fallbacks::All, [ + "EGL_KHR_create_context", + "EGL_EXT_create_context_robustness", + "EGL_KHR_create_context_no_error", + "EGL_KHR_platform_x11", + "EGL_KHR_platform_android", + "EGL_KHR_platform_wayland", + "EGL_KHR_platform_gbm", + "EGL_EXT_platform_base", + "EGL_EXT_platform_x11", + "EGL_MESA_platform_gbm", + "EGL_EXT_platform_wayland", + "EGL_EXT_platform_device", + ]) + .write_bindings(gl_generator::StructGenerator, &mut file).unwrap(); } if target.contains("android") { let mut file = File::create(&dest.join("egl_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StaticStructGenerator, - gl_generator::registry::Ns::Egl, - gl_generator::Fallbacks::All, - khronos_api::EGL_XML, - vec![ - "EGL_KHR_create_context".to_string(), - "EGL_EXT_create_context_robustness".to_string(), - "EGL_KHR_create_context_no_error".to_string(), - "EGL_KHR_platform_x11".to_string(), - "EGL_KHR_platform_android".to_string(), - "EGL_KHR_platform_wayland".to_string(), - "EGL_KHR_platform_gbm".to_string(), - "EGL_EXT_platform_base".to_string(), - "EGL_EXT_platform_x11".to_string(), - "EGL_MESA_platform_gbm".to_string(), - "EGL_EXT_platform_wayland".to_string(), - "EGL_EXT_platform_device".to_string(), - ], - "1.5", "core", &mut file).unwrap(); + Registry::new(Api::Egl, (1, 5), Profile::Core, Fallbacks::All, [ + "EGL_KHR_create_context", + "EGL_EXT_create_context_robustness", + "EGL_KHR_create_context_no_error", + "EGL_KHR_platform_x11", + "EGL_KHR_platform_android", + "EGL_KHR_platform_wayland", + "EGL_KHR_platform_gbm", + "EGL_EXT_platform_base", + "EGL_EXT_platform_x11", + "EGL_MESA_platform_gbm", + "EGL_EXT_platform_wayland", + "EGL_EXT_platform_device", + ]) + .write_bindings(gl_generator::StaticStructGenerator, &mut file).unwrap(); } if target.contains("ios") { let mut file = File::create(&dest.join("egl_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StaticStructGenerator, - gl_generator::registry::Ns::Egl, - gl_generator::Fallbacks::All, - khronos_api::EGL_XML, - vec![ - "EGL_KHR_create_context".to_string(), - "EGL_EXT_create_context_robustness".to_string(), - "EGL_KHR_create_context_no_error".to_string(), - "EGL_KHR_platform_x11".to_string(), - "EGL_KHR_platform_android".to_string(), - "EGL_KHR_platform_wayland".to_string(), - "EGL_KHR_platform_gbm".to_string(), - "EGL_EXT_platform_base".to_string(), - "EGL_EXT_platform_x11".to_string(), - "EGL_MESA_platform_gbm".to_string(), - "EGL_EXT_platform_wayland".to_string(), - "EGL_EXT_platform_device".to_string(), - ], - "1.5", "core", &mut file).unwrap(); + Registry::new(Api::Egl, (1, 5), Profile::Core, Fallbacks::All, [ + "EGL_KHR_create_context", + "EGL_EXT_create_context_robustness", + "EGL_KHR_create_context_no_error", + "EGL_KHR_platform_x11", + "EGL_KHR_platform_android", + "EGL_KHR_platform_wayland", + "EGL_KHR_platform_gbm", + "EGL_EXT_platform_base", + "EGL_EXT_platform_x11", + "EGL_MESA_platform_gbm", + "EGL_EXT_platform_wayland", + "EGL_EXT_platform_device", + ]) + .write_bindings(gl_generator::StaticStructGenerator, &mut file).unwrap(); let mut file = File::create(&dest.join("gles2_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StaticStructGenerator, - gl_generator::registry::Ns::Gles2, - gl_generator::Fallbacks::None, - khronos_api::GL_XML, - vec![], - "2.0", "core", &mut file).unwrap(); + Registry::new(Api::Gles2, (2, 0), Profile::Core, Fallbacks::None, []) + .write_bindings(gl_generator::StaticStructGenerator, &mut file).unwrap(); } if target.contains("darwin") { let mut file = File::create(&dest.join("gl_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::GlobalGenerator, - gl_generator::registry::Ns::Gl, - gl_generator::Fallbacks::All, - khronos_api::GL_XML, - vec!["GL_EXT_framebuffer_object".to_string()], - "3.2", "core", &mut file).unwrap(); + Registry::new(Api::Gl, (3, 2), Profile::Core, Fallbacks::All, ["GL_EXT_framebuffer_object"]) + .write_bindings(gl_generator::GlobalGenerator, &mut file).unwrap(); } // TODO: only build the bindings below if we run tests/examples let mut file = File::create(&dest.join("test_gl_bindings.rs")).unwrap(); - gl_generator::generate_bindings(gl_generator::StructGenerator, - gl_generator::registry::Ns::Gles2, - gl_generator::Fallbacks::All, - khronos_api::GL_XML, vec![], - "3.0", "core", &mut file).unwrap(); + Registry::new(Api::Gles2, (3, 0), Profile::Core, Fallbacks::All, []) + .write_bindings(gl_generator::StructGenerator, &mut file).unwrap(); } -- cgit v1.2.3