Commit d21e95ca authored by Eric Anholt's avatar Eric Anholt

tests: Remove libdrm_vc4 dependency.

The autotools build retains the configure.ac option, while meson folds
vc4 into the default build since we don't have any meson_options.txt
to control parts of the build.
Signed-off-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
Acked-by: Petri Latvala's avatarPetri Latvala <petri.latvala@intel.com>
Acked-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4eb53c7c
......@@ -288,16 +288,12 @@ fi
AM_CONDITIONAL(HAVE_LIBDRM_NOUVEAU, [test "x$NOUVEAU" = xyes])
AC_ARG_ENABLE(vc4, AS_HELP_STRING([--disable-vc4],
[Enable building of vc4 tests (default: auto)]),
[VC4=$enableval], [VC4=auto])
if test "x$VC4" = xauto; then
PKG_CHECK_EXISTS([libdrm_vc4], [VC4=yes], [VC4=no])
fi
[Enable building of vc4 tests (default: yes)]),
[VC4=$enableval], [VC4=yes])
if test "x$VC4" = xyes; then
PKG_CHECK_MODULES(DRM_VC4, [libdrm_vc4])
AC_DEFINE(HAVE_LIBDRM_VC4, 1, [Have vc4 support])
AC_DEFINE(BUILD_VC4, 1, [Have vc4 support])
fi
AM_CONDITIONAL(HAVE_LIBDRM_VC4, [test "x$VC4" = xyes])
AM_CONDITIONAL(BUILD_VC4, [test "x$VC4" = xyes])
# Define a configure option for the shader debugger
AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
......
......@@ -10,7 +10,7 @@ libintel_tools_la_SOURCES = $(lib_source_list)
noinst_LTLIBRARIES = libintel_tools.la
noinst_HEADERS = check-ndebug.h
if HAVE_LIBDRM_VC4
if BUILD_VC4
libintel_tools_la_SOURCES += \
igt_vc4.c \
igt_vc4.h
......
......@@ -47,6 +47,7 @@ lib_headers = [
'igt_dummyload.h',
'uwildmat/uwildmat.h',
'igt_kmod.h',
'igt_vc4.h',
]
lib_sources = [
......@@ -95,6 +96,7 @@ lib_sources = [
'igt_dummyload.c',
'uwildmat/uwildmat.c',
'igt_kmod.c',
'igt_vc4.c',
]
lib_deps = [
......@@ -118,10 +120,6 @@ else
lib_sources += 'stubs/drm/intel_bufmgr.c'
endif
if libdrm_vc4.found()
lib_headers += 'igt_vc4.h'
lib_sources += 'igt_vc4.c'
endif
if valgrind.found()
lib_deps += valgrind
endif
......
......@@ -32,7 +32,6 @@ config = configuration_data()
libdrm = dependency('libdrm', version : '>=2.4.82')
libdrm_intel = dependency('libdrm_intel', required : false)
libdrm_vc4 = dependency('libdrm_vc4', required : false)
libdrm_nouveau = dependency('libdrm_nouveau', required : false)
libdrm_amdgpu = dependency('libdrm_amdgpu', required : false)
......
......@@ -10,7 +10,7 @@ if HAVE_LIBDRM_NOUVEAU
TESTS_progs += $(NOUVEAU_TESTS)
endif
if HAVE_LIBDRM_VC4
if BUILD_VC4
TESTS_progs += $(VC4_TESTS)
endif
......@@ -143,16 +143,6 @@ prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
vc4_create_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
vc4_create_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS)
vc4_lookup_fail_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
vc4_lookup_fail_LDADD = $(LDADD) $(DRM_VC4_LIBS)
vc4_dmabuf_poll_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
vc4_dmabuf_poll_LDADD = $(LDADD) $(DRM_VC4_LIBS)
vc4_wait_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
vc4_wait_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS)
vc4_wait_seqno_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS)
vc4_wait_seqno_LDADD = $(LDADD) $(DRM_VC4_LIBS)
kms_chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS)
kms_chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS)
......
......@@ -213,6 +213,11 @@ test_progs = [
'syncobj_wait',
'template',
'tools_test',
'vc4_create_bo',
'vc4_dmabuf_poll',
'vc4_lookup_fail',
'vc4_wait_bo',
'vc4_wait_seqno',
'vgem_basic',
'vgem_slow',
]
......@@ -238,17 +243,6 @@ if libdrm_nouveau.found()
test_deps += libdrm_nouveau
endif
if libdrm_vc4.found()
test_progs += [
'vc4_create_bo',
'vc4_dmabuf_poll',
'vc4_lookup_fail',
'vc4_wait_bo',
'vc4_wait_seqno',
]
test_deps += libdrm_vc4
endif
if chamelium.found()
test_progs += [
'kms_chamelium',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment