diff options
| author | Dylan Baker <[email protected]> | 2017-11-29 17:53:54 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-01-08 16:39:37 -0800 |
| commit | 425fcbde3f816e2a2efb8d1aed2442d40898d447 (patch) | |
| tree | 70ecfb28652afab9df8d8edb342dce4ce1debdbd /src/gallium/targets | |
| parent | e0b037d6979b266d4959c1e31746d4d19c941fdb (diff) | |
meson: Turn on swr for relevant targets
Currently that's dri, libgl-xlib, and osmesa.
v2: - put drivers on a separate line from normal dependencies (Eric E)
cc: George Kyriazis <[email protected]>
cc: Tim Rowley <[email protected]>
cc: Bruce Cherniak <[email protected]>
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri/meson.build | 4 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/meson.build | 4 | ||||
| -rw-r--r-- | src/gallium/targets/osmesa/meson.build | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 5ca7b015d91..edf8d67fe39 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -69,7 +69,7 @@ libgallium_dri = shared_library( dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_lmsensors, dep_thread, driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, driver_pl111, driver_vc4, driver_vc5, driver_freedreno, driver_etnaviv, - driver_imx, driver_i915, driver_svga, driver_virgl, + driver_imx, driver_i915, driver_svga, driver_virgl, driver_swr, ], ) @@ -77,7 +77,7 @@ foreach d : [[with_gallium_pl111, 'pl111_dri.so'], [with_gallium_radeonsi, 'radeonsi_dri.so'], [with_gallium_nouveau, 'nouveau_dri.so'], [with_gallium_freedreno, ['msm_dri.so', 'kgsl_dri.so']], - [with_gallium_softpipe, 'swrast_dri.so'], + [with_gallium_softpipe or with_gallium_swr, 'swrast_dri.so'], [with_gallium_softpipe and with_gallium_drisw_kms, 'kms_swrast_dri.so'], [with_gallium_vc4, 'vc4_dri.so'], [with_gallium_vc5, 'vc5_dri.so'], diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build index c413a25bd66..6c8d2b4bc0e 100644 --- a/src/gallium/targets/libgl-xlib/meson.build +++ b/src/gallium/targets/libgl-xlib/meson.build @@ -38,7 +38,6 @@ endif if with_shared_glapi gallium_xlib_link_with += libglapi endif -# TODO: SWR libgl = shared_library( 'GL', @@ -55,7 +54,8 @@ libgl = shared_library( libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with, ], dependencies : [ - dep_thread, dep_clock, dep_unwind, dep_lmsensors, driver_swrast, + dep_thread, dep_clock, dep_unwind, dep_lmsensors, + driver_swrast, driver_swr, ], install : true, version : '1.5.0', diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index cbf0e3d096a..e51c54f8bc4 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -32,8 +32,6 @@ if with_ld_version_script osmesa_link_deps += files('osmesa.sym') endif -# TODO: swr - libosmesa = shared_library( osmesa_lib_name, 'target.c', @@ -51,7 +49,8 @@ libosmesa = shared_library( osmesa_link_with, ], dependencies : [ - dep_selinux, dep_thread, dep_clock, dep_unwind, driver_swrast, + dep_selinux, dep_thread, dep_clock, dep_unwind, + driver_swrast, driver_swr, ], version : '8.0.0', install : true, |