diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-04-28 16:50:56 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-04-28 21:53:00 -0400 |
| commit | 1d33c5a2fc230d1acce45eb7c5f75e25a4655324 (patch) | |
| tree | 3078430d84d803539a915b9e8585b2b4f7c58a37 | |
| parent | 69c861ad5845f1c8302d96d1d05a6227240dac05 (diff) | |
zink: remove drm_fd
no longer used
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16226>
| -rw-r--r-- | src/gallium/drivers/zink/zink_screen.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_screen.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 5c1ba875118..1b3b454e5be 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1253,9 +1253,6 @@ zink_destroy_screen(struct pipe_screen *pscreen) vkDestroyInstance(screen->instance, NULL); util_idalloc_mt_fini(&screen->buffer_ids); - if (screen->drm_fd != -1) - close(screen->drm_fd); - slab_destroy_parent(&screen->transfer_pool); ralloc_free(screen); glsl_type_singleton_decref(); @@ -2344,7 +2341,6 @@ zink_create_screen(struct sw_winsys *winsys, const struct pipe_screen_config *co { struct zink_screen *ret = zink_internal_create_screen(config); if (ret) { - ret->drm_fd = -1; ret->sw_winsys = winsys; } @@ -2356,8 +2352,6 @@ zink_drm_create_screen(int fd, const struct pipe_screen_config *config) { struct zink_screen *ret = zink_internal_create_screen(config); - if (ret) - ret->drm_fd = os_dupfd_cloexec(fd); if (ret && !ret->info.have_KHR_external_memory_fd) { debug_printf("ZINK: KHR_external_memory_fd required!\n"); zink_destroy_screen(&ret->base); diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h index 8833f47d542..418886933d1 100644 --- a/src/gallium/drivers/zink/zink_screen.h +++ b/src/gallium/drivers/zink/zink_screen.h @@ -94,7 +94,6 @@ struct zink_screen { simple_mtx_t dt_lock; bool device_lost; - int drm_fd; struct sw_winsys winsys; struct sw_winsys *sw_winsys; // wrapped __DRIkopperLoaderExtension *loader; |