diff options
author | Tim Rowley <[email protected]> | 2017-06-29 14:37:07 -0500 |
---|---|---|
committer | Tim Rowley <[email protected]> | 2017-07-11 13:38:20 -0500 |
commit | f50aa21456d82c8cb6fbaa565835f1acc1720a5d (patch) | |
tree | 1d646268c57b3c42bdeee271d3243964fc6e45ab /src/gallium/drivers/swr/Makefile.am | |
parent | 50cd222116b40e4df2462cb25a92960d557c9144 (diff) |
swr: build driver proper separate from rasterizer
swr used to build and link the rasterizer to the driver, and to support
multiple architectures we needed to have multiple versions of the
driver/rasterizer combination, which needed to link in much of mesa.
Changing to having one instance of the driver and just building
architecture specific versions of the rasterizer gives a large reduction
in disk space.
libGL.so 6464 Kb -> 7000 Kb
libswrAVX.so 10068 Kb -> 5432 Kb
libswrAVX2.so 9828 Kb -> 5200 Kb
Total 26360 Kb -> 17632 Kb
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/drivers/swr/Makefile.am')
-rw-r--r-- | src/gallium/drivers/swr/Makefile.am | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index 4b4bd3793b3..74612280fe7 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -26,7 +26,14 @@ AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX11_CXXFLAGS) noinst_LTLIBRARIES = libmesaswr.la -libmesaswr_la_SOURCES = $(LOADER_SOURCES) +# gen_knobs.* included here to provide driver access to swr configuration +libmesaswr_la_SOURCES = \ + $(CXX_SOURCES) \ + $(COMMON_CXX_SOURCES) \ + $(JITTER_CXX_SOURCES) \ + rasterizer/codegen/gen_knobs.cpp \ + rasterizer/codegen/gen_knobs.h \ + $(LOADER_SOURCES) COMMON_CXXFLAGS = \ -fno-strict-aliasing \ @@ -43,12 +50,15 @@ COMMON_CXXFLAGS = \ -I$(srcdir)/rasterizer/jitter \ -I$(srcdir)/rasterizer/archrast +# SWR_AVX_CXXFLAGS needed for intrinsic usage in swr api headers +libmesaswr_la_CXXFLAGS = \ + $(SWR_AVX_CXXFLAGS) \ + $(COMMON_CXXFLAGS) + COMMON_SOURCES = \ - $(CXX_SOURCES) \ $(ARCHRAST_CXX_SOURCES) \ $(COMMON_CXX_SOURCES) \ $(CORE_CXX_SOURCES) \ - $(JITTER_CXX_SOURCES) \ $(MEMORY_CXX_SOURCES) \ $(BUILT_SOURCES) @@ -207,19 +217,12 @@ rasterizer.intermediate: rasterizer/codegen/gen_backends.py rasterizer/codegen/t --cpp \ --hpp -COMMON_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/mesa/libmesagallium.la \ - $(LLVM_LIBS) - COMMON_LDFLAGS = \ -shared \ -module \ -no-undefined \ $(GC_SECTIONS) \ - $(NO_UNDEFINED) \ - $(LLVM_LDFLAGS) - + $(NO_UNDEFINED) lib_LTLIBRARIES = libswrAVX.la libswrAVX2.la @@ -231,9 +234,6 @@ libswrAVX_la_CXXFLAGS = \ libswrAVX_la_SOURCES = \ $(COMMON_SOURCES) -libswrAVX_la_LIBADD = \ - $(COMMON_LIBADD) - libswrAVX_la_LDFLAGS = \ $(COMMON_LDFLAGS) @@ -245,9 +245,6 @@ libswrAVX2_la_CXXFLAGS = \ libswrAVX2_la_SOURCES = \ $(COMMON_SOURCES) -libswrAVX2_la_LIBADD = \ - $(COMMON_LIBADD) - libswrAVX2_la_LDFLAGS = \ $(COMMON_LDFLAGS) |