Module: Mesa Branch: main Commit: 8e7511ea7fd5c480c639ae31806313cb6ccbc150 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e7511ea7fd5c480c639ae31806313cb6ccbc150
Author: Rob Clark <[email protected]> Date: Wed Mar 1 11:24:06 2023 -0800 vk/runtime: Use libdrm shim Signed-off-by: Rob Clark <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21636> --- src/vulkan/runtime/vk_instance.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vulkan/runtime/vk_instance.c b/src/vulkan/runtime/vk_instance.c index 3f00199c17d..1a471eb6578 100644 --- a/src/vulkan/runtime/vk_instance.c +++ b/src/vulkan/runtime/vk_instance.c @@ -23,9 +23,7 @@ #include "vk_instance.h" -#ifdef HAVE_LIBDRM -#include <xf86drm.h> -#endif +#include "util/libdrm.h" #include "vk_alloc.h" #include "vk_common_entrypoints.h" @@ -361,7 +359,6 @@ vk_instance_get_physical_device_proc_addr(const struct vk_instance *instance, static VkResult enumerate_drm_physical_devices_locked(struct vk_instance *instance) { -#ifdef HAVE_LIBDRM /* TODO: Check for more devices ? */ drmDevicePtr devices[8]; int max_devices = drmGetDevices2(0, devices, ARRAY_SIZE(devices)); @@ -389,8 +386,6 @@ enumerate_drm_physical_devices_locked(struct vk_instance *instance) drmFreeDevices(devices, max_devices); return result; -#endif - return VK_SUCCESS; } static VkResult
