From f1374805a86d0d506557e61efbc09e23caa7a038 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 12 Feb 2019 18:18:03 +0000 Subject: 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 Reviewed-by: Kristian H. Kristensen --- src/intel/isl/isl_drm.c | 4 ++-- src/intel/isl/meson.build | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/intel/isl') diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c index e16d7b63917..e7abe747785 100644 --- a/src/intel/isl/isl_drm.c +++ b/src/intel/isl/isl_drm.c @@ -24,8 +24,8 @@ #include #include -#include -#include +#include "drm-uapi/drm_fourcc.h" +#include "drm-uapi/i915_drm.h" #include "isl.h" #include "dev/gen_device_info.h" diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 79eb6686059..9117afb4228 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -81,7 +81,7 @@ isl_tiled_memcpy = static_library( 'isl_tiled_memcpy', [files_isl_tiled_memcpy], include_directories : [ - inc_common, inc_intel, inc_drm_uapi, + inc_common, inc_intel, inc_include, ], c_args : [c_vis_args, no_override_init_args, '-msse2'], extra_files : ['isl_tiled_memcpy.c'] @@ -92,7 +92,7 @@ if with_sse41 'isl_tiled_memcpy_sse41', [files_isl_tiled_memcpy_sse41], include_directories : [ - inc_common, inc_intel, inc_drm_uapi, + inc_common, inc_intel, inc_include, ], link_args : ['-Wl,--exclude-libs=ALL'], c_args : [c_vis_args, no_override_init_args, '-msse2', sse41_args], @@ -115,7 +115,7 @@ libisl_files = files( libisl = static_library( 'isl', [libisl_files, isl_format_layout_c, genX_bits_h], - include_directories : [inc_common, inc_intel, inc_drm_uapi], + include_directories : [inc_common, inc_intel, inc_include], link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41], c_args : [c_vis_args, no_override_init_args], ) -- cgit v1.2.3