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] [PATCH] SDL_EGL_ChooseConfig: don't fall through if no matching format exists

0001-SDL_EGL_ChooseConfig-don-t-fall-through-if-no-matchi.patch (text/plain), 2.38 KB, created by Conn O'Griofa on 2019-09-11 10:40:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Conn O'Griofa

Created: 2019-09-11 10:40:30 UTC

Size: 2.38 KB

patch

obsolete

>From c7e1c332e3fb306b250df3dc7d7cb6f835c799ce Mon Sep 17 00:00:00 2001
>From: Conn O'Griofa <connogriofa@gmail.com>
>Date: Wed, 7 Aug 2019 07:14:35 +0100
>Subject: [PATCH] SDL_EGL_ChooseConfig: don't fall through if no matching
> format exists
>
>On Raspberry Pi 3 via the VC4 driver in firmware KMS mode, none of the
>found configs match the desired format, causing the function to fall through
>without any config being selected.
>
>Fix by first iterating over the found configs, and if no match exists,
>don't exclude the non-matching configs. This should fix RPI3 and possibly other
>targets without breaking targets that have a matching native format (such as RPI4).
>---
> src/video/SDL_egl.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
>diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
>index 1a40197d0..fd59a963e 100644
>--- a/src/video/SDL_egl.c
>+++ b/src/video/SDL_egl.c
>@@ -538,6 +538,7 @@ SDL_EGL_ChooseConfig(_THIS)
>     EGLint found_configs = 0, value;
>     /* 128 seems even nicer here */
>     EGLConfig configs[128];
>+    SDL_bool has_matching_format = SDL_FALSE;
>     int i, j, best_bitdiff = -1, bitdiff;
>    
>     if (!_this->egl_data) {
>@@ -616,11 +617,24 @@ SDL_EGL_ChooseConfig(_THIS)
>         return SDL_EGL_SetError("Couldn't find matching EGL config", "eglChooseConfig");
>     }
> 
>+    /* first ensure that a found config has a matching format, or the function will fall through. */
>+    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)
>+                has_matching_format = SDL_TRUE;
>+        }
>+    }
>+
>     /* eglChooseConfig returns a number of configurations that match or exceed the requested attribs. */
>     /* 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)
>+        if (has_matching_format && _this->egl_data->egl_required_visual_id)
>         {
>             EGLint format;
>             _this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display,
>-- 
>2.20.1
>

Actions: View | Diff

Attachments on bug 4800: 3964

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.