vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

docs: Add more explanations to various graphics code

This commit is contained in:
Victor Brekenfeld 2020-06-05 22:25:36 +02:00
parent a3459cda31
commit 3c048075f4
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/egl/display.rs
View File

@ -90,6 +90,7 @@ impl<B: native::Backend, N: native::NativeDisplay<B>> EGLDisplay<B, N> {
}; };
debug!(log, "EGL No-Display Extensions: {:?}", dp_extensions); debug!(log, "EGL No-Display Extensions: {:?}", dp_extensions);
// we create an EGLDisplay
let display = unsafe { let display = unsafe {
B::get_display( B::get_display(
ptr, ptr,
@ -103,6 +104,7 @@ impl<B: native::Backend, N: native::NativeDisplay<B>> EGLDisplay<B, N> {
return Err(Error::DisplayNotSupported); return Err(Error::DisplayNotSupported);
} }
// We can then query the egl api version
let egl_version = { let egl_version = {
let mut major: MaybeUninit<ffi::egl::types::EGLint> = MaybeUninit::uninit(); let mut major: MaybeUninit<ffi::egl::types::EGLint> = MaybeUninit::uninit();
let mut minor: MaybeUninit<ffi::egl::types::EGLint> = MaybeUninit::uninit(); let mut minor: MaybeUninit<ffi::egl::types::EGLint> = MaybeUninit::uninit();
@ -137,6 +139,7 @@ impl<B: native::Backend, N: native::NativeDisplay<B>> EGLDisplay<B, N> {
}; };
info!(log, "EGL Extensions: {:?}", extensions); info!(log, "EGL Extensions: {:?}", extensions);
// egl <= 1.2 does not support OpenGL ES (maybe we want to support OpenGL in the future?)
if egl_version <= (1, 2) { if egl_version <= (1, 2) {
return Err(Error::OpenGlesNotSupported(None)); return Err(Error::OpenGlesNotSupported(None));
} }
@ -222,7 +225,7 @@ impl<B: native::Backend, N: native::NativeDisplay<B>> EGLDisplay<B, N> {
out out
}; };
// calling `eglChooseConfig` // Try to find configs that match out criteria
let mut num_configs = 0; let mut num_configs = 0;
wrap_egl_call(|| unsafe { wrap_egl_call(|| unsafe {
ffi::egl::ChooseConfig( ffi::egl::ChooseConfig(
@ -258,7 +261,6 @@ impl<B: native::Backend, N: native::NativeDisplay<B>> EGLDisplay<B, N> {
} }
let desired_swap_interval = if attributes.vsync { 1 } else { 0 }; let desired_swap_interval = if attributes.vsync { 1 } else { 0 };
// try to select a config with the desired_swap_interval // try to select a config with the desired_swap_interval
// (but don't fail, as the margin might be very small on some cards and most configs are fine) // (but don't fail, as the margin might be very small on some cards and most configs are fine)
let config_id = config_ids let config_id = config_ids
@ -319,6 +321,7 @@ impl<B: native::Backend, N: native::NativeDisplay<B>> EGLDisplay<B, N> {
}}; }};
}; };
// return the format that was selected for our config
let desc = unsafe { let desc = unsafe {
PixelFormat { PixelFormat {
hardware_accelerated: attrib!(self.display, config_id, ffi::egl::CONFIG_CAVEAT) hardware_accelerated: attrib!(self.display, config_id, ffi::egl::CONFIG_CAVEAT)

2
src/backend/egl/surface.rs
View File

@ -122,6 +122,8 @@ impl<N: native::NativeSurface> EGLSurface<N> {
})? })?
}); });
// if a recreation is pending anyway, ignore page-flip errors.
// lets see if we still fail after the next commit.
result.map_err(|err| { result.map_err(|err| {
debug!(self.logger, "Hiding page-flip error *before* recreation: {}", err); debug!(self.logger, "Hiding page-flip error *before* recreation: {}", err);
SwapBuffersError::EGLSwapBuffers(EGLError::BadSurface) SwapBuffersError::EGLSwapBuffers(EGLError::BadSurface)

2
src/backend/graphics/glium.rs
View File

@ -125,7 +125,7 @@ unsafe impl<T: GLGraphicsBackend> Backend for InternalBackend<T> {
} }
} }
/// Omplementation of `glium::Surface`, targeting the default framebuffer. /// Implementation of `glium::Surface`, targeting the default framebuffer.
/// ///
/// The back- and front-buffers are swapped when you call `finish`. /// The back- and front-buffers are swapped when you call `finish`.
/// ///