diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/gallium/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/Makefile.am | 29 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/Makefile.sources | 21 | ||||
| -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 | ||||
| -rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 1 |
8 files changed, 28 insertions, 60 deletions
diff --git a/configure.ac b/configure.ac index e874f8ebfb2..c0318c1f179 100644 --- a/configure.ac +++ b/configure.ac @@ -2868,7 +2868,6 @@ AM_CONDITIONAL(HAVE_GALLIUM_PL111, test "x$HAVE_GALLIUM_PL111" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_R300, test "x$HAVE_GALLIUM_R300" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_R600, test "x$HAVE_GALLIUM_R600" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_RADEONSI, test "x$HAVE_GALLIUM_RADEONSI" = xyes) -AM_CONDITIONAL(HAVE_GALLIUM_RADEON_COMMON, test "x$HAVE_GALLIUM_RADEONSI" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_NOUVEAU, test "x$HAVE_GALLIUM_NOUVEAU" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_FREEDRENO, test "x$HAVE_GALLIUM_FREEDRENO" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_ETNAVIV, test "x$HAVE_GALLIUM_ETNAVIV" = xyes) @@ -3020,7 +3019,6 @@ AC_CONFIG_FILES([Makefile src/gallium/drivers/pl111/Makefile src/gallium/drivers/r300/Makefile src/gallium/drivers/r600/Makefile - src/gallium/drivers/radeon/Makefile src/gallium/drivers/radeonsi/Makefile src/gallium/drivers/rbug/Makefile src/gallium/drivers/softpipe/Makefile diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index 8170c9043da..f1fd22cece2 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -42,11 +42,6 @@ if HAVE_GALLIUM_R300 SUBDIRS += drivers/r300 endif -## radeon - linked into radeonsi -if HAVE_GALLIUM_RADEON_COMMON -SUBDIRS += drivers/radeon -endif - ## r600 if HAVE_GALLIUM_R600 SUBDIRS += drivers/r600 diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am deleted file mode 100644 index 1e1d49efd19..00000000000 --- a/src/gallium/drivers/radeon/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -include Makefile.sources -include $(top_srcdir)/src/gallium/Automake.inc - - -AM_CFLAGS = \ - $(GALLIUM_DRIVER_CFLAGS) \ - $(RADEON_CFLAGS) \ - -I$(top_srcdir)/src/amd/common - -noinst_LTLIBRARIES = libradeon.la - -libradeon_la_SOURCES = \ - $(C_SOURCES) - -if HAVE_GALLIUM_LLVM - -AM_CFLAGS += \ - $(LLVM_CFLAGS) - -libradeon_la_LIBADD = \ - $(CLOCK_LIB) \ - $(LLVM_LIBS) - -libradeon_la_LDFLAGS = \ - $(LLVM_LDFLAGS) - -endif - -EXTRA_DIST = meson.build diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources deleted file mode 100644 index fbd1ab697a9..00000000000 --- a/src/gallium/drivers/radeon/Makefile.sources +++ /dev/null @@ -1,21 +0,0 @@ -C_SOURCES := \ - r600_perfcounter.c \ - r600_pipe_common.h \ - radeon_uvd.c \ - radeon_uvd.h \ - radeon_vcn_dec.c \ - radeon_vcn_dec.h \ - radeon_vcn_enc_1_2.c \ - radeon_vcn_enc.c \ - radeon_vcn_enc.h \ - radeon_uvd_enc_1_1.c \ - radeon_uvd_enc.c \ - radeon_uvd_enc.h \ - radeon_vce_40_2_2.c \ - radeon_vce_50.c \ - radeon_vce_52.c \ - radeon_vce.c \ - radeon_vce.h \ - radeon_video.c \ - radeon_video.h \ - radeon_winsys.h 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 diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 4b84886f300..bddc4e8b584 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -143,7 +143,6 @@ pipe_radeonsi_la_LIBADD = \ $(PIPE_LIBS) \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la \ - $(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 \ |