brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl: Return success status from meta_egl_query_device_string

Browse Source 
QueryDeviceString can successfully return NULL. The convention however
is that when NULL is returned, the error will be set.

This commit makes the returned string an output parameter which allows
us to return the success status and have the error set accordingly.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3614>
This commit is contained in:
Sebastian Wick
2024-02-24 21:56:13 +01:00
committed by Marge Bot
parent 46619573e0
commit 8234f5bc7e
4 changed files with 66 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backends/native/meta-render-device-egl-stream.c
View File

@ -64,10 +64,11 @@ get_egl_device_display (MetaRenderDevice *render_device,
error);
}
static const char *
get_drm_device_file (MetaEgl *egl,
EGLDeviceEXT device,
GError **error)
static gboolean
get_drm_device_file (MetaEgl *egl,
EGLDeviceEXT device,
const char **out_device_file_path,
GError **error)
{
if (!meta_egl_egl_device_has_extensions (egl, device,
NULL,
@ -77,12 +78,11 @@ get_drm_device_file (MetaEgl *egl,
g_set_error (error, G_IO_ERROR,
G_IO_ERROR_FAILED,
"Missing required EGLDevice extension EGL_EXT_device_drm");
return NULL;
return FALSE;
}
return meta_egl_query_device_string (egl, device,
EGL_DRM_DEVICE_FILE_EXT,
error);
return meta_egl_query_device_string (egl, device, EGL_DRM_DEVICE_FILE_EXT,
out_device_file_path, error);
}
static EGLDeviceEXT
@ -133,8 +133,8 @@ find_egl_device (MetaRenderDevice *render_device,
g_clear_error (error);
egl_device_drm_path = get_drm_device_file (egl, devices[i], error);
if (!egl_device_drm_path)
if (!get_drm_device_file (egl, devices[i], &egl_device_drm_path, error) ||
!egl_device_drm_path)
continue;
if (g_str_equal (egl_device_drm_path, device_file_path))