diff options
| author | Eric Anholt <[email protected]> | 2017-06-15 16:52:22 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2017-07-12 10:58:33 -0700 |
| commit | a2d87a00191a7cfecfea65185ff1eca3ca958160 (patch) | |
| tree | 4b9ea64df8e02249d570c37a69f343bd670a7258 /src | |
| parent | 5d6271c6a566b71b84ce060a71494467f312b0df (diff) | |
vc4: Switch back to using a local copy of vc4_drm.h.
Needing to get our uapi header from libdrm has only complicated things.
Follow intel's lead and drop our requirement for it.
Generated from the same commit mentioned in the README.
v2: Update Android.mk as well, move vc4_drm.h reference for distcheck.
Reviewed-by: Daniel Stone <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/vc4/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/Makefile.am | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk index f7541385958..8b19e520778 100644 --- a/src/gallium/drivers/vc4/Android.mk +++ b/src/gallium/drivers/vc4/Android.mk @@ -29,6 +29,8 @@ LOCAL_SRC_FILES := \ $(C_SOURCES) LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/include/drm-uapi # 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 0ed49b128b2..576f9b3ad1d 100644 --- a/src/gallium/drivers/vc4/Makefile.am +++ b/src/gallium/drivers/vc4/Makefile.am @@ -28,8 +28,8 @@ endif AM_CFLAGS = \ -I$(top_builddir)/src/compiler/nir \ + -I$(top_srcdir)/include/drm-uapi \ $(LIBDRM_CFLAGS) \ - $(VC4_CFLAGS) \ $(GALLIUM_DRIVER_CFLAGS) \ $(SIM_CFLAGS) \ $(VALGRIND_CFLAGS) \ @@ -38,7 +38,7 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libvc4.la libvc4_la_SOURCES = $(C_SOURCES) -libvc4_la_LIBADD = $(SIM_LIB) $(VC4_LIBS) +libvc4_la_LIBADD = $(SIM_LIB) libvc4_la_LDFLAGS = $(SIM_LDFLAGS) EXTRA_DIST = kernel/README |