mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-20 06:46:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

osd-thumbnail: fix failed to get client texture

Browse source 
Use wlr_client_buffer->texture directly instead of wlr_texture_from_buffer.
All buffers in content_tree are wlr_client_buffer.

wlr_texture_from_buffer calls client_buffer_begin_data_ptr_access which
fails when client_buffer->source == NULL (client released buffer early,
e.g. wl_shm foot-terminal).
This commit is contained in:
yuiiio 2026-04-14 12:02:20 +09:00 • committed by Hiroaki Yamamoto
parent da37e97a45
commit 4c7a9960a4
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cycle/osd-thumbnail.c
View file

@ -2,6 +2,7 @@
#include <assert.h> #include <assert.h>
#include <wlr/render/allocator.h> #include <wlr/render/allocator.h>
#include <wlr/render/swapchain.h> #include <wlr/render/swapchain.h>
#include <wlr/types/wlr_buffer.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_scene.h> #include <wlr/types/wlr_scene.h>
#include "config/rcxml.h" #include "config/rcxml.h"
@ -46,8 +47,12 @@ render_node(struct wlr_render_pass *pass,
if (!scene_buffer->buffer) { if (!scene_buffer->buffer) {
break; break;
} }
struct wlr_texture *texture = wlr_texture_from_buffer( struct wlr_texture *texture = NULL;
server.renderer, scene_buffer->buffer); struct wlr_client_buffer *client_buffer =
wlr_client_buffer_get(scene_buffer->buffer);
if (client_buffer) {
texture = client_buffer->texture;
}
if (!texture) { if (!texture) {
break; break;
} }
@ -62,7 +67,6 @@ render_node(struct wlr_render_pass *pass,
}, },
.transform = scene_buffer->transform, .transform = scene_buffer->transform,
}); });
wlr_texture_destroy(texture);
break; break;
} }
case WLR_SCENE_NODE_RECT: case WLR_SCENE_NODE_RECT: