Skip to content

fix: texture from surface buffer failed #606

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fix: texture from surface buffer failed #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a68646
fix: texture from surface buffer failed
asterwyx Dec 24, 2024
971a803
feat: keep last non-null buffer for content
asterwyx Dec 24, 2024
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
17 changes: 4 additions & 13 deletions src/server/kernel/wsurface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,11 @@ void WSurfacePrivate::updateOutputs()

void WSurfacePrivate::setBuffer(qw_buffer *newBuffer)
{
if (buffer) {
if (auto clientBuffer = qw_client_buffer::get(*buffer)) {
Q_ASSERT(clientBuffer->handle()->n_ignore_locks > 0);
clientBuffer->handle()->n_ignore_locks--;
}
}

if (newBuffer) {
if (auto clientBuffer = qw_client_buffer::get(*newBuffer)) {
clientBuffer->handle()->n_ignore_locks++;
}

newBuffer->lock();
buffer.reset(newBuffer);
auto clientBuffer = qw_client_buffer::get(*newBuffer);
auto sourceBuffer = clientBuffer ? qw_buffer::from(clientBuffer->handle()->source) : newBuffer;
sourceBuffer->lock();
buffer.reset(sourceBuffer);
} else {
buffer.reset(nullptr);
}
Expand Down
5 changes: 5 additions & 0 deletions src/server/qtquick/wsurfaceitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,11 @@ class Q_DECL_HIDDEN WSurfaceItemContentPrivate: public QQuickItemPrivate

Q_ASSERT(!updateTextureConnection);
updateTextureConnection = surface->safeConnect(&WSurface::bufferChanged, q, [q, this] {
// WSurfaceItemContent is for displaying content. When buffer is null, the surface is unmapped.
// There is no need for WSurfaceItemContent to reset its buffer to null. It should keep the last
// non-null buffer until explicitly destroyed. So we directly return when surface's buffer is null.
if (!surface->buffer() && dontCacheLastBuffer)
return;
if (!live) {
pendingBuffer.reset(surface->buffer());
if (pendingBuffer)
Expand Down
Loading