alex/baseview
1
0
Fork 0
Code Activity

Fix X11 OpenGL issue

Browse source
This commit is contained in:
Joakim Frostegård 2022-11-23 23:52:19 +01:00 committed by Robbert van der Helm
parent 6f32584149
commit 10c970a329
2 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gl/x11.rs
View file

@ -1,8 +1,6 @@
use std::ffi::{c_void, CString}; use std::ffi::{c_void, CString};
use std::os::raw::{c_int, c_ulong}; use std::os::raw::{c_int, c_ulong};
use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
use x11::glx; use x11::glx;
use x11::xlib; use x11::xlib;
@ -80,19 +78,13 @@ impl GlContext {
/// ///
/// Use [Self::get_fb_config_and_visual] to create both of these things. /// Use [Self::get_fb_config_and_visual] to create both of these things.
pub unsafe fn create( pub unsafe fn create(
parent: &impl HasRawWindowHandle, config: FbConfig, window: c_ulong, display: *mut c_void, config: FbConfig,
) -> Result<GlContext, GlError> { ) -> Result<GlContext, GlError> {
let handle = if let RawWindowHandle::Xlib(handle) = parent.raw_window_handle() { if display.is_null() {
handle
} else {
return Err(GlError::InvalidWindowHandle);
};
if handle.display.is_null() {
return Err(GlError::InvalidWindowHandle); return Err(GlError::InvalidWindowHandle);
} }
let display = handle.display as *mut xlib::_XDisplay; let display = display as *mut xlib::_XDisplay;
errors::XErrorHandler::handle(display, |error_handler| { errors::XErrorHandler::handle(display, |error_handler| {
#[allow(non_snake_case)] #[allow(non_snake_case)]
@ -144,13 +136,13 @@ impl GlContext {
return Err(GlError::CreationFailed(CreationFailedError::ContextCreationFailed)); return Err(GlError::CreationFailed(CreationFailedError::ContextCreationFailed));
} }
let res = glx::glXMakeCurrent(display, handle.window, context); let res = glx::glXMakeCurrent(display, window, context);
error_handler.check()?; error_handler.check()?;
if res == 0 { if res == 0 {
return Err(GlError::CreationFailed(CreationFailedError::MakeCurrentFailed)); return Err(GlError::CreationFailed(CreationFailedError::MakeCurrentFailed));
} }
glXSwapIntervalEXT(display, handle.window, config.gl_config.vsync as i32); glXSwapIntervalEXT(display, window, config.gl_config.vsync as i32);
error_handler.check()?; error_handler.check()?;
if glx::glXMakeCurrent(display, 0, std::ptr::null_mut()) == 0 { if glx::glXMakeCurrent(display, 0, std::ptr::null_mut()) == 0 {
@ -158,7 +150,7 @@ impl GlContext {
return Err(GlError::CreationFailed(CreationFailedError::MakeCurrentFailed)); return Err(GlError::CreationFailed(CreationFailedError::MakeCurrentFailed));
} }
Ok(GlContext { window: handle.window, display, context }) Ok(GlContext { window, display, context })
}) })
} }

13
src/x11/window.rs
View file

@ -22,10 +22,7 @@ use crate::{
use super::keyboard::{convert_key_press_event, convert_key_release_event, key_mods}; use super::keyboard::{convert_key_press_event, convert_key_release_event, key_mods};
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
use crate::{ use crate::gl::{platform, GlContext};
gl::{platform, GlContext},
window::RawWindowHandleWrapper,
};
pub struct WindowHandle { pub struct WindowHandle {
raw_window_handle: Option<RawWindowHandle>, raw_window_handle: Option<RawWindowHandle>,
@ -326,13 +323,11 @@ impl Window {
// compared to when raw-gl-context was a separate crate. // compared to when raw-gl-context was a separate crate.
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
let gl_context = fb_config.map(|fb_config| { let gl_context = fb_config.map(|fb_config| {
let mut handle = XlibWindowHandle::empty(); let window = window_id as c_ulong;
handle.window = window_id as c_ulong; let display = xcb_connection.conn.get_raw_dpy() as *mut c_void;
handle.display = xcb_connection.conn.get_raw_dpy() as *mut c_void;
let handle = RawWindowHandleWrapper { handle: RawWindowHandle::Xlib(handle) };
// Because of the visual negotation we had to take some extra steps to create this context // Because of the visual negotation we had to take some extra steps to create this context
let context = unsafe { platform::GlContext::create(&handle, fb_config) } let context = unsafe { platform::GlContext::create(window, display, fb_config) }
.expect("Could not create OpenGL context"); .expect("Could not create OpenGL context");
GlContext::new(context) GlContext::new(context)
}); });