hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-05 15:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix evil with more evil for fucking nix

Browse source
This commit is contained in:
Vaxry 2023-11-23 21:35:08 +00:00
parent 09fb856f39
commit 22b78adf53
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/render/OpenGL.cpp
View file

@ -33,6 +33,7 @@ CHyprOpenGLImpl::CHyprOpenGLImpl() {
Debug::log(LOG, "Supported extensions size: {}", std::count(m_szExtensions.begin(), m_szExtensions.end(), ' ')); Debug::log(LOG, "Supported extensions size: {}", std::count(m_szExtensions.begin(), m_szExtensions.end(), ' '));
loadGLProc(&m_sProc.glEGLImageTargetRenderbufferStorageOES, "glEGLImageTargetRenderbufferStorageOES"); loadGLProc(&m_sProc.glEGLImageTargetRenderbufferStorageOES, "glEGLImageTargetRenderbufferStorageOES");
loadGLProc(&m_sProc.eglDestroyImageKHR, "eglDestroyImageKHR");
#ifdef USE_TRACY_GPU #ifdef USE_TRACY_GPU

1
src/render/OpenGL.hpp
View file

@ -173,6 +173,7 @@ class CHyprOpenGLImpl {
struct { struct {
PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC glEGLImageTargetRenderbufferStorageOES = nullptr; PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC glEGLImageTargetRenderbufferStorageOES = nullptr;
PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR = nullptr;
} m_sProc; } m_sProc;
private: private:

31
src/render/Renderbuffer.cpp
View file

@ -2,31 +2,40 @@
#include "OpenGL.hpp" #include "OpenGL.hpp"
#include "../Compositor.hpp" #include "../Compositor.hpp"
extern "C" { #include <dlfcn.h>
// TODO: this is evil
#include "../../subprojects/wlroots/include/render/egl.h"
}
CRenderbuffer::~CRenderbuffer() { CRenderbuffer::~CRenderbuffer() {
wlr_egl_context lastCTX; if (eglGetCurrentContext() != wlr_egl_get_context(g_pCompositor->m_sWLREGL))
wlr_egl_save_context(&lastCTX); eglMakeCurrent(wlr_egl_get_display(g_pCompositor->m_sWLREGL), EGL_NO_SURFACE, EGL_NO_SURFACE, wlr_egl_get_context(g_pCompositor->m_sWLREGL));
wlr_egl_make_current(g_pCompositor->m_sWLREGL);
m_sFramebuffer.release(); m_sFramebuffer.release();
glDeleteRenderbuffers(1, &m_iRBO); glDeleteRenderbuffers(1, &m_iRBO);
wlr_egl_destroy_image(g_pCompositor->m_sWLREGL, m_iImage); g_pHyprOpenGL->m_sProc.eglDestroyImageKHR(wlr_egl_get_display(g_pCompositor->m_sWLREGL), m_iImage);
wlr_egl_restore_context(&lastCTX);
} }
CRenderbuffer::CRenderbuffer(wlr_buffer* buffer, uint32_t format) : m_pWlrBuffer(buffer) { CRenderbuffer::CRenderbuffer(wlr_buffer* buffer, uint32_t format) : m_pWlrBuffer(buffer) {
// EVIL, but we can't include a hidden header because nixos is fucking special
static EGLImageKHR (*PWLREGLCREATEIMAGEFROMDMABUF)(wlr_egl*, wlr_dmabuf_attributes*, bool*);
static bool symbolFound = false;
if (!symbolFound) {
PWLREGLCREATEIMAGEFROMDMABUF = reinterpret_cast<EGLImageKHR (*)(wlr_egl*, wlr_dmabuf_attributes*, bool*)>(dlsym(nullptr, "wlr_egl_create_image_from_dmabuf"));
symbolFound = true;
RASSERT(PWLREGLCREATEIMAGEFROMDMABUF, "wlr_egl_create_image_from_dmabuf was not found in wlroots!");
Debug::log(LOG, "CRenderbuffer: wlr_egl_create_image_from_dmabuf found at {:x}", (uintptr_t)PWLREGLCREATEIMAGEFROMDMABUF);
}
// end evil hack
struct wlr_dmabuf_attributes dmabuf = {0}; struct wlr_dmabuf_attributes dmabuf = {0};
if (!wlr_buffer_get_dmabuf(buffer, &dmabuf)) if (!wlr_buffer_get_dmabuf(buffer, &dmabuf))
throw std::runtime_error("wlr_buffer_get_dmabuf failed"); throw std::runtime_error("wlr_buffer_get_dmabuf failed");
bool externalOnly; bool externalOnly;
m_iImage = wlr_egl_create_image_from_dmabuf(g_pCompositor->m_sWLREGL, &dmabuf, &externalOnly); m_iImage = PWLREGLCREATEIMAGEFROMDMABUF(g_pCompositor->m_sWLREGL, &dmabuf, &externalOnly);
if (m_iImage == EGL_NO_IMAGE_KHR) if (m_iImage == EGL_NO_IMAGE_KHR)
throw std::runtime_error("wlr_egl_create_image_from_dmabuf failed"); throw std::runtime_error("wlr_egl_create_image_from_dmabuf failed");