cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: add a destructor to CHyprOpenglImpl and avoid wl_container_of undefined behaviour (#7101)

Browse source 
* protocols: avoid undefined behaviour in C macro

to safely use wl_container_of with a class the class has to be no
virtual functions, no inheritance, and uniform access control (e.g all
public)

work around this by putting this into a destroywrapper struct.

* opengl: clean memory on destruction

add a destructor and free the allocated memory and close the fd
This commit is contained in:
Tom Englund 2024-07-29 19:19:47 +02:00 • committed by Vaxry
parent 60b663e276
commit 9c38b0fdbe
6 changed files with 47 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/render/OpenGL.cpp
View file

@ -345,6 +345,22 @@ CHyprOpenGLImpl::CHyprOpenGLImpl() {
m_tGlobalTimer.reset();
}
CHyprOpenGLImpl::~CHyprOpenGLImpl() {
if (m_pEglDisplay && m_pEglContext != EGL_NO_CONTEXT)
eglDestroyContext(m_pEglDisplay, m_pEglContext);
if (m_pEglDisplay)
eglTerminate(m_pEglDisplay);
eglReleaseThread();
if (m_pGbmDevice)
gbm_device_destroy(m_pGbmDevice);
if (m_iGBMFD >= 0)
close(m_iGBMFD);
}
std::optional<std::vector<uint64_t>> CHyprOpenGLImpl::getModsForFormat(EGLint format) {
// TODO: return std::expected when clang supports it

1
src/render/OpenGL.hpp
View file

@ -145,6 +145,7 @@ class CGradientValueData;
class CHyprOpenGLImpl {
public:
CHyprOpenGLImpl();
~CHyprOpenGLImpl();
void begin(CMonitor*, const CRegion& damage, CFramebuffer* fb = nullptr, std::optional<CRegion> finalDamage = {});
void beginSimple(CMonitor*, const CRegion& damage, SP<CRenderbuffer> rb = nullptr, CFramebuffer* fb = nullptr);