diff options
author | tomaka <pierre.krieger1708@gmail.com> | 2016-01-07 15:44:34 +0100 |
---|---|---|
committer | tomaka <pierre.krieger1708@gmail.com> | 2016-01-07 15:44:34 +0100 |
commit | 64dbf51105f27f849c5dbd43b930c83d68bb4e2b (patch) | |
tree | 3a14421cafbb64f31132ac021e27e052851591f1 /src/api/x11/window.rs | |
parent | f59be2588c47a8dab2da00f12661d204576c0bd3 (diff) | |
parent | 83190432982e4adb2fe14bf3f0de20f6a74fadba (diff) | |
download | glutin-64dbf51105f27f849c5dbd43b930c83d68bb4e2b.tar.gz glutin-64dbf51105f27f849c5dbd43b930c83d68bb4e2b.zip |
Merge pull request #699 from tomaka/screen-id
Fix wrong screen ID used on GLX
Diffstat (limited to 'src/api/x11/window.rs')
-rw-r--r-- | src/api/x11/window.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index 55e88a1..2f700ce 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -366,7 +366,7 @@ impl Window { // GLX should be preferred over EGL, otherwise crashes may occur // on X11 – issue #314 if let Some(ref glx) = display.glx { - Prototype::Glx(try!(GlxContext::new(glx.clone(), &display.xlib, pf_reqs, &builder_clone_opengl_glx, display.display))) + Prototype::Glx(try!(GlxContext::new(glx.clone(), &display.xlib, pf_reqs, &builder_clone_opengl_glx, display.display, screen_id))) } else if let Some(ref egl) = display.egl { Prototype::Egl(try!(EglContext::new(egl.clone(), pf_reqs, &builder_clone_opengl_egl, egl::NativeDisplay::X11(Some(display.display as *const _))))) } else { |