diff options
| author | Marek Olšák <[email protected]> | 2018-04-01 20:34:40 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-04-05 15:34:58 -0400 |
| commit | 38faac43e32d58ce7b42d35e11146208f2c7b4e5 (patch) | |
| tree | 3206529216fc7823fac48f87fd90f1d856422c86 /src/gallium/drivers/radeonsi | |
| parent | f9323ddbb9de667475d12f7a9183a855f3f33ac8 (diff) | |
radeonsi: don't build libradeon.la separately
for better parallelism
Acked-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/Automake.inc | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Makefile.am | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Makefile.sources | 22 |
3 files changed, 28 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/Automake.inc b/src/gallium/drivers/radeonsi/Automake.inc index 6f1843a3c64..740648d798b 100644 --- a/src/gallium/drivers/radeonsi/Automake.inc +++ b/src/gallium/drivers/radeonsi/Automake.inc @@ -16,7 +16,6 @@ TARGET_RADEON_WINSYS = \ $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la TARGET_RADEON_COMMON = \ - $(top_builddir)/src/gallium/drivers/radeon/libradeon.la \ $(top_builddir)/src/amd/common/libamd_common.la endif diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am index b39c55944cd..62b877d4ea4 100644 --- a/src/gallium/drivers/radeonsi/Makefile.am +++ b/src/gallium/drivers/radeonsi/Makefile.am @@ -37,6 +37,13 @@ noinst_LTLIBRARIES = libradeonsi.la libradeonsi_la_SOURCES = $(C_SOURCES) +libradeonsi_la_LIBADD = \ + $(CLOCK_LIB) \ + $(LLVM_LIBS) + +libradeonsi_la_LDFLAGS = \ + $(LLVM_LDFLAGS) + GEN_DRIINFO_INPUTS = \ $(top_srcdir)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \ $(srcdir)/driinfo_radeonsi.h diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources index 3b1726d17dc..6117005cbd3 100644 --- a/src/gallium/drivers/radeonsi/Makefile.sources +++ b/src/gallium/drivers/radeonsi/Makefile.sources @@ -44,4 +44,24 @@ C_SOURCES := \ si_state.h \ si_test_dma.c \ si_texture.c \ - si_uvd.c + si_uvd.c \ + ../radeon/r600_perfcounter.c \ + ../radeon/r600_pipe_common.h \ + ../radeon/radeon_uvd.c \ + ../radeon/radeon_uvd.h \ + ../radeon/radeon_vcn_dec.c \ + ../radeon/radeon_vcn_dec.h \ + ../radeon/radeon_vcn_enc_1_2.c \ + ../radeon/radeon_vcn_enc.c \ + ../radeon/radeon_vcn_enc.h \ + ../radeon/radeon_uvd_enc_1_1.c \ + ../radeon/radeon_uvd_enc.c \ + ../radeon/radeon_uvd_enc.h \ + ../radeon/radeon_vce_40_2_2.c \ + ../radeon/radeon_vce_50.c \ + ../radeon/radeon_vce_52.c \ + ../radeon/radeon_vce.c \ + ../radeon/radeon_vce.h \ + ../radeon/radeon_video.c \ + ../radeon/radeon_video.h \ + ../radeon/radeon_winsys.h |