alex/baseview
1
0
Fork 0
Code Activity

Remove unnecessary unsafe blocks

Browse source
This commit is contained in:
Robbert van der Helm 2022-03-07 18:41:29 +01:00
parent ef86e56ac7
commit 0aae938af0
1 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/gl/x11.rs
View file

@ -96,7 +96,7 @@ impl GlContext {
errors::XErrorHandler::handle(display, |error_handler| { errors::XErrorHandler::handle(display, |error_handler| {
#[allow(non_snake_case)] #[allow(non_snake_case)]
let glXCreateContextAttribsARB: GlXCreateContextAttribsARB = unsafe { let glXCreateContextAttribsARB: GlXCreateContextAttribsARB = {
let addr = get_proc_address("glXCreateContextAttribsARB"); let addr = get_proc_address("glXCreateContextAttribsARB");
if addr.is_null() { if addr.is_null() {
return Err(GlError::CreationFailed(CreationFailedError::GetProcAddressFailed)); return Err(GlError::CreationFailed(CreationFailedError::GetProcAddressFailed));
@ -106,7 +106,7 @@ impl GlContext {
}; };
#[allow(non_snake_case)] #[allow(non_snake_case)]
let glXSwapIntervalEXT: GlXSwapIntervalEXT = unsafe { let glXSwapIntervalEXT: GlXSwapIntervalEXT = {
let addr = get_proc_address("glXSwapIntervalEXT"); let addr = get_proc_address("glXSwapIntervalEXT");
if addr.is_null() { if addr.is_null() {
return Err(GlError::CreationFailed(CreationFailedError::GetProcAddressFailed)); return Err(GlError::CreationFailed(CreationFailedError::GetProcAddressFailed));
@ -130,15 +130,13 @@ impl GlContext {
0, 0,
]; ];
let context = unsafe { let context = glXCreateContextAttribsARB(
glXCreateContextAttribsARB( display,
display, config.fb_config,
config.fb_config, std::ptr::null_mut(),
std::ptr::null_mut(), 1,
1, ctx_attribs.as_ptr(),
ctx_attribs.as_ptr(), );
)
};
error_handler.check()?; error_handler.check()?;
@ -146,20 +144,18 @@ impl GlContext {
return Err(GlError::CreationFailed(CreationFailedError::ContextCreationFailed)); return Err(GlError::CreationFailed(CreationFailedError::ContextCreationFailed));
} }
unsafe { let res = glx::glXMakeCurrent(display, handle.window, context);
let res = glx::glXMakeCurrent(display, handle.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, handle.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 {
error_handler.check()?; error_handler.check()?;
return Err(GlError::CreationFailed(CreationFailedError::MakeCurrentFailed)); return Err(GlError::CreationFailed(CreationFailedError::MakeCurrentFailed));
}
} }
Ok(GlContext { window: handle.window, display, context }) Ok(GlContext { window: handle.window, display, context })
@ -173,7 +169,7 @@ impl GlContext {
display: *mut xlib::_XDisplay, config: GlConfig, display: *mut xlib::_XDisplay, config: GlConfig,
) -> Result<(FbConfig, WindowConfig), GlError> { ) -> Result<(FbConfig, WindowConfig), GlError> {
errors::XErrorHandler::handle(display, |error_handler| { errors::XErrorHandler::handle(display, |error_handler| {
let screen = unsafe { xlib::XDefaultScreen(display) }; let screen = xlib::XDefaultScreen(display);
#[rustfmt::skip] #[rustfmt::skip]
let fb_attribs = [ let fb_attribs = [
@ -195,9 +191,8 @@ impl GlContext {
]; ];
let mut n_configs = 0; let mut n_configs = 0;
let fb_config = unsafe { let fb_config =
glx::glXChooseFBConfig(display, screen, fb_attribs.as_ptr(), &mut n_configs) glx::glXChooseFBConfig(display, screen, fb_attribs.as_ptr(), &mut n_configs);
};
error_handler.check()?; error_handler.check()?;
if n_configs <= 0 || fb_config.is_null() { if n_configs <= 0 || fb_config.is_null() {