On Friday, 2017-12-08 16:27:20 -0800, Dylan Baker wrote:
> Currently that's dri, libgl-xlib, and osmesa.
>
> CC: George Kyriazis <george.kyria...@intel.com>
> Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
> ---
>
> src/gallium/meson.build | 1 -
> src/gallium/targets/dri/meson.build | 4 ++--
> src/gallium/targets/libgl-xlib/meson.build | 2 +-
> src/gallium/targets/osmesa/meson.build | 4 +---
> 4 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/src/gallium/meson.build b/src/gallium/meson.build
> index 3e2fd095710..fc21dcf03e1 100644
> --- a/src/gallium/meson.build
> +++ b/src/gallium/meson.build
> @@ -145,7 +145,6 @@ endif
> if with_gallium_st_nine
> subdir('state_trackers/nine')
> endif
> -# TODO: SWR
> # TODO: clover
> if with_dri
> subdir('state_trackers/dri')
> 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..4b1cad6cb9f 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',
> @@ -56,6 +55,7 @@ libgl = shared_library(
> ],
> dependencies : [
> dep_thread, dep_clock, dep_unwind, dep_lmsensors, driver_swrast,
> + driver_swr,
Nit: separate lines for dep_* and driver_* ?
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
> ],
> install : true,
> version : '1.5.0',
> diff --git a/src/gallium/targets/osmesa/meson.build
> b/src/gallium/targets/osmesa/meson.build
> index cbf0e3d096a..a1b201358c4 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,7 @@ 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,
Ditto
> ],
> version : '8.0.0',
> install : true,
> --
> 2.15.1
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
