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

render: hide graphics API behind traits

Browse source
This commit is contained in:
Julian Orth 2023-10-22 20:00:32 +02:00
parent d650b3375d
commit 24e410a5b5
40 changed files with 601 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ifs/jay_screencast.rs
View file

@ -2,7 +2,7 @@ use {
crate::{
client::{Client, ClientError},
format::XRGB8888,
gfx_apis::gl::{Framebuffer, RenderContext, RenderError, Texture},
gfx_api::{GfxContext, GfxError, GfxFramebuffer, GfxTexture},
ifs::jay_output::JayOutput,
leaks::Tracker,
object::Object,
@ -60,7 +60,7 @@ struct Pending {
struct ScreencastBuffer {
dmabuf: DmaBuf,
fb: Rc<Framebuffer>,
fb: Rc<dyn GfxFramebuffer>,
free: bool,
}
@ -147,7 +147,7 @@ impl JayScreencast {
});
}
pub fn copy_texture(&self, on: &OutputNode, texture: &Rc<Texture>) {
pub fn copy_texture(&self, on: &OutputNode, texture: &Rc<dyn GfxTexture>) {
if !self.running.get() {
return;
}
@ -193,7 +193,7 @@ impl JayScreencast {
self.client.event(Destroyed { self_id: self.id });
}
pub fn realloc(&self, ctx: &Rc<RenderContext>) -> Result<(), JayScreencastError> {
pub fn realloc(&self, ctx: &Rc<dyn GfxContext>) -> Result<(), JayScreencastError> {
let mut buffers = vec![];
if let Some(output) = self.output.get() {
let mode = output.global.mode.get();
@ -207,8 +207,10 @@ impl JayScreencast {
if self.linear.get() {
flags |= GBM_BO_USE_LINEAR;
}
let buffer = ctx.gbm.create_bo(mode.width, mode.height, &format, flags)?;
let fb = ctx.dmabuf_img(buffer.dmabuf())?.to_framebuffer()?;
let buffer = ctx
.gbm()
.create_bo(mode.width, mode.height, &format, flags)?;
let fb = ctx.clone().dmabuf_img(buffer.dmabuf())?.to_framebuffer()?;
buffers.push(ScreencastBuffer {
dmabuf: buffer.dmabuf().clone(),
fb,
@ -444,7 +446,7 @@ pub enum JayScreencastError {
#[error(transparent)]
GbmError(#[from] GbmError),
#[error(transparent)]
RenderError(#[from] RenderError),
GfxError(#[from] GfxError),
}
efrom!(JayScreencastError, MsgParserError);
efrom!(JayScreencastError, ClientError);