[PATCH 0/1] MR9696: win32u: Workaround a 32-bit llvmpipe crash on initialization.

[Rémi Bernon]

I believe it was crashing already before but this has become more of an issue as the EGL/GL initialization now occurs when loading opengl32.dll unixlib, which prevent any opengl-dependent test to even load. This does not happen with 64-bit unix side, nor does it happen with other drivers, and I suspect this might either be some OOM issue with llvmpipe requiring much more memory, or some bug in llvmpipe initialization.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9696

[PATCH 1/1] win32u: Workaround a 32-bit llvmpipe crash on initialization.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/win32u/opengl.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c
index 0d4889c0a87..0d2f85c1817 100644
--- a/dlls/win32u/opengl.c
+++ b/dlls/win32u/opengl.c
@@ -1103,6 +1103,14 @@ static void init_device_info( struct egl_platform *egl, const struct opengl_func
     TRACE( "  - device_uuid: %s\n", debugstr_guid(&egl->device_uuid) );
     TRACE( "  - driver_uuid: %s\n", debugstr_guid(&egl->driver_uuid) );
 
+    if (!egl->accelerated && sizeof(void *) == 4)
+    {
+        WARN( "Skipping bogus 32bit llvmpipe device initialization\n" );
+        egl->device_name = "llvmpipe";
+        egl->vendor_name = "Mesa";
+        return;
+    }
+
     funcs->p_eglBindAPI( EGL_OPENGL_API );
     funcs->p_eglGetConfigs( egl->display, &config, 1, &count );
     if (!count) config = EGL_NO_CONFIG_KHR;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9696