fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

egl/device: fix the fix for explicit sw rejection in non-sw EGL_PLATFORM=device
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
"explicit sw" means llvmpipe, which cannot be a real drm device. this requires also
returning only a single device so as to avoid leaking non-sw drivers

should fix LIBGL_ALWAYS_SOFTWARE=1 eglinfo

Fixes: 8a339cdebc ("egl: fix sw fallback rejection in non-sw EGL_PLATFORM=device")
(cherry picked from commit c9b2986607)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40359>
This commit is contained in:
Mike Blumenkrantz 2026-02-24 08:07:42 -05:00 • committed by Eric Engestrom
parent 1f89a0fb96
commit 5cf88188bd
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -134,7 +134,7 @@
"description": "egl/device: fix the fix for explicit sw rejection in non-sw EGL_PLATFORM=device",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "8a339cdebccdea0610bdd7a1ecc9a5ec63951940",
"notes": null

18
src/egl/drivers/dri2/platform_device.c
View file

@ -260,12 +260,7 @@ static bool
device_probe_device(_EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
bool request_software =
debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
if (request_software)
_eglLog(_EGL_WARNING, "Not allowed to force software rendering when "
"API explicitly selects a hardware device.");
dri2_dpy->fd_render_gpu = device_get_fd(disp, disp->Device);
if (dri2_dpy->fd_render_gpu < 0)
return false;
@ -277,7 +272,7 @@ device_probe_device(_EGLDisplay *disp)
goto err_name;
/* this is software fallback */
if (disp->Options.ForceSoftware && !request_software) {
if (disp->Options.ForceSoftware) {
/* When doing software rendering, some times user still want to explicitly
* choose the render node device since cross node import doesn't work between
* vgem/virtio_gpu yet. It would be nice to have a new EXTENSION for this.
@ -327,15 +322,22 @@ dri2_initialize_device(_EGLDisplay *disp)
{
const char *err;
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
bool request_software =
debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
/* Extension requires a PlatformDisplay - the EGLDevice. */
disp->Device = disp->PlatformDisplay;
if (request_software)
_eglLog(_EGL_WARNING, "Not allowed to force software rendering when "
"API explicitly selects a hardware device.");
err = "DRI2: failed to load driver";
if (_eglDeviceSupports(disp->Device, _EGL_DEVICE_DRM)) {
/* device-drm platform cannot be explicit sw (because explicit sw is llvmpipe) */
if (!request_software && _eglDeviceSupports(disp->Device, _EGL_DEVICE_DRM)) {
if (!device_probe_device(disp))
goto cleanup;
} else if (_eglDeviceSupports(disp->Device, _EGL_DEVICE_SOFTWARE)) {
} else if (request_software || _eglDeviceSupports(disp->Device, _EGL_DEVICE_SOFTWARE)) {
if (!device_probe_device_sw(disp))
goto cleanup;
} else {

11
src/egl/main/egldevice.c
View file

@ -30,6 +30,7 @@
#endif
#include "util/compiler.h"
#include "util/macros.h"
#include "util/u_debug.h"
#include "eglcurrent.h"
#include "egldevice.h"
@ -464,6 +465,8 @@ _eglQueryDevicesEXT(EGLint max_devices, _EGLDevice **devices,
{
_EGLDevice *dev, *devs, *swrast;
int i = 0, num_devs;
bool request_software =
debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false);
if ((devices && max_devices <= 0) || !num_devices)
return _eglError(EGL_BAD_PARAMETER, "eglQueryDevicesEXT");
@ -485,7 +488,13 @@ _eglQueryDevicesEXT(EGLint max_devices, _EGLDevice **devices,
/* bail early if we only care about the count */
if (!devices) {
*num_devices = num_devs;
*num_devices = request_software ? !!swrast : num_devs;
goto out;
}
if (request_software) {
*num_devices = !!swrast;
devices[0] = swrast;
goto out;
}