mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-23 10:35:38 +00:00
Android: prevent error EGL_BAD_DISPLAY while getting egl version without display
There is an error "E libEGL : validate_display:91 error 3008 (EGL_BAD_DISPLAY)"
that occurs when calling "eglQueryString(display, EGL_VERSION)", with EGL_NO_DISPLAY.
Khronos says "EGL_BAD_DISPLAY is generated if display is not an EGL display connection, unless display is EGL_NO_DISPLAY and name is EGL_EXTENSIONS."
but this was added in SDL with "EGL 1.5 allows querying for client version"
( 56363ebf61
)
In fact:
- it actually doesn't work on Android that has 1.5 egl client
- it works on desktop X11 (using SDL_VIDEO_X11_FORCE_EGL=1)
The commit moves the version call where it's used, eg inside the "if (platform) {"
and checks that "eglGetPlatformDisplay" has been correctly loaded.
This commit is contained in:
parent
03503423e9
commit
6be9c00970
|
@ -484,26 +484,28 @@ SDL_EGL_GetVersion(_THIS) {
|
|||
int
|
||||
SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_display, EGLenum platform)
|
||||
{
|
||||
int egl_version_major, egl_version_minor;
|
||||
int library_load_retcode = SDL_EGL_LoadLibraryOnly(_this, egl_path);
|
||||
if (library_load_retcode != 0) {
|
||||
return library_load_retcode;
|
||||
}
|
||||
|
||||
/* EGL 1.5 allows querying for client version with EGL_NO_DISPLAY */
|
||||
SDL_EGL_GetVersion(_this);
|
||||
|
||||
egl_version_major = _this->egl_data->egl_version_major;
|
||||
egl_version_minor = _this->egl_data->egl_version_minor;
|
||||
|
||||
if (egl_version_major == 1 && egl_version_minor == 5) {
|
||||
LOAD_FUNC(eglGetPlatformDisplay);
|
||||
}
|
||||
|
||||
_this->egl_data->egl_display = EGL_NO_DISPLAY;
|
||||
|
||||
#if !defined(__WINRT__)
|
||||
if (platform) {
|
||||
if (egl_version_major == 1 && egl_version_minor == 5) {
|
||||
/* EGL 1.5 allows querying for client version with EGL_NO_DISPLAY
|
||||
* --
|
||||
* Khronos doc: "EGL_BAD_DISPLAY is generated if display is not an EGL display connection, unless display is EGL_NO_DISPLAY and name is EGL_EXTENSIONS."
|
||||
* Therefore SDL_EGL_GetVersion() shouldn't work with uninitialized display.
|
||||
* - it actually doesn't work on Android that has 1.5 egl client
|
||||
* - it works on desktop X11 (using SDL_VIDEO_X11_FORCE_EGL=1) */
|
||||
SDL_EGL_GetVersion(_this);
|
||||
|
||||
if (_this->egl_data->egl_version_major == 1 && _this->egl_data->egl_version_minor == 5) {
|
||||
LOAD_FUNC(eglGetPlatformDisplay);
|
||||
}
|
||||
|
||||
if (_this->egl_data->eglGetPlatformDisplay) {
|
||||
_this->egl_data->egl_display = _this->egl_data->eglGetPlatformDisplay(platform, (void *)(size_t)native_display, NULL);
|
||||
} else {
|
||||
if (SDL_EGL_HasExtension(_this, SDL_EGL_CLIENT_EXTENSION, "EGL_EXT_platform_base")) {
|
||||
|
|
Loading…
Reference in a new issue