Skip to content

fix(graphics): add EGL_BAD_MATCH fallback for incompatible format modifiers #5288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
muracodex wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −3
Open

fix(graphics): add EGL_BAD_MATCH fallback for incompatible format modifiers #5288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/platform/linux/graphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ namespace egl {
}

std::optional<rgb_t> import_source(display_t::pointer egl_display, const surface_descriptor_t &xrgb) {
auto attribs = surface_descriptor_to_egl_attribs(xrgb);
const auto attribs = surface_descriptor_to_egl_attribs(xrgb);

rgb_t rgb {
egl_display,
Expand All @@ -603,9 +603,29 @@ namespace egl {
};

if (!rgb->xrgb8) {
BOOST_LOG(error) << "Couldn't import RGB Image: "sv << util::hex(eglGetError()).to_string_view();
auto err = eglGetError();

// Fallback: retry without modifier if GPU rejects the display's format modifier
// Some displays (e.g. USB/DisplayLink) report modifiers the GPU cannot handle
if (err == EGL_BAD_MATCH && xrgb.modifier != DRM_FORMAT_MOD_INVALID) {
surface_descriptor_t xrgb_linear = xrgb;
xrgb_linear.modifier = DRM_FORMAT_MOD_INVALID;
auto attribs_linear = surface_descriptor_to_egl_attribs(xrgb_linear);

rgb = {
egl_display,
eglCreateImage(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, attribs_linear.data()),
gl::tex_t::make(1)
};

return std::nullopt;
if (!rgb->xrgb8) {
BOOST_LOG(error) << "Couldn't import RGB Image: "sv << util::hex(err).to_string_view();
return std::nullopt;
}
} else {
BOOST_LOG(error) << "Couldn't import RGB Image: "sv << util::hex(err).to_string_view();
return std::nullopt;
}
}

gl::ctx.BindTexture(GL_TEXTURE_2D, rgb->tex[0]);
Expand Down