kms/surface: Cleanup unused software-rendering code

This commit is contained in:
Victoria Brekenfeld 2025-09-05 19:23:28 +02:00 committed by Victoria Brekenfeld
parent 3935de018e
commit a0f8c4ed99

View file

@ -214,7 +214,7 @@ pub enum ThreadCommand {
NodeAdded { NodeAdded {
node: DrmNode, node: DrmNode,
gbm: GbmAllocator<DrmDeviceFd>, gbm: GbmAllocator<DrmDeviceFd>,
egl: EGLContext, // TODO: Option for software rendering egl: EGLContext,
sync: SyncSender<()>, sync: SyncSender<()>,
}, },
NodeRemoved { NodeRemoved {
@ -500,12 +500,6 @@ fn surface_thread(
let api = GpuManager::new(GbmGlowBackend::<DrmDeviceFd>::default()) let api = GpuManager::new(GbmGlowBackend::<DrmDeviceFd>::default())
.context("Failed to initialize rendering api")?; .context("Failed to initialize rendering api")?;
/*
let software_api = GpuManager::new(GbmPixmanBackend::<DrmDeviceFd>::with_allocator_flags(
gbm_flags,
))
.context("Failed to initialize software rendering");
*/
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
let egui = { let egui = {
@ -725,17 +719,11 @@ impl SurfaceThreadState {
gbm: GbmAllocator<DrmDeviceFd>, gbm: GbmAllocator<DrmDeviceFd>,
egl: EGLContext, egl: EGLContext,
) -> Result<()> { ) -> Result<()> {
//if let Some(egl) = egl {
let mut renderer = let mut renderer =
unsafe { GlowRenderer::new(egl) }.context("Failed to create renderer")?; unsafe { GlowRenderer::new(egl) }.context("Failed to create renderer")?;
init_shaders(renderer.borrow_mut()).context("Failed to initialize shaders")?; init_shaders(renderer.borrow_mut()).context("Failed to initialize shaders")?;
self.api.as_mut().add_node(node, gbm, renderer); self.api.as_mut().add_node(node, gbm, renderer);
/*
} else {
self.software_api.as_mut().add_node(node, gbm);
}
*/
Ok(()) Ok(())
} }
@ -744,7 +732,6 @@ impl SurfaceThreadState {
self.api.as_mut().remove_node(&node); self.api.as_mut().remove_node(&node);
// force enumeration // force enumeration
let _ = self.api.devices(); let _ = self.api.devices();
//self.software_api.as_mut().remove_node(node);
} }
#[profiling::function] #[profiling::function]