mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 02:04:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

egl: don't expose swrast device if swrast is not built

Browse Source 
This fixes piglit/egl_ext_device_base without swrast.

Reviewed-by: Yogesh Mohan Marimuthu <yogesh.mohanmarimuthu@amd.com>
(cherry picked from commit 48e218b49d)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28885>
This commit is contained in:
Marek Olšák 2023-01-26 22:29:19 -05:00 committed by Matt Turner
parent f62e842e31
commit 027ccc89b2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/egl/main/egldevice.c
View File

@ -332,7 +332,13 @@ _eglQueryDevicesEXT(EGLint max_devices,
num_devs = _eglRefreshDeviceList();
devs = _eglGlobal.DeviceList;
#ifdef GALLIUM_SOFTPIPE
swrast = devs;
#else
swrast = NULL;
num_devs--;
#endif
/* The first device is swrast. Start with the non-swrast device. */
devs = devs->Next;
@ -356,7 +362,7 @@ _eglQueryDevicesEXT(EGLint max_devices,
}
/* User requested the full device list, add the sofware device. */
if (max_devices >= num_devs) {
if (max_devices >= num_devs && swrast) {
assert(_eglDeviceSupports(swrast, _EGL_DEVICE_SOFTWARE));
devices[num_devs - 1] = swrast;
}

4
src/egl/meson.build
View File

@ -27,6 +27,10 @@ link_for_egl = []
deps_for_egl = []
incs_for_egl = [inc_include, inc_src, inc_egl]
if with_gallium_softpipe
c_args_for_egl += '-DGALLIUM_SOFTPIPE'
endif
files_egl = files(
'main/eglapi.c',
'main/eglarray.c',