From 7f6f4f8d04b9f6dfbbc9528552fa45db932d6dae Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 24 Dec 2014 08:09:16 +0100 Subject: Update for gl_generator's changes --- src/android/ffi.rs | 7 +------ src/win32/gl.rs | 18 ++---------------- src/x11/ffi.rs | 17 ++--------------- 3 files changed, 5 insertions(+), 37 deletions(-) (limited to 'src') diff --git a/src/android/ffi.rs b/src/android/ffi.rs index 5e7060d..111f670 100644 --- a/src/android/ffi.rs +++ b/src/android/ffi.rs @@ -17,12 +17,7 @@ pub mod egl { pub type NativePixmapType = super::EGLNativePixmapType; pub type NativeWindowType = super::EGLNativeWindowType; - generate_gl_bindings! { - api: "egl", - profile: "core", - version: "1.5", - generator: "static" - } + include!(concat!(env!("OUT_DIR"), "/egl_bindings.rs")); } pub type khronos_utime_nanoseconds_t = khronos_uint64_t; diff --git a/src/win32/gl.rs b/src/win32/gl.rs index a44af77..1354d95 100644 --- a/src/win32/gl.rs +++ b/src/win32/gl.rs @@ -1,25 +1,11 @@ /// WGL bindings pub mod wgl { - generate_gl_bindings! { - api: "wgl", - profile: "core", - version: "1.0", - generator: "static" - } + include!(concat!(env!("OUT_DIR"), "/wgl_bindings.rs")); } /// Functions that are not necessarly always available pub mod wgl_extra { - generate_gl_bindings! { - api: "wgl", - profile: "core", - version: "1.0", - generator: "struct", - extensions: [ - "WGL_ARB_create_context", - "WGL_EXT_swap_control" - ] - } + include!(concat!(env!("OUT_DIR"), "/wgl_extra_bindings.rs")); } #[link(name = "opengl32")] diff --git a/src/x11/ffi.rs b/src/x11/ffi.rs index 1f8b10f..5610eee 100644 --- a/src/x11/ffi.rs +++ b/src/x11/ffi.rs @@ -8,25 +8,12 @@ use libc; /// GLX bindings pub mod glx { - generate_gl_bindings! { - api: "glx", - profile: "core", - version: "1.4", - generator: "static" - } + include!(concat!(env!("OUT_DIR"), "/glx_bindings.rs")); } /// Functions that are not necessarly always available pub mod glx_extra { - generate_gl_bindings! { - api: "glx", - profile: "core", - version: "1.4", - generator: "struct", - extensions: [ - "GLX_ARB_create_context" - ] - } + include!(concat!(env!("OUT_DIR"), "/glx_extra_bindings.rs")); } pub type Atom = libc::c_ulong; -- cgit v1.2.3