From 33f7d71d5358337f08ce0bb94f5e915bda77748c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Wed, 2 Aug 2017 17:26:46 +0200 Subject: [PATCH] pipe-loader: fix build of dynamic pipe-drivers v2: add libxmlconfig.la to the dynamic pipe_radeonsi driver v3: add libxmlconfig.la to targets/opencl build v4: add EXPAT_LIBS to opencl build (note: for only-opencl builds, Emil's configure.ac changes are also needed) Fixes: bc7f41e11d3 ("gallium: add pipe_screen_config to screen_create functions") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102014 Tested-by: Andy Furniss Reviewed-by: Emil Velikov (v1) --- src/gallium/targets/opencl/Makefile.am | 2 ++ src/gallium/targets/pipe-loader/Makefile.am | 1 + src/gallium/targets/pipe-loader/pipe_r300.c | 2 +- src/gallium/targets/pipe-loader/pipe_r600.c | 2 +- src/gallium/targets/pipe-loader/pipe_radeonsi.c | 4 ++-- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index 99532f06d81..e88fa0fd382 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -19,6 +19,8 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/clover/libclover.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ + $(top_builddir)/src/util/libxmlconfig.la \ + $(EXPAT_LIBS) \ $(LIBELF_LIBS) \ $(DLOPEN_LIBS) \ -lclangCodeGen \ diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 400b198fe29..db492c5023d 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -146,6 +146,7 @@ pipe_radeonsi_la_LIBADD = \ $(top_builddir)/src/gallium/drivers/radeon/libradeon.la \ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ $(top_builddir)/src/amd/common/libamd_common.la \ + $(top_builddir)/src/util/libxmlconfig.la \ $(LIBDRM_LIBS) \ $(RADEON_LIBS) \ $(AMDGPU_LIBS) diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c index 0dcc0191dfb..8aa1ba8735c 100644 --- a/src/gallium/targets/pipe-loader/pipe_r300.c +++ b/src/gallium/targets/pipe-loader/pipe_r300.c @@ -9,7 +9,7 @@ create_screen(int fd, const struct pipe_screen_config *config) { struct radeon_winsys *sws; - sws = radeon_drm_winsys_create(fd, flags, r300_screen_create); + sws = radeon_drm_winsys_create(fd, config, r300_screen_create); return sws ? debug_screen_wrap(sws->screen) : NULL; } diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c index 0eedde76bef..a6051aa2258 100644 --- a/src/gallium/targets/pipe-loader/pipe_r600.c +++ b/src/gallium/targets/pipe-loader/pipe_r600.c @@ -9,7 +9,7 @@ create_screen(int fd, const struct pipe_screen_config *config) { struct radeon_winsys *rw; - rw = radeon_drm_winsys_create(fd, flags, r600_screen_create); + rw = radeon_drm_winsys_create(fd, config, r600_screen_create); return rw ? debug_screen_wrap(rw->screen) : NULL; } diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c index 2d33d0e336c..2defc521b24 100644 --- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c +++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c @@ -12,10 +12,10 @@ create_screen(int fd, const struct pipe_screen_config *config) struct radeon_winsys *rw; /* First, try amdgpu. */ - rw = amdgpu_winsys_create(fd, flags, radeonsi_screen_create); + rw = amdgpu_winsys_create(fd, config, radeonsi_screen_create); if (!rw) - rw = radeon_drm_winsys_create(fd, flags, radeonsi_screen_create); + rw = radeon_drm_winsys_create(fd, config, radeonsi_screen_create); return rw ? debug_screen_wrap(rw->screen) : NULL; } -- 2.30.2