Module: Mesa Branch: main Commit: 49996def65384b465a75a604d0b609382b4c3405 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=49996def65384b465a75a604d0b609382b4c3405
Author: Eric Engestrom <[email protected]> Date: Mon Mar 27 17:13:10 2023 +0100 asahi: change create_renderonly signature to uniformize it Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22144> --- src/gallium/winsys/asahi/drm/asahi_drm_public.h | 5 ++++- src/gallium/winsys/asahi/drm/asahi_drm_winsys.c | 5 +++-- src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gallium/winsys/asahi/drm/asahi_drm_public.h b/src/gallium/winsys/asahi/drm/asahi_drm_public.h index 85f102db70a..56ede24e964 100644 --- a/src/gallium/winsys/asahi/drm/asahi_drm_public.h +++ b/src/gallium/winsys/asahi/drm/asahi_drm_public.h @@ -10,9 +10,12 @@ #include <stdbool.h> struct pipe_screen; +struct pipe_screen_config; struct renderonly; struct pipe_screen *asahi_drm_screen_create(int drmFD); -struct pipe_screen *asahi_drm_screen_create_renderonly(struct renderonly *ro); +struct pipe_screen * +asahi_drm_screen_create_renderonly(int fd, struct renderonly *ro, + const struct pipe_screen_config *config); #endif /* __ASAHI_DRM_PUBLIC_H__ */ diff --git a/src/gallium/winsys/asahi/drm/asahi_drm_winsys.c b/src/gallium/winsys/asahi/drm/asahi_drm_winsys.c index e533d1c2972..3e6bd3ced4f 100644 --- a/src/gallium/winsys/asahi/drm/asahi_drm_winsys.c +++ b/src/gallium/winsys/asahi/drm/asahi_drm_winsys.c @@ -34,8 +34,9 @@ asahi_drm_screen_create(int fd) } struct pipe_screen * -asahi_drm_screen_create_renderonly(struct renderonly *ro) +asahi_drm_screen_create_renderonly(int fd, struct renderonly *ro, + const struct pipe_screen_config *config) { - return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(ro->gpu_fd), NULL, ro, + return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(fd), config, ro, asahi_screen_create); } diff --git a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c index dd26120dcaa..c97381682f5 100644 --- a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c +++ b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c @@ -146,7 +146,7 @@ struct pipe_screen *kmsro_drm_screen_create(int fd, if (ro->gpu_fd >= 0) { ro->create_for_resource = renderonly_create_kms_dumb_buffer_for_resource; - screen = asahi_drm_screen_create_renderonly(ro); + screen = asahi_drm_screen_create_renderonly(ro->gpu_fd, ro, config); if (!screen) goto out_free;
