rustdesk/qemu-display
1
0
Fork 0
mirror of https://github.com/rustdesk/qemu-display.git synced 2026-06-22 16:51:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle 2D scanouts

Browse Source
This commit is contained in:
Marc-André Lureau
2021-02-28 23:34:52 +04:00
parent eeea1ce3d7
commit e0320ca4ab
6 changed files with 186 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qemu-gtk4/src/console.rs
+14 -6
View File
@@ -169,7 +169,19 @@ impl QemuConsole {
clone!(@weak self as con => move |t| {
let priv_ = imp::QemuConsole::from_instance(&con);
match t {
Event::Update { .. } => {
Event::Scanout(s) => {
priv_.area.set_scanout(s);
priv_.area.queue_render();
}
Event::Update(u) => {
priv_.area.update(u);
priv_.area.queue_render();
}
Event::ScanoutDMABUF(s) => {
priv_.label.set_label(&format!("{:?}", s));
priv_.area.set_scanout_dmabuf(s);
}
Event::UpdateDMABUF { .. } => {
priv_.wait_rendering.set(priv_.wait_rendering.get() + 1);
// we don't simply queue_render, as we want a copy immediately
priv_.area.make_current();
@@ -181,10 +193,6 @@ impl QemuConsole {
};
priv_.area.queue_draw();
}
Event::Scanout(s) => {
priv_.label.set_label(&format!("{:?}", s));
priv_.area.set_scanout(s);
}
Event::Disconnected => {
priv_.label.set_label("Console disconnected!");
}
@@ -194,7 +202,7 @@ impl QemuConsole {
let cur = gdk::Cursor::from_texture(&tex, hot_x, hot_y, None);
priv_.area.set_cursor(Some(&cur));
}
_ => ()
t => { dbg!(t); }
}
Continue(true)
}),
qemu-gtk4/src/console_area.rs
+66 -2
View File
@@ -10,7 +10,7 @@ use std::ffi::{CStr, CString};
use crate::egl;
use crate::error::*;
use gl::{self, types::*};
use qemu_display_listener::Scanout;
use qemu_display_listener::{Scanout, ScanoutDMABUF, Update};
mod imp {
use super::*;
@@ -22,7 +22,7 @@ mod imp {
pub texture_blit_vao: Cell<GLuint>,
pub texture_blit_prog: Cell<GLuint>,
pub texture_blit_flip_prog: Cell<GLuint>,
pub scanout: Cell<Option<Scanout>>,
pub scanout: Cell<Option<ScanoutDMABUF>>,
pub scanout_size: Cell<(u32, u32)>,
}
@@ -229,6 +229,58 @@ mod imp {
pub fn set_scanout(&self, widget: &super::QemuConsoleArea, s: Scanout) {
widget.make_current();
if s.format != 0x20020888 {
todo!();
}
unsafe {
gl::BindTexture(gl::TEXTURE_2D, self.tex_id());
gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::NEAREST as _);
gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::LINEAR as _);
gl::PixelStorei(gl::UNPACK_ROW_LENGTH, s.stride as i32 / 4);
gl::TexImage2D(
gl::TEXTURE_2D,
0,
gl::RGB as _,
s.width as _,
s.height as _,
0,
gl::BGRA,
gl::UNSIGNED_BYTE,
s.data.as_ptr() as _,
);
}
self.scanout_size.set((s.width, s.height));
}
pub fn update(&self, widget: &super::QemuConsoleArea, u: Update) {
widget.make_current();
if u.format != 0x20020888 {
todo!();
}
unsafe {
gl::BindTexture(gl::TEXTURE_2D, self.tex_id());
gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::NEAREST as _);
gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::LINEAR as _);
gl::PixelStorei(gl::UNPACK_ROW_LENGTH, u.stride as i32 / 4);
gl::TexSubImage2D(
gl::TEXTURE_2D,
0,
u.x,
u.y,
u.w,
u.h,
gl::BGRA,
gl::UNSIGNED_BYTE,
u.data.as_ptr() as _,
);
}
}
pub fn set_scanout_dmabuf(&self, widget: &super::QemuConsoleArea, s: ScanoutDMABUF) {
widget.make_current();
let egl = egl::egl();
let egl_dpy = if let Ok(dpy) = widget.get_display().downcast::<gdk_wl::WaylandDisplay>()
@@ -315,6 +367,18 @@ impl QemuConsoleArea {
priv_.set_scanout(self, s);
}
pub fn update(&self, u: Update) {
let priv_ = imp::QemuConsoleArea::from_instance(self);
priv_.update(self, u);
}
pub fn set_scanout_dmabuf(&self, s: ScanoutDMABUF) {
let priv_ = imp::QemuConsoleArea::from_instance(self);
priv_.set_scanout_dmabuf(self, s);
}
pub fn save_to_png(&self, filename: &str) {
let priv_ = imp::QemuConsoleArea::from_instance(self);