Skip to content
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

Jump to bottom

EGL: use eglGetPlatformDisplay if available #865

Merged
merged 2 commits into from
Nov 13, 2024
Merged

EGL: use eglGetPlatformDisplay if available #865

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71c32f4
EGL: use eglGetPlatformDisplay if available
thesourcehim Nov 12, 2024
b1efbef
Don't use ifdef, just try every method to obtain display handle, rename
thesourcehim Nov 13, 2024
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
14 changes: 12 additions & 2 deletions desmume/src/frontend/posix/shared/egl_3Demu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,18 @@ static bool __egl_initOpenGL(const int requestedAPI, const int requestedProfile,

EGLint eglMajorVersion;
EGLint eglMinorVersion;

currDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);

EGLAttrib displayAttr[] = {EGL_NONE};
currDisplay = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, EGL_DEFAULT_DISPLAY, displayAttr);
if(currDisplay == EGL_NO_DISPLAY)
currDisplay = eglGetPlatformDisplay(EGL_PLATFORM_XCB_EXT, EGL_DEFAULT_DISPLAY, displayAttr);
if(currDisplay == EGL_NO_DISPLAY)
currDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
if(currDisplay == EGL_NO_DISPLAY)
{
puts("EGL: failed to obtain display handle");
return false;
}
if (eglInitialize(currDisplay, &eglMajorVersion, &eglMinorVersion) == EGL_FALSE)
{
puts("EGL: eglInitialize failed");
Expand Down