hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix crashas

This commit is contained in:
Vaxry 2024-07-20 12:39:18 +02:00
parent 70e4670185
commit 8aff97135b
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/protocols/core/Compositor.cpp
View File

@ -445,7 +445,10 @@ void CWLSurfaceResource::commitPendingState() {
if (previousBuffer && !previousBuffer->isSynchronous() && !bufferReleased) { if (previousBuffer && !previousBuffer->isSynchronous() && !bufferReleased) {
if (previousBuffer->lockedByBackend) { if (previousBuffer->lockedByBackend) {
previousBuffer->hlEvents.backendRelease = previousBuffer->events.backendRelease.registerListener([this, previousBuffer](std::any data) { previousBuffer->hlEvents.backendRelease = previousBuffer->events.backendRelease.registerListener([this, previousBuffer](std::any data) {
if (!self.expired()) // could be dead in the dtor
previousBuffer->sendReleaseWithSurface(self.lock()); previousBuffer->sendReleaseWithSurface(self.lock());
else
previousBuffer->sendRelease();
previousBuffer->hlEvents.backendRelease.reset(); previousBuffer->hlEvents.backendRelease.reset();
bufferReleased = true; bufferReleased = true;
}); });

2
src/protocols/types/WLBuffer.cpp
View File

@ -35,7 +35,7 @@ void CWLBufferResource::sendRelease() {
void CWLBufferResource::sendReleaseWithSurface(SP<CWLSurfaceResource> surf) { void CWLBufferResource::sendReleaseWithSurface(SP<CWLSurfaceResource> surf) {
sendRelease(); sendRelease();
if (!surf->syncobj) if (!surf || !surf->syncobj)
return; return;
if (drmSyncobjTimelineSignal(g_pCompositor->m_iDRMFD, &surf->syncobj->releaseTimeline->timeline->handle, &surf->syncobj->releasePoint, 1)) if (drmSyncobjTimelineSignal(g_pCompositor->m_iDRMFD, &surf->syncobj->releaseTimeline->timeline->handle, &surf->syncobj->releasePoint, 1))

5
src/render/Renderer.cpp
View File

@ -2622,6 +2622,11 @@ bool CHyprRenderer::beginRender(CMonitor* pMonitor, CRegion& damage, eRenderMode
return false; return false;
} }
if (!m_pCurrentRenderbuffer) {
Debug::log(ERR, "failed to start a render pass for output {}, no RBO could be obtained", pMonitor->szName);
return false;
}
if (mode == RENDER_MODE_NORMAL) { if (mode == RENDER_MODE_NORMAL) {
damage = pMonitor->damage.getBufferDamage(HL_BUFFER_AGE); damage = pMonitor->damage.getBufferDamage(HL_BUFFER_AGE);
pMonitor->damage.rotate(); pMonitor->damage.rotate();