From 5f10f8721297f65785d4a02bd39b849be2a291bd Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 26 Sep 2024 16:37:05 -0400 Subject: [PATCH] zink: check HAVE_LIBDRM for xf86drm.h include cc: mesa-stable Part-of: (cherry picked from commit d1f6e52de271954f678f1f4cacfc53c36877833c) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_bo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cbc3ffe250c..1111d3b908d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -444,7 +444,7 @@ "description": "zink: check HAVE_LIBDRM for xf86drm.h include", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c index 97c82291561..26e65a68ea2 100644 --- a/src/gallium/drivers/zink/zink_bo.c +++ b/src/gallium/drivers/zink/zink_bo.c @@ -35,7 +35,7 @@ #include "zink_screen.h" #include "util/u_hash_table.h" -#if !defined(__APPLE__) && !defined(_WIN32) +#ifdef HAVE_LIBDRM #define ZINK_USE_DMABUF #include #endif