Fix KMS with OpenGL.

[orbea]

Description

Fixes KMS with OpenGL.

All credit for this patch goes to @dtsarr.

Related Issues

Fixes #7119

[5schatten]

This commit breaks the build for me on ARM / S905X

gfx/common/egl_common.c: In function 'egl_init_context':
gfx/common/egl_common.c:360:17: error: 'GBM_FORMAT_XRGB8888' undeclared (first use in this function)
       if (id == GBM_FORMAT_XRGB8888) break;
                 ^~~~~~~~~~~~~~~~~~~
gfx/common/egl_common.c:360:17: note: each undeclared identifier is reported only once for each function it appears in
CC deps/7zip/7zIn.c
make: *** [Makefile:193: obj-unix/release/gfx/common/egl_common.o] Error 1
make: *** Waiting for unfinished jobs....

[orbea]

Well that is unfortunate... What OS is running on this device? Can you please share the contents of config.mk after ./configure? I'd guess this needs to be hidden behind #ifdef GBM, but its hard to test that without the right device.

Herre GBM_FORMAT_XRGB8888 is provided by gbm.h from the mesa package.

[inactive123]

Yes. @orbea There really shouldn't be any GBM dependencies added to egl_common.c. It should be fairly decoupled so that egl_common.c won't have any GBM dependencies. Not sure how to fix it, from the logic that is being shown here, you deliberately look for a GBM_FORMAT_XRGB8888 format and if you can't find it, then it will just not attempt to setup EGL? Is there a more portable way of doing this? I'd imagine this wouldn't work on EGLStreams.

I believe they faced a similar issue here -

https://gitlab.gnome.org/mvicomoya/mutter/commit/54246c75f57ac889c0d433756f3ddf1b280d2dd5

[orbea]

I didn't make the patch only the PR, @dtsarr may know better. However this might be a bandaid even if the example you linked looks better...

diff --git a/gfx/common/egl_common.c b/gfx/common/egl_common.c
index 8ae8fee90c..a8f7380568 100644
--- a/gfx/common/egl_common.c
+++ b/gfx/common/egl_common.c
@@ -334,6 +334,7 @@ bool egl_init_context(egl_ctx_data_t *egl,
 
    RARCH_LOG("[EGL]: EGL version: %d.%d
", *major, *minor);
 
+#ifdef HAVE_GBM
    if (!eglGetConfigs(egl->dpy, NULL, 0, &count) || count < 1)
    {
       RARCH_ERR("[EGL]: No cofigs to choose from.
");
@@ -374,6 +375,11 @@ bool egl_init_context(egl_ctx_data_t *egl,
       egl->config = configs[config_index];
 
    free(configs);
+#else
+   if (!eglChooseConfig(egl->dpy,
+            attrib_ptr, &egl->config, 1, n) || *n != 1)
+      return false;
+#endif
 
    egl->major = g_egl_major;
    egl->minor = g_egl_minor;

[inactive123]

Yeah, we can go with that for now.

[5schatten]

@twinaphex @orbea
I'm building this package https://github.com/5schatten/LibreELEC.tv/blob/libreelec-9.0-rr/packages/5schatten/emulation-frontends/retroarch/package.mk for my LE fork. It builds fine for generic/OpenGL target.

Your patch was a bit malformed but this one fix compiling for S905X -> building a test image now
https://hastebin.com/nexucinuji.cpp

[orbea]

@natinusala Have you tried the band-aid patch above? Does it work?

[inactive123]

@natinusala Try if this works (I assume you are talking about Switch Lakka here) -

bfd9141

[natinusala]

All good

[Sunderland93]

Broke Wayland EGL #7721

[inactive123]

@Sunderland93 can you fix this up without breaking the other targets?

[Sunderland93]

@twinaphex No, I have no idea how to resolve this

[inactive123]

@orbea I'd like to ask you to fix this then. It's pretty important that Wayland EGL continues to work.

[orbea]

@twinaphex I didn't make this patch, @dtsarr did. I've never even used wayland before and unfortunately I'm not sure how to fix this either...

[inactive123]

@dtsarr Can you make sure EGL Wayland still works and send a patch for it?

[inactive123]

You guys need to come together here and figure out a solution of some sorts, a release is nearing soon and it would be very bad form if we fixed KMS for one particular usecase and broke it for say EGL Wayland. I might have to revert this completely for now if you guys can't work together to come up with some kind of collaborative solution unfortunately.

I really don't want to have to do that, so please work with me here to ensure we have a nice good release prepared before Christmas.

[orbea]

Isn't there anyone involved in this project anymore with knowledge of EGL or wayland that can help?

A naive guess at a solution would be to find what EGL format wayland wants and then give it that format under a wayland context while keeping the current format otherwise. I tried researching the first step, but my lack of knowledge on wayland made finding these details less than fruitful with a search engine.

Its unfortunate it turned out like this, but what do you expect when no one knowledgeable enough actually reviews the code? ... Of course it seems the only way to get testing done here is to merge first and hope for the best. :\

Edit: Just to clarify, I am not blaming anyone, just I wish there was a better way?

[inactive123]

@orbea I'm asking around right now. There might be a solution coming.

[orbea]

Thank you! I really appreciate the help rectifying this issue. :)

[inactive123]

I have just merged a PR by @Themaister. I ask the people in this thread to please test again and see if everything works now for them.

[orbea]

KMS still works here with both OpenGL and Vulkan, we'll have to wait for wayland users to test if its fixed there too. @Themaister thank you very much for your help!

[Themaister]

I tested EGL Wayland myself as well as DRM, works for me (tm).

[orbea]

@Sunderland93 still seems to be having problems with wayland and gnome3 here.

#7721

Maybe its specific to gnome though?

[Sunderland93]

Maybe its specific to gnome though?

Same in rootston, mir and weston

[Sunderland93]

Upd. Fixed after update my distro :)