From 59d7cfcd02a7546a54ff3076cdd7d5de821a81c8 Mon Sep 17 00:00:00 2001 From: Alec LeFors Date: Sat, 27 Aug 2022 17:10:13 -0400 Subject: implemented DRM leasing for VR headsets --- src/Compositor.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/Compositor.cpp') diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 85f69636..e70650d1 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -71,6 +71,11 @@ CCompositor::CCompositor() { wlr_renderer_init_wl_display(m_sWLRRenderer, m_sWLDisplay); + if (wlr_renderer_get_dmabuf_texture_formats(m_sWLRRenderer) != NULL) { + wlr_drm_create(m_sWLDisplay, m_sWLRRenderer); + m_sWLRDmabuf = wlr_linux_dmabuf_v1_create(m_sWLDisplay, m_sWLRRenderer); + } + m_sWLRAllocator = wlr_allocator_autocreate(m_sWLRBackend, m_sWLRRenderer); if (!m_sWLRAllocator) { @@ -141,6 +146,12 @@ CCompositor::CCompositor() { m_sWLRToplevelMgr = wlr_foreign_toplevel_manager_v1_create(m_sWLDisplay); + m_sWRLDRMLeaseMgr = wlr_drm_lease_v1_manager_create(m_sWLDisplay, m_sWLRBackend); + if (!m_sWRLDRMLeaseMgr) { + Debug::log(CRIT, "Failed to create wlr_drm_lease_v1_manager"); + Debug::log(INFO, "VR will not be available"); + } + m_sWLRTabletManager = wlr_tablet_v2_create(m_sWLDisplay); m_sWLRForeignRegistry = wlr_xdg_foreign_registry_create(m_sWLDisplay); @@ -211,6 +222,9 @@ void CCompositor::initAllSignals() { addWLSignal(&m_sWLRIMEMgr->events.input_method, &Events::listen_newIME, m_sWLRIMEMgr, "IMEMgr"); addWLSignal(&m_sWLRTextInputMgr->events.text_input, &Events::listen_newTextInput, m_sWLRTextInputMgr, "TextInputMgr"); + if(m_sWRLDRMLeaseMgr) + addWLSignal(&m_sWRLDRMLeaseMgr->events.request, &Events::listen_leaseRequest, &m_sWRLDRMLeaseMgr, "DRM"); + if (m_sWLRSession) addWLSignal(&m_sWLRSession->events.active, &Events::listen_sessionActive, m_sWLRSession, "Session"); } -- cgit v1.2.3 From 1d43bb70d47f40651aa7f8c7a95f59ecd9918b24 Mon Sep 17 00:00:00 2001 From: Alec LeFors Date: Sat, 27 Aug 2022 17:24:36 -0400 Subject: fix indents, change crit log to info --- src/Compositor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Compositor.cpp') diff --git a/src/Compositor.cpp b/src/Compositor.cpp index e70650d1..3c7b8ccb 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -147,10 +147,10 @@ CCompositor::CCompositor() { m_sWLRToplevelMgr = wlr_foreign_toplevel_manager_v1_create(m_sWLDisplay); m_sWRLDRMLeaseMgr = wlr_drm_lease_v1_manager_create(m_sWLDisplay, m_sWLRBackend); - if (!m_sWRLDRMLeaseMgr) { - Debug::log(CRIT, "Failed to create wlr_drm_lease_v1_manager"); + if (!m_sWRLDRMLeaseMgr) { + Debug::log(INFO, "Failed to create wlr_drm_lease_v1_manager"); Debug::log(INFO, "VR will not be available"); - } + } m_sWLRTabletManager = wlr_tablet_v2_create(m_sWLDisplay); -- cgit v1.2.3