diff options
Diffstat (limited to 'src/managers')
| -rw-r--r-- | src/managers/PointerManager.cpp | 4 | ||||
| -rw-r--r-- | src/managers/screenshare/CursorshareSession.cpp | 10 | ||||
| -rw-r--r-- | src/managers/screenshare/ScreenshareFrame.cpp | 20 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp index 73e4f165..dac66c56 100644 --- a/src/managers/PointerManager.cpp +++ b/src/managers/PointerManager.cpp @@ -581,7 +581,7 @@ SP<Aquamarine::IBuffer> CPointerManager::renderHWCursorBuffer(SP<CPointerManager return buf; } - g_pHyprOpenGL->m_renderData.pMonitor = state->monitor; + g_pHyprRenderer->m_renderData.pMonitor = state->monitor; auto RBO = g_pHyprRenderer->getOrCreateRenderbuffer(buf, state->monitor->m_cursorSwapchain->currentOptions().format); if (!RBO) { @@ -601,7 +601,7 @@ SP<Aquamarine::IBuffer> CPointerManager::renderHWCursorBuffer(SP<CPointerManager g_pHyprOpenGL->renderTexture(texture, xbox, {.noCM = true}); g_pHyprOpenGL->end(); - g_pHyprOpenGL->m_renderData.pMonitor.reset(); + g_pHyprRenderer->m_renderData.pMonitor.reset(); return buf; } diff --git a/src/managers/screenshare/CursorshareSession.cpp b/src/managers/screenshare/CursorshareSession.cpp index 0de5b020..63d4d205 100644 --- a/src/managers/screenshare/CursorshareSession.cpp +++ b/src/managers/screenshare/CursorshareSession.cpp @@ -3,7 +3,7 @@ #include "../../protocols/core/Seat.hpp" #include "../permissions/DynamicPermissionManager.hpp" #include "../../render/Renderer.hpp" -#include "render/OpenGL.hpp" +#include "render/pass/TexPassElement.hpp" using namespace Screenshare; @@ -115,7 +115,7 @@ void CCursorshareSession::render() { const auto& cursorImage = g_pPointerManager->currentCursorImage(); // TODO: implement a monitor independent render mode to buffer that does this in CHyprRenderer::begin() or something like that - g_pHyprOpenGL->m_renderData.transformDamage = false; + g_pHyprRenderer->m_renderData.transformDamage = false; g_pHyprOpenGL->setViewport(0, 0, m_bufferSize.x, m_bufferSize.y); bool overlaps = g_pPointerManager->getCursorBoxGlobal().overlaps(m_pendingFrame.sourceBoxCallback()); @@ -131,7 +131,7 @@ void CCursorshareSession::render() { g_pHyprOpenGL->renderTexture(cursorImage.bufferTex, texbox, {}); } - g_pHyprOpenGL->m_renderData.blockScreenShader = true; + g_pHyprRenderer->m_renderData.blockScreenShader = true; } bool CCursorshareSession::copy() { @@ -182,7 +182,7 @@ bool CCursorshareSession::copy() { g_pHyprRenderer->endRender(); - g_pHyprOpenGL->m_renderData.pMonitor = m_pendingFrame.monitor; + g_pHyprRenderer->m_renderData.pMonitor = m_pendingFrame.monitor; outFB->bind(); glBindFramebuffer(GL_READ_FRAMEBUFFER, GLFB(outFB)->getFBID()); @@ -210,7 +210,7 @@ bool CCursorshareSession::copy() { glReadPixels(0, 0, m_bufferSize.x, m_bufferSize.y, glFormat, PFORMAT->glType, bufData); - g_pHyprOpenGL->m_renderData.pMonitor.reset(); + g_pHyprRenderer->m_renderData.pMonitor.reset(); m_pendingFrame.buffer->endDataPtr(); GLFB(outFB)->unbind(); diff --git a/src/managers/screenshare/ScreenshareFrame.cpp b/src/managers/screenshare/ScreenshareFrame.cpp index accd587c..1887c372 100644 --- a/src/managers/screenshare/ScreenshareFrame.cpp +++ b/src/managers/screenshare/ScreenshareFrame.cpp @@ -162,9 +162,9 @@ void CScreenshareFrame::renderMonitor() { auto TEXTURE = g_pHyprRenderer->createTexture(PMONITOR->m_output->state->state().buffer); - const bool IS_CM_AWARE = PROTO::colorManagement && PROTO::colorManagement->isClientCMAware(m_session->m_client); - g_pHyprOpenGL->m_renderData.transformDamage = false; - g_pHyprOpenGL->m_renderData.noSimplify = true; + const bool IS_CM_AWARE = PROTO::colorManagement && PROTO::colorManagement->isClientCMAware(m_session->m_client); + g_pHyprRenderer->m_renderData.transformDamage = false; + g_pHyprRenderer->m_renderData.noSimplify = true; // render monitor texture CBox monbox = CBox{{}, PMONITOR->m_pixelSize} @@ -278,9 +278,9 @@ void CScreenshareFrame::renderWindow() { const auto NOW = Time::steadyNow(); // TODO: implement a monitor independent render mode to buffer that does this in CHyprRenderer::begin() or something like that - g_pHyprOpenGL->m_renderData.monitorProjection = Mat3x3::identity(); - g_pHyprOpenGL->m_renderData.projection = Mat3x3::outputProjection(m_bufferSize, HYPRUTILS_TRANSFORM_NORMAL); - g_pHyprOpenGL->m_renderData.transformDamage = false; + g_pHyprRenderer->m_renderData.monitorProjection = Mat3x3::identity(); + g_pHyprRenderer->m_renderData.projection = Mat3x3::outputProjection(m_bufferSize, HYPRUTILS_TRANSFORM_NORMAL); + g_pHyprRenderer->m_renderData.transformDamage = false; g_pHyprOpenGL->setViewport(0, 0, m_bufferSize.x, m_bufferSize.y); g_pHyprRenderer->m_bBlockSurfaceFeedback = g_pHyprRenderer->shouldRenderWindow(PWINDOW); // block the feedback to avoid spamming the surface if it's visible @@ -353,7 +353,7 @@ bool CScreenshareFrame::copyDmabuf() { render(); - g_pHyprOpenGL->m_renderData.blockScreenShader = true; + g_pHyprRenderer->m_renderData.blockScreenShader = true; g_pHyprRenderer->endRender([self = m_self]() { if (!self || self.expired() || self->m_copied) @@ -394,11 +394,11 @@ bool CScreenshareFrame::copyShm() { render(); - g_pHyprOpenGL->m_renderData.blockScreenShader = true; + g_pHyprRenderer->m_renderData.blockScreenShader = true; g_pHyprRenderer->endRender(); - g_pHyprOpenGL->m_renderData.pMonitor = PMONITOR; + g_pHyprRenderer->m_renderData.pMonitor = PMONITOR; outFB->bind(); glBindFramebuffer(GL_READ_FRAMEBUFFER, GLFB(outFB)->getFBID()); @@ -446,7 +446,7 @@ bool CScreenshareFrame::copyShm() { glPixelStorei(GL_PACK_ALIGNMENT, 4); glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); - g_pHyprOpenGL->m_renderData.pMonitor.reset(); + g_pHyprRenderer->m_renderData.pMonitor.reset(); if (!m_copied) { LOGM(Log::TRACE, "Copied frame via shm"); |
