kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

drm: preserve GbmBos while they are in use

Browse source
This commit is contained in:
Julian Orth 2024-05-08 23:10:22 +02:00
parent 760658522c
commit 110f45fef7
5 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/backends/metal/video.rs
View file

@ -35,7 +35,7 @@ use {
DrmPropertyType, DrmVersion, PropBlob, DRM_CLIENT_CAP_ATOMIC,
DRM_MODE_ATOMIC_ALLOW_MODESET, DRM_MODE_ATOMIC_NONBLOCK, DRM_MODE_PAGE_FLIP_EVENT,
},
gbm::{GbmDevice, GBM_BO_USE_LINEAR, GBM_BO_USE_RENDERING, GBM_BO_USE_SCANOUT},
gbm::{GbmBo, GbmDevice, GBM_BO_USE_LINEAR, GBM_BO_USE_RENDERING, GBM_BO_USE_SCANOUT},
Modifier, INVALID_MODIFIER,
},
},
@ -2593,12 +2593,12 @@ impl MetalBackend {
Err(e) => return Err(MetalError::ImportFb(e)),
};
dev_fb.clear().map_err(MetalError::Clear)?;
let (dev_tex, render_tex, render_fb) = if dev.id == render_ctx.dev_id {
let (dev_tex, render_tex, render_fb, render_bo) = if dev.id == render_ctx.dev_id {
let render_tex = match dev_img.to_texture() {
Ok(fb) => fb,
Err(e) => return Err(MetalError::ImportTexture(e)),
};
(None, render_tex, None)
(None, render_tex, None, None)
} else {
// Create a _bridge_ BO in the render device
let render_gfx_formats = render_ctx.gfx.formats();
@ -2657,10 +2657,12 @@ impl MetalBackend {
Err(e) => return Err(MetalError::ImportTexture(e)),
};
(Some(dev_tex), render_tex, Some(render_fb))
(Some(dev_tex), render_tex, Some(render_fb), Some(render_bo))
};
Ok(RenderBuffer {
drm: drm_fb,
_dev_bo: dev_bo,
_render_bo: render_bo,
dev_fb,
dev_tex,
render_tex,
@ -2849,6 +2851,8 @@ impl MetalBackend {
#[derive(Debug)]
pub struct RenderBuffer {
drm: Rc<DrmFramebuffer>,
_dev_bo: GbmBo,
_render_bo: Option<GbmBo>,
// ctx = dev
// buffer location = dev
dev_fb: Rc<dyn GfxFramebuffer>,

4
src/backends/x.rs
View file

@ -19,7 +19,7 @@ use {
},
video::{
drm::{ConnectorType, Drm, DrmError, DrmVersion},
gbm::{GbmDevice, GbmError, GBM_BO_USE_RENDERING},
gbm::{GbmBo, GbmDevice, GbmError, GBM_BO_USE_RENDERING},
},
wire_xcon::{
ChangeProperty, ChangeWindowAttributes, ConfigureNotify, CreateCursor, CreatePixmap,
@ -437,6 +437,7 @@ impl XBackend {
};
*image = Some(XImage {
pixmap: Cell::new(pixmap),
_bo: bo,
fb: CloneCell::new(fb),
tex: CloneCell::new(tex),
idle: Cell::new(true),
@ -1023,6 +1024,7 @@ struct XOutput {
struct XImage {
pixmap: Cell<u32>,
_bo: GbmBo,
fb: CloneCell<Rc<dyn GfxFramebuffer>>,
tex: CloneCell<Rc<dyn GfxTexture>>,
idle: Cell<bool>,