diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-02-12 18:18:03 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2019-02-14 11:20:00 +0000 |
| commit | f1374805a86d0d506557e61efbc09e23caa7a038 (patch) | |
| tree | 8227048a718d8080b00c1f1a9817033ce38e6cd9 /src/loader | |
| 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 <eric.engestrom@intel.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Diffstat (limited to 'src/loader')
| -rw-r--r-- | src/loader/Makefile.am | 1 | ||||
| -rw-r--r-- | src/loader/loader_dri3_helper.c | 2 | ||||
| -rw-r--r-- | src/loader/meson.build | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am index 3c22e0ae7e6..fbefdaee5da 100644 --- a/src/loader/Makefile.am +++ b/src/loader/Makefile.am @@ -31,7 +31,6 @@ AM_CPPFLAGS = \ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ $(DEFINES) \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/drm-uapi \ -I$(top_srcdir)/src \ $(VISIBILITY_CFLAGS) \ $(XCB_DRI3_CFLAGS) \ diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c index 7d61c1df4fc..7ef59f0477b 100644 --- a/src/loader/loader_dri3_helper.c +++ b/src/loader/loader_dri3_helper.c @@ -35,7 +35,7 @@ #include "loader_dri3_helper.h" #include "util/macros.h" -#include "drm_fourcc.h" +#include "drm-uapi/drm_fourcc.h" /* From xmlpool/options.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 diff --git a/src/loader/meson.build b/src/loader/meson.build index e280ba41cc2..69c81688bf4 100644 --- a/src/loader/meson.build +++ b/src/loader/meson.build @@ -25,7 +25,7 @@ if with_platform_x11 and with_dri3 'loader_dri3_helper', ['loader_dri3_helper.c', 'loader_dri3_helper.h'], c_args : c_vis_args, - include_directories : [inc_include, inc_src, inc_drm_uapi], + include_directories : [inc_include, inc_src], dependencies : [ dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence, ], |