From 997fefbc1113323ed2bf5d782bdafc0d17532647 Mon Sep 17 00:00:00 2001 From: davc0n Date: Mon, 5 May 2025 23:44:49 +0200 Subject: render: refactor class member vars (#10292) * render: refactor class member vars * render: fix clang format --- src/protocols/Screencopy.cpp | 22 ++++++++++------------ src/protocols/SinglePixel.cpp | 2 +- src/protocols/ToplevelExport.cpp | 16 +++++++--------- src/protocols/core/Compositor.cpp | 2 +- src/protocols/core/DataDevice.cpp | 2 +- src/protocols/types/DMABuffer.cpp | 2 +- src/protocols/types/SurfaceState.cpp | 2 +- 7 files changed, 22 insertions(+), 26 deletions(-) (limited to 'src/protocols') diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp index 2c84fe93..e0ef6783 100644 --- a/src/protocols/Screencopy.cpp +++ b/src/protocols/Screencopy.cpp @@ -146,7 +146,7 @@ void CScreencopyFrame::copy(CZwlrScreencopyFrameV1* pFrame, wl_resource* buffer_ PROTO::screencopy->m_framesAwaitingWrite.emplace_back(m_self); - g_pHyprRenderer->m_bDirectScanoutBlocked = true; + g_pHyprRenderer->m_directScanoutBlocked = true; if (!m_withDamage) g_pHyprRenderer->damageMonitor(m_monitor.lock()); @@ -215,12 +215,11 @@ void CScreencopyFrame::copyDmabuf(std::function callback) { g_pHyprOpenGL->clear(Colors::BLACK); else { g_pHyprOpenGL->clear(Colors::BLACK); - CBox texbox = - CBox{m_monitor->m_transformedSize / 2.F, g_pHyprOpenGL->m_pScreencopyDeniedTexture->m_vSize}.translate(-g_pHyprOpenGL->m_pScreencopyDeniedTexture->m_vSize / 2.F); - g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_pScreencopyDeniedTexture, texbox, 1); + CBox texbox = CBox{m_monitor->m_transformedSize / 2.F, g_pHyprOpenGL->m_screencopyDeniedTexture->m_size}.translate(-g_pHyprOpenGL->m_screencopyDeniedTexture->m_size / 2.F); + g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, 1); } - g_pHyprOpenGL->m_RenderData.blockScreenShader = true; + g_pHyprOpenGL->m_renderData.blockScreenShader = true; g_pHyprRenderer->endRender([callback]() { LOGM(TRACE, "Copied frame via dma"); @@ -261,9 +260,8 @@ bool CScreencopyFrame::copyShm() { g_pHyprOpenGL->clear(Colors::BLACK); else { g_pHyprOpenGL->clear(Colors::BLACK); - CBox texbox = - CBox{m_monitor->m_transformedSize / 2.F, g_pHyprOpenGL->m_pScreencopyDeniedTexture->m_vSize}.translate(-g_pHyprOpenGL->m_pScreencopyDeniedTexture->m_vSize / 2.F); - g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_pScreencopyDeniedTexture, texbox, 1); + CBox texbox = CBox{m_monitor->m_transformedSize / 2.F, g_pHyprOpenGL->m_screencopyDeniedTexture->m_size}.translate(-g_pHyprOpenGL->m_screencopyDeniedTexture->m_size / 2.F); + g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, 1); } #ifndef GLES2 @@ -281,11 +279,11 @@ bool CScreencopyFrame::copyShm() { auto glFormat = PFORMAT->flipRB ? GL_BGRA_EXT : GL_RGBA; - g_pHyprOpenGL->m_RenderData.blockScreenShader = true; + g_pHyprOpenGL->m_renderData.blockScreenShader = true; g_pHyprRenderer->endRender(); g_pHyprRenderer->makeEGLCurrent(); - g_pHyprOpenGL->m_RenderData.pMonitor = m_monitor; + g_pHyprOpenGL->m_renderData.pMonitor = m_monitor; fb.bind(); glPixelStorei(GL_PACK_ALIGNMENT, 1); @@ -304,7 +302,7 @@ bool CScreencopyFrame::copyShm() { } } - g_pHyprOpenGL->m_RenderData.pMonitor.reset(); + g_pHyprOpenGL->m_renderData.pMonitor.reset(); #ifndef GLES2 glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); @@ -414,7 +412,7 @@ void CScreencopyProtocol::destroyResource(CScreencopyFrame* frame) { void CScreencopyProtocol::onOutputCommit(PHLMONITOR pMonitor) { if (m_framesAwaitingWrite.empty()) { - g_pHyprRenderer->m_bDirectScanoutBlocked = false; + g_pHyprRenderer->m_directScanoutBlocked = false; return; // nothing to share } diff --git a/src/protocols/SinglePixel.cpp b/src/protocols/SinglePixel.cpp index 7baddfd9..d069da0d 100644 --- a/src/protocols/SinglePixel.cpp +++ b/src/protocols/SinglePixel.cpp @@ -16,7 +16,7 @@ CSinglePixelBuffer::CSinglePixelBuffer(uint32_t id, wl_client* client, CHyprColo m_resource = CWLBufferResource::create(makeShared(client, 1, id)); - m_success = m_texture->m_iTexID; + m_success = m_texture->m_texID; size = {1, 1}; diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp index 04781a9b..498bcba9 100644 --- a/src/protocols/ToplevelExport.cpp +++ b/src/protocols/ToplevelExport.cpp @@ -264,9 +264,8 @@ bool CToplevelExportFrame::copyShm(const Time::steady_tp& now) { if (overlayCursor) g_pPointerManager->renderSoftwareCursorsFor(PMONITOR->m_self.lock(), now, fakeDamage, g_pInputManager->getMouseCoordsInternal() - m_window->m_realPosition->value()); } else if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - CBox texbox = - CBox{PMONITOR->m_transformedSize / 2.F, g_pHyprOpenGL->m_pScreencopyDeniedTexture->m_vSize}.translate(-g_pHyprOpenGL->m_pScreencopyDeniedTexture->m_vSize / 2.F); - g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_pScreencopyDeniedTexture, texbox, 1); + CBox texbox = CBox{PMONITOR->m_transformedSize / 2.F, g_pHyprOpenGL->m_screencopyDeniedTexture->m_size}.translate(-g_pHyprOpenGL->m_screencopyDeniedTexture->m_size / 2.F); + g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, 1); } const auto PFORMAT = NFormatUtils::getPixelFormatFromDRM(shm.format); @@ -275,11 +274,11 @@ bool CToplevelExportFrame::copyShm(const Time::steady_tp& now) { return false; } - g_pHyprOpenGL->m_RenderData.blockScreenShader = true; + g_pHyprOpenGL->m_renderData.blockScreenShader = true; g_pHyprRenderer->endRender(); g_pHyprRenderer->makeEGLCurrent(); - g_pHyprOpenGL->m_RenderData.pMonitor = PMONITOR; + g_pHyprOpenGL->m_renderData.pMonitor = PMONITOR; outFB.bind(); #ifndef GLES2 @@ -352,12 +351,11 @@ bool CToplevelExportFrame::copyDmabuf(const Time::steady_tp& now) { if (overlayCursor) g_pPointerManager->renderSoftwareCursorsFor(PMONITOR->m_self.lock(), now, fakeDamage, g_pInputManager->getMouseCoordsInternal() - m_window->m_realPosition->value()); } else if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - CBox texbox = - CBox{PMONITOR->m_transformedSize / 2.F, g_pHyprOpenGL->m_pScreencopyDeniedTexture->m_vSize}.translate(-g_pHyprOpenGL->m_pScreencopyDeniedTexture->m_vSize / 2.F); - g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_pScreencopyDeniedTexture, texbox, 1); + CBox texbox = CBox{PMONITOR->m_transformedSize / 2.F, g_pHyprOpenGL->m_screencopyDeniedTexture->m_size}.translate(-g_pHyprOpenGL->m_screencopyDeniedTexture->m_size / 2.F); + g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, 1); } - g_pHyprOpenGL->m_RenderData.blockScreenShader = true; + g_pHyprOpenGL->m_renderData.blockScreenShader = true; g_pHyprRenderer->endRender(); if (overlayCursor) { diff --git a/src/protocols/core/Compositor.cpp b/src/protocols/core/Compositor.cpp index e6390dbf..07bad77b 100644 --- a/src/protocols/core/Compositor.cpp +++ b/src/protocols/core/Compositor.cpp @@ -495,7 +495,7 @@ void CWLSurfaceResource::commitState(SSurfaceState& state) { } if (m_current.texture) - m_current.texture->m_eTransform = wlTransformToHyprutils(m_current.transform); + m_current.texture->m_transform = wlTransformToHyprutils(m_current.transform); if (m_role->role() == SURFACE_ROLE_SUBSURFACE) { auto subsurface = ((CSubsurfaceRole*)m_role.get())->m_subsurface.lock(); diff --git a/src/protocols/core/DataDevice.cpp b/src/protocols/core/DataDevice.cpp index 63523cd9..67c16e43 100644 --- a/src/protocols/core/DataDevice.cpp +++ b/src/protocols/core/DataDevice.cpp @@ -814,7 +814,7 @@ void CWLDataDeviceProtocol::renderDND(PHLMONITOR pMonitor, const Time::steady_tp CTexPassElement::SRenderData data; data.tex = m_dnd.dndSurface->m_current.texture; data.box = box; - g_pHyprRenderer->m_sRenderPass.add(makeShared(data)); + g_pHyprRenderer->m_renderPass.add(makeShared(data)); CBox damageBox = CBox{surfacePos, m_dnd.dndSurface->m_current.size}.expand(5); g_pHyprRenderer->damageBox(damageBox); diff --git a/src/protocols/types/DMABuffer.cpp b/src/protocols/types/DMABuffer.cpp index d8e41959..326c0736 100644 --- a/src/protocols/types/DMABuffer.cpp +++ b/src/protocols/types/DMABuffer.cpp @@ -37,7 +37,7 @@ CDMABuffer::CDMABuffer(uint32_t id, wl_client* client, Aquamarine::SDMABUFAttrs m_texture = makeShared(m_attrs, eglImage); // texture takes ownership of the eglImage m_opaque = NFormatUtils::isFormatOpaque(m_attrs.format); - m_success = m_texture->m_iTexID; + m_success = m_texture->m_texID; if UNLIKELY (!m_success) Debug::log(ERR, "Failed to create a dmabuf: texture is null"); diff --git a/src/protocols/types/SurfaceState.cpp b/src/protocols/types/SurfaceState.cpp index 7d1f5702..be1160fb 100644 --- a/src/protocols/types/SurfaceState.cpp +++ b/src/protocols/types/SurfaceState.cpp @@ -39,7 +39,7 @@ void SSurfaceState::updateSynchronousTexture(SP lastTexture) { if (dataPtr) { auto drmFmt = NFormatUtils::shmToDRM(fmt); auto stride = bufferSize.y ? size / bufferSize.y : 0; - if (lastTexture && lastTexture->m_isSynchronous && lastTexture->m_vSize == bufferSize) { + if (lastTexture && lastTexture->m_isSynchronous && lastTexture->m_size == bufferSize) { texture = lastTexture; texture->update(drmFmt, dataPtr, stride, accumulateBufferDamage()); } else -- cgit v1.2.3