PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2025-02-17 15:57:08 -05:00
Code Releases Activity

Add error handling for OpenGL connection details

Browse source
This commit is contained in:
Pavel Roskin 2023-11-21 21:12:56 -08:00 • committed by GitHub
parent f8d9f5f6ef
commit 1a047d44c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
alacritty/src/renderer/mod.rs
View file

@ -1,3 +1,4 @@
use std::borrow::Cow;
use std::collections::HashSet;
use std::ffi::{CStr, CString};
use std::sync::atomic::{AtomicBool, Ordering};
@ -47,12 +48,16 @@ pub static GL_FUNS_LOADED: AtomicBool = AtomicBool::new(false);
pub enum Error {
/// Shader error.
Shader(ShaderError),
/// Other error.
Other(String),
}
impl std::error::Error for Error {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
match self {
Error::Shader(err) => err.source(),
Error::Other(_) => None,
}
}
}
@ -63,6 +68,9 @@ impl fmt::Display for Error {
Error::Shader(err) => {
write!(f, "There was an error initializing the shaders: {}", err)
},
Error::Other(err) => {
write!(f, "{}", err)
},
}
}
}
@ -73,6 +81,12 @@ impl From<ShaderError> for Error {
}
}
impl From<String> for Error {
fn from(val: String) -> Self {
Error::Other(val)
}
}
#[derive(Debug)]
enum TextRendererProvider {
Gles2(Gles2Renderer),
@ -85,6 +99,25 @@ pub struct Renderer {
rect_renderer: RectRenderer,
}
/// Wrapper around gl::GetString with error checking and reporting.
fn gl_get_string(
string_id: gl::types::GLenum,
description: &str,
) -> Result<Cow<'static, str>, Error> {
unsafe {
let string_ptr = gl::GetString(string_id);
match gl::GetError() {
gl::NO_ERROR if !string_ptr.is_null() => {
Ok(CStr::from_ptr(string_ptr as *const _).to_string_lossy())
},
gl::INVALID_ENUM => {
Err(format!("OpenGL error requesting {}: invalid enum", description).into())
},
error_id => Err(format!("OpenGL error {} requesting {}", error_id, description).into()),
}
}
}
impl Renderer {
/// Create a new renderer.
///
@ -104,14 +137,9 @@ impl Renderer {
});
}
let (shader_version, gl_version, renderer) = unsafe {
let renderer = CStr::from_ptr(gl::GetString(gl::RENDERER) as *mut _).to_string_lossy();
let shader_version =
CStr::from_ptr(gl::GetString(gl::SHADING_LANGUAGE_VERSION) as *mut _)
.to_string_lossy();
let gl_version = CStr::from_ptr(gl::GetString(gl::VERSION) as *mut _).to_string_lossy();
(shader_version, gl_version, renderer)
};
let shader_version = gl_get_string(gl::SHADING_LANGUAGE_VERSION, "shader version")?;
let gl_version = gl_get_string(gl::VERSION, "OpenGL version")?;
let renderer = gl_get_string(gl::RENDERER, "renderer version")?;
info!("Running on {renderer}");
info!("OpenGL version {gl_version}, shader_version {shader_version}");