diff options
| author | Yogesh Mohan Marimuthu <yogesh.mohanmarimuthu@amd.com> | 2022-12-17 22:51:08 +0530 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-01-24 12:51:35 +0000 |
| commit | 1a0ec8e8d3750d580ded41158b782b8070ff0e0a (patch) | |
| tree | eb3a25cbc077815452fed3903bfb9258a1f64529 /src/glx | |
| parent | 1c5b61eefb9be69256552cfde1caf3b7e1d29614 (diff) | |
| download | mesa-1a0ec8e8d3750d580ded41158b782b8070ff0e0a.tar.gz | |
loader,glx,egl,vl,d3d: loader_get_user_preferred_fd() function to return original_fd
v1: return original_fd in loader_get_user_preferred_fd() (Pierre-Eric)
v2: fix *original_id crash for android, haiku... (Pierre-Eric)
remove extra comment (Pierre-Eric)
v2: also return render fd in case of original_fd passed is NULL (Pierre-Eric)
Signed-off-by: Yogesh Mohan Marimuthu <yogesh.mohanmarimuthu@amd.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13422>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/dri3_glx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 5a9ec959640..8816d500f88 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -821,12 +821,8 @@ dri3_create_screen(int screen, struct glx_display * priv) return NULL; } - psc->fd_display_gpu = fcntl(psc->fd_render_gpu, F_DUPFD_CLOEXEC, 3); - psc->fd_render_gpu = loader_get_user_preferred_fd(psc->fd_render_gpu, &psc->is_different_gpu); - if (!psc->is_different_gpu) { - close(psc->fd_display_gpu); - psc->fd_display_gpu = -1; - } + psc->is_different_gpu = + loader_get_user_preferred_fd(&psc->fd_render_gpu, &psc->fd_display_gpu); driverName = loader_get_driver_for_fd(psc->fd_render_gpu); if (!driverName) { |