hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-11-16 23:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

gbm: pick only valid modifiers

Browse source
This commit is contained in:
Vaxry 2024-02-22 03:05:56 +00:00
parent 57ce4f759c
commit 272fc359ad
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/hyprlock.cpp
View file

@ -150,6 +150,8 @@ static void dmabufFeedbackTrancheFormats(void* data, zwp_linux_dmabuf_feedback_v
if (*idx >= n_modifiers) if (*idx >= n_modifiers)
continue; continue;
Debug::log(TRACE, "GPU Reports supported format {:x} with modifier {:x}", (fm_entry + *idx)->format, (fm_entry + *idx)->modifier);
g_pHyprlock->dma.dmabufMods.push_back({(fm_entry + *idx)->format, (fm_entry + *idx)->modifier}); g_pHyprlock->dma.dmabufMods.push_back({(fm_entry + *idx)->format, (fm_entry + *idx)->modifier});
} }
} }

39
src/renderer/DMAFrame.cpp
View file

@ -11,6 +11,7 @@
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES = nullptr; static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES = nullptr;
static PFNEGLQUERYDMABUFMODIFIERSEXTPROC eglQueryDmaBufModifiersEXT = nullptr;
static void wlrOnBuffer(void* data, zwlr_screencopy_frame_v1* frame, uint32_t format, uint32_t width, uint32_t height, uint32_t stride) { static void wlrOnBuffer(void* data, zwlr_screencopy_frame_v1* frame, uint32_t format, uint32_t width, uint32_t height, uint32_t stride) {
const auto PDATA = (SScreencopyData*)data; const auto PDATA = (SScreencopyData*)data;
@ -54,6 +55,8 @@ static void wlrOnDmabuf(void* data, zwlr_screencopy_frame_v1* frame, uint32_t fo
PDATA->w = width; PDATA->w = width;
PDATA->h = height; PDATA->h = height;
PDATA->fmt = format; PDATA->fmt = format;
Debug::log(TRACE, "[sc] DMABUF format reported: {:x}", format);
} }
static void wlrOnBufferDone(void* data, zwlr_screencopy_frame_v1* frame) { static void wlrOnBufferDone(void* data, zwlr_screencopy_frame_v1* frame) {
@ -91,6 +94,9 @@ CDMAFrame::CDMAFrame(COutput* output) {
} }
} }
if (!eglQueryDmaBufModifiersEXT)
eglQueryDmaBufModifiersEXT = (PFNEGLQUERYDMABUFMODIFIERSEXTPROC)eglGetProcAddress("eglQueryDmaBufModifiersEXT");
// firstly, plant a listener for the frame // firstly, plant a listener for the frame
frameCb = zwlr_screencopy_manager_v1_capture_output(g_pHyprlock->getScreencopy(), false, output->output); frameCb = zwlr_screencopy_manager_v1_capture_output(g_pHyprlock->getScreencopy(), false, output->output);
@ -104,12 +110,41 @@ CDMAFrame::CDMAFrame(COutput* output) {
CDMAFrame::~CDMAFrame() { CDMAFrame::~CDMAFrame() {
if (g_pEGL) if (g_pEGL)
eglDestroyImage(g_pEGL->eglDisplay, image); eglDestroyImage(g_pEGL->eglDisplay, image);
// leaks bo and stuff but lives throughout so for now who cares
} }
bool CDMAFrame::onBufferDone() { bool CDMAFrame::onBufferDone() {
uint32_t flags = GBM_BO_USE_RENDERING; uint32_t flags = GBM_BO_USE_RENDERING;
if (!eglQueryDmaBufModifiersEXT) {
Debug::log(WARN, "Querying modifiers without eglQueryDmaBufModifiersEXT support");
bo = gbm_bo_create(g_pHyprlock->dma.gbmDevice, scdata.w, scdata.h, scdata.fmt, flags); bo = gbm_bo_create(g_pHyprlock->dma.gbmDevice, scdata.w, scdata.h, scdata.fmt, flags);
} else {
std::vector<uint64_t> mods;
mods.resize(64);
std::vector<EGLBoolean> externalOnly;
externalOnly.resize(64);
int num = 0;
if (!eglQueryDmaBufModifiersEXT(g_pEGL->eglDisplay, scdata.fmt, 64, mods.data(), externalOnly.data(), &num) || num == 0) {
Debug::log(WARN, "eglQueryDmaBufModifiersEXT failed, falling back to regular bo");
bo = gbm_bo_create(g_pHyprlock->dma.gbmDevice, scdata.w, scdata.h, scdata.fmt, flags);
} else {
Debug::log(LOG, "eglQueryDmaBufModifiersEXT found {} mods", num);
std::vector<uint64_t> goodMods;
for (int i = 0; i < num; ++i) {
if (externalOnly[i]) {
Debug::log(TRACE, "Modifier {:x} failed test", mods[i]);
continue;
}
Debug::log(TRACE, "Modifier {:x} passed test", mods[i]);
goodMods.push_back(mods[i]);
}
bo = gbm_bo_create_with_modifiers2(g_pHyprlock->dma.gbmDevice, scdata.w, scdata.h, scdata.fmt, goodMods.data(), goodMods.size(), flags);
}
}
if (!bo) { if (!bo) {
Debug::log(ERR, "Couldn't create a drm buffer"); Debug::log(ERR, "Couldn't create a drm buffer");
@ -118,6 +153,9 @@ bool CDMAFrame::onBufferDone() {
planes = gbm_bo_get_plane_count(bo); planes = gbm_bo_get_plane_count(bo);
uint64_t mod = gbm_bo_get_modifier(bo);
Debug::log(LOG, "bo chose modifier {:x}", mod);
zwp_linux_buffer_params_v1* params = zwp_linux_dmabuf_v1_create_params((zwp_linux_dmabuf_v1*)g_pHyprlock->dma.linuxDmabuf); zwp_linux_buffer_params_v1* params = zwp_linux_dmabuf_v1_create_params((zwp_linux_dmabuf_v1*)g_pHyprlock->dma.linuxDmabuf);
if (!params) { if (!params) {
Debug::log(ERR, "zwp_linux_dmabuf_v1_create_params failed"); Debug::log(ERR, "zwp_linux_dmabuf_v1_create_params failed");
@ -129,7 +167,6 @@ bool CDMAFrame::onBufferDone() {
size[plane] = 0; size[plane] = 0;
stride[plane] = gbm_bo_get_stride_for_plane(bo, plane); stride[plane] = gbm_bo_get_stride_for_plane(bo, plane);
offset[plane] = gbm_bo_get_offset(bo, plane); offset[plane] = gbm_bo_get_offset(bo, plane);
uint64_t mod = gbm_bo_get_modifier(bo);
fd[plane] = gbm_bo_get_fd_for_plane(bo, plane); fd[plane] = gbm_bo_get_fd_for_plane(bo, plane);
if (fd[plane] < 0) { if (fd[plane] < 0) {