diff options
| -rw-r--r-- | src/protocols/Screencopy.cpp | 21 | ||||
| -rw-r--r-- | src/protocols/Screencopy.hpp | 3 | ||||
| -rw-r--r-- | src/render/Renderer.cpp | 1 |
3 files changed, 8 insertions, 17 deletions
diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp index a444f3d0..d8a7ea07 100644 --- a/src/protocols/Screencopy.cpp +++ b/src/protocols/Screencopy.cpp @@ -326,15 +326,11 @@ void CScreencopyProtocolManager::copyFrame(wl_client* client, wl_resource* resou void CScreencopyProtocolManager::onOutputCommit(CMonitor* pMonitor, wlr_output_event_commit* e) { m_pLastMonitorBackBuffer = e->buffer; - shareAllFrames(pMonitor, true); + shareAllFrames(pMonitor); m_pLastMonitorBackBuffer = nullptr; } -void CScreencopyProtocolManager::onRenderEnd(CMonitor* pMonitor) { - shareAllFrames(pMonitor, false); -} - -void CScreencopyProtocolManager::shareAllFrames(CMonitor* pMonitor, bool dmabuf) { +void CScreencopyProtocolManager::shareAllFrames(CMonitor* pMonitor) { if (m_vFramesAwaitingWrite.empty()) return; // nothing to share @@ -347,7 +343,7 @@ void CScreencopyProtocolManager::shareAllFrames(CMonitor* pMonitor, bool dmabuf) continue; } - if (f->pMonitor != pMonitor || dmabuf != (f->bufferCap == WLR_BUFFER_CAP_DMABUF)) + if (f->pMonitor != pMonitor) continue; shareFrame(f); @@ -423,13 +419,10 @@ bool CScreencopyProtocolManager::copyFrameShm(SScreencopyFrame* frame, timespec* return false; // render the client - const auto PMONITOR = frame->pMonitor; - pixman_region32_t fakeDamage; - pixman_region32_init_rect(&fakeDamage, 0, 0, PMONITOR->vecPixelSize.x * 10, PMONITOR->vecPixelSize.y * 10); + const auto PMONITOR = frame->pMonitor; if (!wlr_output_attach_render(PMONITOR->output, nullptr)) { Debug::log(ERR, "[screencopy] Couldn't attach render"); - pixman_region32_fini(&fakeDamage); wlr_buffer_end_data_ptr_access(frame->buffer); return false; } @@ -438,12 +431,11 @@ bool CScreencopyProtocolManager::copyFrameShm(SScreencopyFrame* frame, timespec* if (!PFORMAT) { Debug::log(ERR, "[screencopy] Cannot read pixels, unsupported format %lx", PFORMAT); wlr_output_rollback(PMONITOR->output); - pixman_region32_fini(&fakeDamage); wlr_buffer_end_data_ptr_access(frame->buffer); return false; } - g_pHyprOpenGL->begin(PMONITOR, &fakeDamage, true); + g_pHyprOpenGL->begin(PMONITOR, &PMONITOR->lastFrameDamage, true); // we should still have the last frame by this point in the original fb glBindFramebuffer(GL_FRAMEBUFFER, g_pHyprOpenGL->m_RenderData.pCurrentMonData->primaryFB.m_iFb); @@ -458,7 +450,7 @@ bool CScreencopyProtocolManager::copyFrameShm(SScreencopyFrame* frame, timespec* wlr_output_rollback(PMONITOR->output); - pixman_region32_fini(&fakeDamage); + pixman_region32_fini(&PMONITOR->lastFrameDamage); wlr_buffer_end_data_ptr_access(frame->buffer); @@ -482,6 +474,7 @@ bool CScreencopyProtocolManager::copyFrameDmabuf(SScreencopyFrame* frame) { float color[] = {0, 0, 0, 0}; wlr_renderer_clear(g_pCompositor->m_sWLRRenderer, color); + // TODO: use hl render methods to use damage wlr_render_texture_with_matrix(g_pCompositor->m_sWLRRenderer, sourceTex, glMatrix, 1.0f); wlr_texture_destroy(sourceTex); diff --git a/src/protocols/Screencopy.hpp b/src/protocols/Screencopy.hpp index f0634427..3af75544 100644 --- a/src/protocols/Screencopy.hpp +++ b/src/protocols/Screencopy.hpp @@ -77,7 +77,6 @@ class CScreencopyProtocolManager { void copyFrame(wl_client* client, wl_resource* resource, wl_resource* buffer); - void onRenderEnd(CMonitor* pMonitor); void onOutputCommit(CMonitor* pMonitor, wlr_output_event_commit* e); private: @@ -91,7 +90,7 @@ class CScreencopyProtocolManager { wlr_buffer* m_pLastMonitorBackBuffer = nullptr; - void shareAllFrames(CMonitor* pMonitor, bool dmabuf); + void shareAllFrames(CMonitor* pMonitor); void shareFrame(SScreencopyFrame* frame); void sendFrameDamage(SScreencopyFrame* frame); bool copyFrameDmabuf(SScreencopyFrame* frame); diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 67cf6f41..28acdd60 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -1073,7 +1073,6 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) { return; } - g_pProtocolManager->m_pScreencopyProtocolManager->onRenderEnd(pMonitor); pixman_region32_fini(&damage); if (UNLOCK_SC) |