Skip to content

fix: fail to get texture from client buffer #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zccrs merged 1 commit into from
Dec 25, 2024
Merged

fix: fail to get texture from client buffer #607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/server/qtquick/wsgtextureprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,21 @@ void WSGTextureProvider::setBuffer(qw_buffer *buffer)

W_D(WSGTextureProvider);
d->cleanTexture();
d->ownsTexture = true;
d->buffer = buffer;

if (buffer) {
Q_ASSERT(d->window);
d->texture = qw_texture::from_buffer(*d->window->renderer(), *buffer);
if (auto clientBuffer = qw_client_buffer::get(*buffer)) {
// Acquire texture from client buffer. wlroots already generate texture for us if this is a client buffer.
// By the way, there is something wrong with getting texture from a client buffer using wlr_texture_from_buffer,
// See: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3897
// Possible patch: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4889
d->texture = qw_texture::from(clientBuffer->handle()->texture);
d->ownsTexture = false;
} else {
d->texture = qw_texture::from_buffer(*d->window->renderer(), *buffer);
d->ownsTexture = true;
}
if (Q_UNLIKELY(!d->texture)) {
qCWarning(lcQtQuickTexture) << "Failed to update texture from buffer:" << buffer
<< ", width height:" << buffer->handle()->width
Expand Down
Loading