hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: move tab to new window, black screen (#8016)

Browse Source 
* fix: move tab to new window, black screen

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* fix: can remove

Signed-off-by: fufesou <shuanglongchen@yeah.net>

---------

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2024-05-11 08:54:17 +08:00 committed by GitHub
parent b6d6a4360f
commit d851bf8b69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/models/desktop_render_texture.dart
View File

@ -40,7 +40,7 @@ class _PixelbufferTexture {
final ptr = await textureRenderer.getTexturePtr(_textureKey); final ptr = await textureRenderer.getTexturePtr(_textureKey);
platformFFI.registerPixelbufferTexture(sessionId, display, ptr); platformFFI.registerPixelbufferTexture(sessionId, display, ptr);
debugPrint( debugPrint(
"create pixelbuffer texture: peerId: ${ffi.id} display:$_display, textureId:$id"); "create pixelbuffer texture: peerId: ${ffi.id} display:$_display, textureId:$id, texturePtr:$ptr");
} }
}); });
} }

40
src/flutter.rs
View File

@ -330,11 +330,26 @@ impl VideoRenderer {
fn register_pixelbuffer_texture(&self, display: usize, ptr: usize) { fn register_pixelbuffer_texture(&self, display: usize, ptr: usize) {
let mut sessions_lock = self.map_display_sessions.write().unwrap(); let mut sessions_lock = self.map_display_sessions.write().unwrap();
if ptr == 0 { if ptr == 0 {
if let Some(info) = sessions_lock.get_mut(&display) {
if info.texture_rgba_ptr != usize::default() {
info.texture_rgba_ptr = usize::default();
}
#[cfg(feature = "vram")]
if info.gpu_output_ptr != usize::default() {
return;
}
}
sessions_lock.remove(&display); sessions_lock.remove(&display);
} else { } else {
if let Some(info) = sessions_lock.get_mut(&display) { if let Some(info) = sessions_lock.get_mut(&display) {
if info.texture_rgba_ptr != 0 && info.texture_rgba_ptr != ptr as TextureRgbaPtr { if info.texture_rgba_ptr != usize::default()
log::error!("unreachable, texture_rgba_ptr is not null and not equal to ptr"); && info.texture_rgba_ptr != ptr as TextureRgbaPtr
{
log::warn!(
"texture_rgba_ptr is not null and not equal to ptr, replace {} to {}",
info.texture_rgba_ptr,
ptr
);
} }
info.texture_rgba_ptr = ptr as _; info.texture_rgba_ptr = ptr as _;
info.notify_render_type = None; info.notify_render_type = None;
@ -359,21 +374,34 @@ impl VideoRenderer {
pub fn register_gpu_output(&self, display: usize, ptr: usize) { pub fn register_gpu_output(&self, display: usize, ptr: usize) {
let mut sessions_lock = self.map_display_sessions.write().unwrap(); let mut sessions_lock = self.map_display_sessions.write().unwrap();
if ptr == 0 { if ptr == 0 {
if let Some(info) = sessions_lock.get_mut(&display) {
if info.gpu_output_ptr != usize::default() {
info.gpu_output_ptr = usize::default();
}
#[cfg(feature = "flutter_texture_render")]
if info.texture_rgba_ptr != usize::default() {
return;
}
}
sessions_lock.remove(&display); sessions_lock.remove(&display);
} else { } else {
if let Some(info) = sessions_lock.get_mut(&display) { if let Some(info) = sessions_lock.get_mut(&display) {
if info.gpu_output_ptr != 0 && info.gpu_output_ptr != ptr { if info.gpu_output_ptr != usize::default() && info.gpu_output_ptr != ptr {
log::error!("unreachable, gpu_output_ptr is not null and not equal to ptr"); log::error!(
"gpu_output_ptr is not null and not equal to ptr, relace {} to {}",
info.gpu_output_ptr,
ptr
);
} }
info.gpu_output_ptr = ptr as _; info.gpu_output_ptr = ptr as _;
info.notify_render_type = None; info.notify_render_type = None;
} else { } else {
if ptr != 0 { if ptr != usize::default() {
sessions_lock.insert( sessions_lock.insert(
display, display,
DisplaySessionInfo { DisplaySessionInfo {
#[cfg(feature = "flutter_texture_render")] #[cfg(feature = "flutter_texture_render")]
texture_rgba_ptr: 0, texture_rgba_ptr: usize::default(),
#[cfg(feature = "flutter_texture_render")] #[cfg(feature = "flutter_texture_render")]
size: (0, 0), size: (0, 0),
gpu_output_ptr: ptr, gpu_output_ptr: ptr,