diff options
| author | Pierre Krieger <pierre.krieger1708@gmail.com> | 2014-08-07 17:35:26 +0200 |
|---|---|---|
| committer | Pierre Krieger <pierre.krieger1708@gmail.com> | 2014-08-07 17:35:26 +0200 |
| commit | c7aa219ef11add2078c96958ed679594d0570d72 (patch) | |
| tree | a41f7725305935b068805cdd50ee0bb2cfc2731e /src/x11/ffi.rs | |
| parent | ed3ed47ad88c628db81bcb3ee4f9106473844893 (diff) | |
| download | glutin-c7aa219ef11add2078c96958ed679594d0570d72.tar.gz glutin-c7aa219ef11add2078c96958ed679594d0570d72.zip | |
Now using glXChooseFBConfig
Diffstat (limited to 'src/x11/ffi.rs')
| -rw-r--r-- | src/x11/ffi.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/x11/ffi.rs b/src/x11/ffi.rs index a31b9c2..2cd147f 100644 --- a/src/x11/ffi.rs +++ b/src/x11/ffi.rs @@ -13,7 +13,7 @@ pub type Drawable = XID; // TODO: not sure pub type GLXContext = *const (); pub type GLXContextID = XID; pub type GLXDrawable = XID; -pub type GLXFBConfig = (); +pub type GLXFBConfig = *const (); pub type GLXPbuffer = XID; pub type GLXPixmap = XID; pub type GLXWindow = XID; @@ -1348,6 +1348,7 @@ extern "C" { pub fn XDestroyWindow(display: *mut Display, w: Window); pub fn XFilterEvent(event: *mut XEvent, w: Window) -> Bool; pub fn XFlush(display: *mut Display); + pub fn XFree(data: *const libc::c_void); pub fn XGetGeometry(display: *mut Display, d: Drawable, root_return: *mut Window, x_return: *mut libc::c_int, y_return: *mut libc::c_int, width_return: *mut libc::c_uint, height_return: *mut libc::c_uint, @@ -1386,10 +1387,11 @@ extern "C" { shareList: GLXContext, direct: Bool) -> GLXContext; pub fn glXDestroyContext(dpy: *mut Display, ctx: GLXContext); pub fn glXChooseFBConfig(dpy: *mut Display, screen: libc::c_int, - attrib_list: *const libc::c_int, nelements: *mut libc::c_int); + attrib_list: *const libc::c_int, nelements: *mut libc::c_int) -> *mut GLXFBConfig; pub fn glXChooseVisual(dpy: *mut Display, screen: libc::c_int, attribList: *const libc::c_int) -> *const XVisualInfo; pub fn glXGetProcAddress(procName: *const libc::c_uchar) -> *const (); + pub fn glXGetVisualFromFBConfig(dpy: *mut Display, config: GLXFBConfig) -> *mut XVisualInfo; pub fn glXMakeCurrent(dpy: *mut Display, drawable: GLXDrawable, ctx: GLXContext) -> Bool; pub fn glXSwapBuffers(dpy: *mut Display, drawable: GLXDrawable); @@ -1398,7 +1400,6 @@ extern "C" { /* GLXFBConfig *glXGetFBConfigs (Display *dpy, int screen, int *nelements); int glXGetFBConfigAttrib (Display *dpy, GLXFBConfig config, int attribute, int *value); -XVisualInfo *glXGetVisualFromFBConfig (Display *dpy, GLXFBConfig config); GLXWindow glXCreateWindow (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list); void glXDestroyWindow (Display *dpy, GLXWindow win); GLXPixmap glXCreatePixmap (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list); |