hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-01-09 15:09:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

groupbar: fix vram leak

Browse source
This commit is contained in:
vaxerski 2023-07-11 20:57:33 +02:00
parent 64e7d5345d
commit 9c9f56743e
2 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/render/decorations/CHyprGroupBarDecoration.cpp
View file

@ -4,7 +4,6 @@
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
// shared things to conserve VRAM // shared things to conserve VRAM
static std::deque<std::unique_ptr<CTitleTex>> m_dpTitleTextures;
static CTexture m_tGradientActive; static CTexture m_tGradientActive;
static CTexture m_tGradientInactive; static CTexture m_tGradientInactive;
@ -135,7 +134,7 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
if (!pTitleTex) if (!pTitleTex)
pTitleTex = pTitleTex =
m_dpTitleTextures m_sTitleTexs.titleTexs
.emplace_back(std::make_unique<CTitleTex>(m_dwGroupMembers[i], Vector2D{BARW * pMonitor->scale, (*PTITLEFONTSIZE + 2 * BAR_TEXT_PAD) * pMonitor->scale})) .emplace_back(std::make_unique<CTitleTex>(m_dwGroupMembers[i], Vector2D{BARW * pMonitor->scale, (*PTITLEFONTSIZE + 2 * BAR_TEXT_PAD) * pMonitor->scale}))
.get(); .get();
@ -159,7 +158,7 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
} }
if (*PRENDERTITLES) if (*PRENDERTITLES)
clearUnusedTextures(); invalidateTextures();
} }
SWindowDecorationExtents CHyprGroupBarDecoration::getWindowDecorationReservedArea() { SWindowDecorationExtents CHyprGroupBarDecoration::getWindowDecorationReservedArea() {
@ -169,7 +168,7 @@ SWindowDecorationExtents CHyprGroupBarDecoration::getWindowDecorationReservedAre
} }
CTitleTex* CHyprGroupBarDecoration::textureFromTitle(const std::string& title) { CTitleTex* CHyprGroupBarDecoration::textureFromTitle(const std::string& title) {
for (auto& tex : m_dpTitleTextures) { for (auto& tex : m_sTitleTexs.titleTexs) {
if (tex->szContent == title) if (tex->szContent == title)
return tex.get(); return tex.get();
} }
@ -177,27 +176,8 @@ CTitleTex* CHyprGroupBarDecoration::textureFromTitle(const std::string& title) {
return nullptr; return nullptr;
} }
void CHyprGroupBarDecoration::clearUnusedTextures() {
for (auto& tex : m_dpTitleTextures | std::views::reverse) {
bool found = false;
for (auto& w : g_pCompositor->m_vWindows) {
if (!w->m_sGroupData.pNextWindow)
continue;
if (tex->szContent == w->m_szTitle && tex->pWindowOwner == w.get()) {
found = true;
break;
}
}
if (!found)
std::erase(m_dpTitleTextures, tex);
}
}
void CHyprGroupBarDecoration::invalidateTextures() { void CHyprGroupBarDecoration::invalidateTextures() {
m_dpTitleTextures.clear(); m_sTitleTexs.titleTexs.clear();
} }
CTitleTex::CTitleTex(CWindow* pWindow, const Vector2D& bufferSize) { CTitleTex::CTitleTex(CWindow* pWindow, const Vector2D& bufferSize) {

7
src/render/decorations/CHyprGroupBarDecoration.hpp
View file

@ -4,6 +4,7 @@
#include <deque> #include <deque>
#include "../Texture.hpp" #include "../Texture.hpp"
#include <string> #include <string>
#include <memory>
class CTitleTex { class CTitleTex {
public: public:
@ -43,8 +44,12 @@ class CHyprGroupBarDecoration : public IHyprWindowDecoration {
std::deque<CWindow*> m_dwGroupMembers; std::deque<CWindow*> m_dwGroupMembers;
CTitleTex* textureFromTitle(const std::string&); CTitleTex* textureFromTitle(const std::string&);
void clearUnusedTextures();
void invalidateTextures(); void invalidateTextures();
void refreshGradients(); void refreshGradients();
struct STitleTexs {
// STitleTexs* overriden = nullptr; // TODO: make shit shared in-group to decrease VRAM usage.
std::deque<std::unique_ptr<CTitleTex>> titleTexs;
} m_sTitleTexs;
}; };