diff options
| author | Ikalco <73481042+ikalco@users.noreply.github.com> | 2025-04-07 14:03:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-07 21:03:27 +0200 |
| commit | da86db43d47141b9d7332d3cb756ff7c05dbb39a (patch) | |
| tree | 7b187bc96aedceda108b51eff034ba75e33fb510 /src/protocols/ToplevelExport.cpp | |
| parent | 70ae99f52162a0ed2723d45c63adfb2e61f4e2f5 (diff) | |
core: refactor and improve surface commit (#9805)
* make CHLBufferReference not a SP anymore
* copy over release and acquire points in CHLBufferReference
* use CHLBufferReference in screencopy and toplevel export
TODO: use CHLBufferReference in direct scanout properly
the only problem is the scanout buffer release timing,
specifically the onBackendRelease mechanism
* cleanup SSurfaceState and surface pending commit tracking
* move surface code from DRMSyncobj, and move acquire to SSurfaceState
* use queue for comitted pending surface states like proto says
"The content update is placed in a queue until it becomes active." - wl_surface::commit
* drop, not release, prev buffer if 2nd buffer wl_surface.attach is sent
"A wl_buffer that has been attached and then replaced by another attach instead of committed will not receive a release event, and is not used by the compositor." - wl_surface::attach
Diffstat (limited to 'src/protocols/ToplevelExport.cpp')
| -rw-r--r-- | src/protocols/ToplevelExport.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp index fb0bd9c7..66e74164 100644 --- a/src/protocols/ToplevelExport.cpp +++ b/src/protocols/ToplevelExport.cpp @@ -73,11 +73,6 @@ bool CToplevelExportClient::good() { return resource->resource(); } -CToplevelExportFrame::~CToplevelExportFrame() { - if (buffer && buffer->locked()) - buffer->unlock(); -} - CToplevelExportFrame::CToplevelExportFrame(SP<CHyprlandToplevelExportFrameV1> resource_, int32_t overlayCursor_, PHLWINDOW pWindow_) : resource(resource_), pWindow(pWindow_) { if UNLIKELY (!good()) return; @@ -159,8 +154,6 @@ void CToplevelExportFrame::copy(CHyprlandToplevelExportFrameV1* pFrame, wl_resou return; } - PBUFFER->buffer->lock(); - if UNLIKELY (PBUFFER->buffer->size != box.size()) { resource->error(HYPRLAND_TOPLEVEL_EXPORT_FRAME_V1_ERROR_INVALID_BUFFER, "invalid buffer dimensions"); PROTO::toplevelExport->destroyResource(this); @@ -197,7 +190,7 @@ void CToplevelExportFrame::copy(CHyprlandToplevelExportFrameV1* pFrame, wl_resou return; } - buffer = PBUFFER->buffer; + buffer = CHLBufferReference(PBUFFER->buffer.lock()); m_ignoreDamage = ignoreDamage; @@ -340,7 +333,7 @@ bool CToplevelExportFrame::copyDmabuf(timespec* now) { g_pPointerManager->damageCursor(PMONITOR->self.lock()); } - if (!g_pHyprRenderer->beginRender(PMONITOR, fakeDamage, RENDER_MODE_TO_BUFFER, buffer.lock())) + if (!g_pHyprRenderer->beginRender(PMONITOR, fakeDamage, RENDER_MODE_TO_BUFFER, buffer.buffer)) return false; g_pHyprOpenGL->clear(CHyprColor(0, 0, 0, 1.0)); |
