diff options
| author | Eric Engestrom <[email protected]> | 2019-02-12 18:18:03 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-02-14 11:20:00 +0000 |
| commit | f1374805a86d0d506557e61efbc09e23caa7a038 (patch) | |
| tree | 8227048a718d8080b00c1f1a9817033ce38e6cd9 /src/vulkan | |
| parent | 69e4c273c44118f46fd496af5124ddf45b86e868 (diff) | |
drm-uapi: use local files, not system libdrm
There was an issue recently caused by the system header being included
by mistake, so let's just get rid of this include path and always
explicitly #include "drm-uapi/FOO.h"
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Kristian H. Kristensen <[email protected]>
Diffstat (limited to 'src/vulkan')
| -rw-r--r-- | src/vulkan/Makefile.am | 1 | ||||
| -rw-r--r-- | src/vulkan/wsi/meson.build | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common.c | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_display.c | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_wayland.c | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_x11.c | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index dc7e32aaa68..cc738d5c9a5 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -30,7 +30,6 @@ libvulkan_util_la_SOURCES = $(VULKAN_UTIL_SOURCES) AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/drm-uapi \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/vulkan/util \ -I$(top_srcdir)/src/gallium/auxiliary \ diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index e9812b663e4..41e9c27ce8d 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -62,7 +62,7 @@ endif libvulkan_wsi = static_library( 'vulkan_wsi', files_vulkan_wsi, - include_directories : [inc_common, inc_vulkan_util, inc_drm_uapi], + include_directories : [inc_common, inc_vulkan_util, inc_include], dependencies : [vulkan_wsi_deps, dep_libdrm], c_args : [c_vis_args, vulkan_wsi_args], build_by_default : false, diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index e5dc1bb4c74..783b954a5c5 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -22,7 +22,7 @@ */ #include "wsi_common_private.h" -#include "drm_fourcc.h" +#include "drm-uapi/drm_fourcc.h" #include "util/macros.h" #include "vk_util.h" diff --git a/src/vulkan/wsi/wsi_common_display.c b/src/vulkan/wsi/wsi_common_display.c index 08e9e5fe3fc..7ff9d77d88b 100644 --- a/src/vulkan/wsi/wsi_common_display.c +++ b/src/vulkan/wsi/wsi_common_display.c @@ -32,7 +32,7 @@ #include <math.h> #include <xf86drm.h> #include <xf86drmMode.h> -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT #include <xcb/randr.h> #include <X11/Xlib-xcb.h> diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 1bdae7307ac..fac34304044 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -31,7 +31,7 @@ #include <string.h> #include <pthread.h> -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #include "vk_util.h" #include "wsi_common_private.h" diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index 3604fe46786..52d820869a8 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -36,7 +36,7 @@ #include <fcntl.h> #include <poll.h> #include <xf86drm.h> -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #include "util/hash_table.h" #include "vk_util.h" |