From a907ecd4ff736a3a09410532b405a437eb48033c Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Thu, 31 Jul 2025 16:23:09 +0200 Subject: opengl: improve render fn arg clarity (#11286) --- src/protocols/Screencopy.cpp | 14 +++++++------- src/protocols/ToplevelExport.cpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/protocols') diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp index e98b216d..ddbb371a 100644 --- a/src/protocols/Screencopy.cpp +++ b/src/protocols/Screencopy.cpp @@ -200,7 +200,7 @@ void CScreencopyFrame::renderMon() { .transform(wlTransformToHyprutils(invertTransform(m_monitor->m_transform)), m_monitor->m_pixelSize.x, m_monitor->m_pixelSize.y); g_pHyprOpenGL->pushMonitorTransformEnabled(true); g_pHyprOpenGL->setRenderModifEnabled(false); - g_pHyprOpenGL->renderTexture(TEXTURE, monbox, 1); + g_pHyprOpenGL->renderTexture(TEXTURE, monbox, {}); g_pHyprOpenGL->setRenderModifEnabled(true); g_pHyprOpenGL->popMonitorTransformEnabled(); @@ -229,7 +229,7 @@ void CScreencopyFrame::renderMon() { const auto rounding = dontRound ? 0 : w->rounding() * m_monitor->m_scale; const auto roundingPower = dontRound ? 2.0f : w->roundingPower(); - g_pHyprOpenGL->renderRect(noScreenShareBox, Colors::BLACK, rounding, roundingPower); + g_pHyprOpenGL->renderRect(noScreenShareBox, Colors::BLACK, {.round = rounding, .roundingPower = roundingPower}); if (w->m_isX11 || !w->m_popupHead) continue; @@ -249,7 +249,7 @@ void CScreencopyFrame::renderMon() { const auto surfBox = CBox{popupBaseOffset + popRel + localOff, size}.translate(-m_monitor->m_position).scale(m_monitor->m_scale).translate(-m_box.pos()); if LIKELY (surfBox.w > 0 && surfBox.h > 0) - g_pHyprOpenGL->renderRect(surfBox, Colors::BLACK); + g_pHyprOpenGL->renderRect(surfBox, Colors::BLACK, {}); }, nullptr); }, @@ -292,7 +292,7 @@ void CScreencopyFrame::copyDmabuf(std::function callback) { if (PERM == PERMISSION_RULE_ALLOW_MODE_ALLOW) { if (m_tempFb.isAllocated()) { CBox texbox = {{}, m_box.size()}; - g_pHyprOpenGL->renderTexture(m_tempFb.getTexture(), texbox, 1); + g_pHyprOpenGL->renderTexture(m_tempFb.getTexture(), texbox, {}); m_tempFb.release(); } else renderMon(); @@ -301,7 +301,7 @@ void CScreencopyFrame::copyDmabuf(std::function callback) { else { g_pHyprOpenGL->clear(Colors::BLACK); 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->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, {}); } g_pHyprOpenGL->m_renderData.blockScreenShader = true; @@ -333,7 +333,7 @@ bool CScreencopyFrame::copyShm() { if (PERM == PERMISSION_RULE_ALLOW_MODE_ALLOW) { if (m_tempFb.isAllocated()) { CBox texbox = {{}, m_box.size()}; - g_pHyprOpenGL->renderTexture(m_tempFb.getTexture(), texbox, 1); + g_pHyprOpenGL->renderTexture(m_tempFb.getTexture(), texbox, {}); m_tempFb.release(); } else renderMon(); @@ -342,7 +342,7 @@ bool CScreencopyFrame::copyShm() { else { g_pHyprOpenGL->clear(Colors::BLACK); 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->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, {}); } glBindFramebuffer(GL_READ_FRAMEBUFFER, fb.getFBID()); diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp index 4d0ee0f8..fc46dc14 100644 --- a/src/protocols/ToplevelExport.cpp +++ b/src/protocols/ToplevelExport.cpp @@ -266,7 +266,7 @@ bool CToplevelExportFrame::copyShm(const Time::steady_tp& now) { 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_screencopyDeniedTexture->m_size}.translate(-g_pHyprOpenGL->m_screencopyDeniedTexture->m_size / 2.F); - g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, 1); + g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, {}); } const auto PFORMAT = NFormatUtils::getPixelFormatFromDRM(shm.format); @@ -349,7 +349,7 @@ bool CToplevelExportFrame::copyDmabuf(const Time::steady_tp& now) { 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_screencopyDeniedTexture->m_size}.translate(-g_pHyprOpenGL->m_screencopyDeniedTexture->m_size / 2.F); - g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, 1); + g_pHyprOpenGL->renderTexture(g_pHyprOpenGL->m_screencopyDeniedTexture, texbox, {}); } g_pHyprOpenGL->m_renderData.blockScreenShader = true; -- cgit v1.2.3