alex/baseview
1
0
Fork 0
Code Activity

X11 GlContext::create: change display arg to *mut xlib::XDisplay

Browse source
This commit is contained in:
Joakim Frostegård 2022-11-26 14:38:17 +01:00 committed by Robbert van der Helm
parent 70f46a691d
commit 4130502a2a
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl/x11.rs
View file

@ -78,14 +78,12 @@ 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(
window: c_ulong, display: *mut c_void, config: FbConfig, window: c_ulong, display: *mut xlib::_XDisplay, config: FbConfig,
) -> Result<GlContext, GlError> { ) -> Result<GlContext, GlError> {
if display.is_null() { if display.is_null() {
return Err(GlError::InvalidWindowHandle); return Err(GlError::InvalidWindowHandle);
} }
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)]
let glXCreateContextAttribsARB: GlXCreateContextAttribsARB = { let glXCreateContextAttribsARB: GlXCreateContextAttribsARB = {

2
src/x11/window.rs
View file

@ -324,7 +324,7 @@ impl Window {
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
let gl_context = fb_config.map(|fb_config| { let gl_context = fb_config.map(|fb_config| {
let window = window_id as c_ulong; let window = window_id as c_ulong;
let display = xcb_connection.conn.get_raw_dpy() as *mut c_void; let display = xcb_connection.conn.get_raw_dpy();
// 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(window, display, fb_config) } let context = unsafe { platform::GlContext::create(window, display, fb_config) }