diff options
Diffstat (limited to 'src/gallium/drivers/vc4')
| -rw-r--r-- | src/gallium/drivers/vc4/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_context.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_resource.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_screen.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk index fc141de3ca8..45c95b649a2 100644 --- a/src/gallium/drivers/vc4/Android.mk +++ b/src/gallium/drivers/vc4/Android.mk @@ -34,7 +34,7 @@ endif LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include/drm-uapi + $(MESA_TOP)/include # We need libmesa_nir to get NIR's generated include directories. LOCAL_STATIC_LIBRARIES := \ diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am index 4c7dd843da5..585ff20e6cf 100644 --- a/src/gallium/drivers/vc4/Makefile.am +++ b/src/gallium/drivers/vc4/Makefile.am @@ -28,7 +28,7 @@ endif AM_CFLAGS = \ -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/broadcom \ -I$(top_builddir)/src/broadcom \ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build index 0d7a03cd242..617578d4593 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build @@ -106,7 +106,7 @@ libvc4 = static_library( [files_libvc4, v3d_xml_pack], include_directories : [ inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom, - inc_gallium_drivers, inc_drm_uapi, + inc_gallium_drivers, ], link_with: libvc4_neon, c_args : [c_vis_args, vc4_c_args], diff --git a/src/gallium/drivers/vc4/vc4_context.h b/src/gallium/drivers/vc4/vc4_context.h index 1d3179c719c..e7cb831774c 100644 --- a/src/gallium/drivers/vc4/vc4_context.h +++ b/src/gallium/drivers/vc4/vc4_context.h @@ -33,7 +33,7 @@ #include "xf86drm.h" #define __user -#include "vc4_drm.h" +#include "drm-uapi/vc4_drm.h" #include "vc4_bufmgr.h" #include "vc4_resource.h" #include "vc4_cl.h" diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c index a4d1b903bce..c12187d7872 100644 --- a/src/gallium/drivers/vc4/vc4_resource.c +++ b/src/gallium/drivers/vc4/vc4_resource.c @@ -31,8 +31,8 @@ #include "util/u_transfer_helper.h" #include "util/u_upload_mgr.h" -#include "drm_fourcc.h" -#include "vc4_drm.h" +#include "drm-uapi/drm_fourcc.h" +#include "drm-uapi/vc4_drm.h" #include "vc4_screen.h" #include "vc4_context.h" #include "vc4_resource.h" diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c index acb4a1feb0d..5fc8c35f8a9 100644 --- a/src/gallium/drivers/vc4/vc4_screen.c +++ b/src/gallium/drivers/vc4/vc4_screen.c @@ -37,8 +37,8 @@ #include "util/ralloc.h" #include <xf86drm.h> -#include "drm_fourcc.h" -#include "vc4_drm.h" +#include "drm-uapi/drm_fourcc.h" +#include "drm-uapi/vc4_drm.h" #include "vc4_screen.h" #include "vc4_context.h" #include "vc4_resource.h" |