We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] fix eglChooseConfig(), ignore all configuartions without an matching EGL_NATIVE_VISUAL_ID"

patch_fix_kmsdrm_createwindow.diff (text/plain), 2.93 KB, created by Rainer Sabelka on 2018-10-31 19:41:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Sabelka

Created: 2018-10-31 19:41:47 UTC

Size: 2.93 KB

patch

obsolete

>diff -r 8feb5da6f2fb src/video/SDL_egl.c
>--- a/src/video/SDL_egl.c	Tue Oct 30 20:11:02 2018 +0300
>+++ b/src/video/SDL_egl.c	Wed Oct 31 17:28:17 2018 +0100
>@@ -449,6 +449,12 @@
>     return 0;
> }
> 
>+void
>+SDL_EGL_SetRequiredVisualId(_THIS, int visual_id) 
>+{
>+    _this->egl_data->egl_required_visual_id=visual_id;
>+}
>+
> #ifdef DUMP_EGL_CONFIG
> 
> #define ATTRIBUTE(_attr) { _attr, #_attr }
>@@ -513,14 +519,8 @@
> /* 64 seems nice. */
>     EGLint attribs[64];
>     EGLint found_configs = 0, value;
>-#ifdef SDL_VIDEO_DRIVER_KMSDRM
>-    /* Intel EGL on KMS/DRM (al least) returns invalid configs that confuse the bitdiff search used */
>-    /* later in this function, so we simply use the first one when using the KMSDRM driver for now. */
>-    EGLConfig configs[1];
>-#else
>     /* 128 seems even nicer here */
>     EGLConfig configs[128];
>-#endif
>     int i, j, best_bitdiff = -1, bitdiff;
>    
>     if (!_this->egl_data) {
>@@ -603,6 +603,16 @@
>     /* From those, we select the one that matches our requirements more closely via a makeshift algorithm */
> 
>     for (i = 0; i < found_configs; i++ ) {
>+        if (_this->egl_data->egl_required_visual_id)
>+        {
>+            EGLint format;
>+            _this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display,
>+                                            configs[i], 
>+                                            EGL_NATIVE_VISUAL_ID, &format);
>+            if (_this->egl_data->egl_required_visual_id != format)
>+                continue;
>+        }
>+
>         bitdiff = 0;
>         for (j = 0; j < SDL_arraysize(attribs) - 1; j += 2) {
>             if (attribs[j] == EGL_NONE) {
>diff -r 8feb5da6f2fb src/video/SDL_egl_c.h
>--- a/src/video/SDL_egl_c.h	Tue Oct 30 20:11:02 2018 +0300
>+++ b/src/video/SDL_egl_c.h	Wed Oct 31 17:28:17 2018 +0100
>@@ -37,6 +37,7 @@
>     int egl_swapinterval;
>     int egl_surfacetype;
>     int egl_version_major, egl_version_minor;
>+    EGLint egl_required_visual_id;
>     
>     EGLDisplay(EGLAPIENTRY *eglGetDisplay) (NativeDisplayType display);
>     EGLDisplay(EGLAPIENTRY *eglGetPlatformDisplay) (EGLenum platform,
>@@ -102,6 +103,7 @@
> extern int SDL_EGL_LoadLibrary(_THIS, const char *path, NativeDisplayType native_display, EGLenum platform);
> extern void *SDL_EGL_GetProcAddress(_THIS, const char *proc);
> extern void SDL_EGL_UnloadLibrary(_THIS);
>+extern void SDL_EGL_SetRequiredVisualId(_THIS, int visual_id);
> extern int SDL_EGL_ChooseConfig(_THIS);
> extern int SDL_EGL_SetSwapInterval(_THIS, int interval);
> extern int SDL_EGL_GetSwapInterval(_THIS);
>diff -r 8feb5da6f2fb src/video/kmsdrm/SDL_kmsdrmvideo.c
>--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c	Tue Oct 30 20:11:02 2018 +0300
>+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c	Wed Oct 31 17:28:17 2018 +0100
>@@ -587,6 +587,7 @@
>             goto error;
>         }
>     }
>+    SDL_EGL_SetRequiredVisualId(_this, surface_fmt);
>     wdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) wdata->gs);
> 
>     if (wdata->egl_surface == EGL_NO_SURFACE) {

Actions: View | Diff

Attachments on bug 4349: 3429

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.