mirrors/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-10-17 07:26:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

render, helpers: Call OpenGL destroyMonitorResources on disconnect (#10111)

Browse Source 
* render, helpers: Call OpenGL destroyMonitorResources on disconnect

* helpers: Add opengl null check
This commit is contained in:
Lee Bousfield
2025-04-18 10:37:51 -05:00
committed by GitHub
parent ddae3036ca
commit 7631d4c73f
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/helpers/Monitor.cpp
View File

@@ -51,6 +51,8 @@ CMonitor::CMonitor(SP<Aquamarine::IOutput> output_) : state(this), output(output
CMonitor::~CMonitor() { CMonitor::~CMonitor() {
events.destroy.emit(); events.destroy.emit();
if (g_pHyprOpenGL)
g_pHyprOpenGL->destroyMonitorResources(self);
} }
void CMonitor::onConnect(bool noRule) { void CMonitor::onConnect(bool noRule) {
@@ -295,6 +297,8 @@ void CMonitor::onDisconnect(bool destroy) {
Debug::log(LOG, "onDisconnect called for {}", output->name); Debug::log(LOG, "onDisconnect called for {}", output->name);
events.disconnect.emit(); events.disconnect.emit();
if (g_pHyprOpenGL)
g_pHyprOpenGL->destroyMonitorResources(self);
// record what workspace this monitor was on // record what workspace this monitor was on
if (activeWorkspace) { if (activeWorkspace) {
@@ -832,7 +836,7 @@ bool CMonitor::applyMonitorRule(SMonitorRule* pMonitorRule, bool force) {
updateMatrix(); updateMatrix();
if (WAS10B != enabled10bit || OLDRES != vecPixelSize) if (WAS10B != enabled10bit || OLDRES != vecPixelSize)
g_pHyprOpenGL->destroyMonitorResources(self.lock()); g_pHyprOpenGL->destroyMonitorResources(self);
g_pCompositor->arrangeMonitors(); g_pCompositor->arrangeMonitors();

5
src/render/OpenGL.cpp
View File

@@ -2997,7 +2997,7 @@ void CHyprOpenGLImpl::clearWithTex() {
} }
} }
void CHyprOpenGLImpl::destroyMonitorResources(PHLMONITOR pMonitor) { void CHyprOpenGLImpl::destroyMonitorResources(PHLMONITORREF pMonitor) {
g_pHyprRenderer->makeEGLCurrent(); g_pHyprRenderer->makeEGLCurrent();
if (!g_pHyprOpenGL) if (!g_pHyprOpenGL)
@@ -3021,7 +3021,8 @@ void CHyprOpenGLImpl::destroyMonitorResources(PHLMONITOR pMonitor) {
g_pHyprOpenGL->m_mMonitorBGFBs.erase(TEXIT); g_pHyprOpenGL->m_mMonitorBGFBs.erase(TEXIT);
} }
Debug::log(LOG, "Monitor {} -> destroyed all render data", pMonitor->szName); if (pMonitor)
Debug::log(LOG, "Monitor {} -> destroyed all render data", pMonitor->szName);
} }
void CHyprOpenGLImpl::saveMatrix() { void CHyprOpenGLImpl::saveMatrix() {

2
src/render/OpenGL.hpp
View File

@@ -207,7 +207,7 @@ class CHyprOpenGLImpl {
void scissor(const pixman_box32*, bool transform = true); void scissor(const pixman_box32*, bool transform = true);
void scissor(const int x, const int y, const int w, const int h, bool transform = true); void scissor(const int x, const int y, const int w, const int h, bool transform = true);
void destroyMonitorResources(PHLMONITOR); void destroyMonitorResources(PHLMONITORREF);
void markBlurDirtyForMonitor(PHLMONITOR); void markBlurDirtyForMonitor(PHLMONITOR);