[Mesa-stable] [PATCH v2 2/2] targets: use the non-inline sw helpers

[Oded Gabbay]

On Mon, Nov 23, 2015 at 5:28 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Previously (with the inline ones) things were embedded into the
> pipe-loader, which means that we cannot control/select what we want in
> each target.
>
> That also meant that at runtime we ended up with the empty
> sw_screen_create() as the GALLIUM_SOFTPIPE/LLVMPIPE were not set.
>
> v2: Cover all the targets, not just dri.
>
> Cc: "11.1" <mesa-stable at lists.freedesktop.org>
> Cc: Oded Gabbay <oded.gabbay at gmail.com>
> Cc: Ilia Mirkin <imirkin at alum.mit.edu>
> Cc: Edward O'Callaghan <edward.ocallaghan at koparo.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 3 ++-
>  src/gallium/targets/d3dadapter9/drm.c              | 1 +
>  src/gallium/targets/dri/target.c                   | 1 +
>  src/gallium/targets/omx/target.c                   | 1 +
>  src/gallium/targets/va/target.c                    | 1 +
>  src/gallium/targets/vdpau/target.c                 | 1 +
>  src/gallium/targets/xa/target.c                    | 1 +
>  7 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
> index 5539a73..1c38750 100644
> --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
> +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
> @@ -33,9 +33,10 @@
>  #include "sw/kms-dri/kms_dri_sw_winsys.h"
>  #include "sw/null/null_sw_winsys.h"
>  #include "sw/wrapper/wrapper_sw_winsys.h"
> -#include "target-helpers/inline_sw_helper.h"
> +#include "target-helpers/sw_helper_public.h"
>  #include "state_tracker/drisw_api.h"
>  #include "state_tracker/sw_driver.h"
> +#include "state_tracker/sw_winsys.h"
>
>  struct pipe_loader_sw_device {
>     struct pipe_loader_device base;
> diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c
> index ad712db..5cd1ba7 100644
> --- a/src/gallium/targets/d3dadapter9/drm.c
> +++ b/src/gallium/targets/d3dadapter9/drm.c
> @@ -31,6 +31,7 @@
>  #include "pipe/p_state.h"
>
>  #include "target-helpers/drm_helper.h"
> +#include "target-helpers/sw_helper.h"
>  #include "state_tracker/drm_driver.h"
>
>  #include "d3dadapter/d3dadapter9.h"
> diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c
> index d6fbd01..01532e2 100644
> --- a/src/gallium/targets/dri/target.c
> +++ b/src/gallium/targets/dri/target.c
> @@ -1,4 +1,5 @@
>  #include "target-helpers/drm_helper.h"
> +#include "target-helpers/sw_helper.h"
>
>  #include "dri_screen.h"
>
> diff --git a/src/gallium/targets/omx/target.c b/src/gallium/targets/omx/target.c
> index 42b1346..308e23b 100644
> --- a/src/gallium/targets/omx/target.c
> +++ b/src/gallium/targets/omx/target.c
> @@ -1 +1,2 @@
>  #include "target-helpers/drm_helper.h"
> +#include "target-helpers/sw_helper.h"
> diff --git a/src/gallium/targets/va/target.c b/src/gallium/targets/va/target.c
> index 42b1346..308e23b 100644
> --- a/src/gallium/targets/va/target.c
> +++ b/src/gallium/targets/va/target.c
> @@ -1 +1,2 @@
>  #include "target-helpers/drm_helper.h"
> +#include "target-helpers/sw_helper.h"
> diff --git a/src/gallium/targets/vdpau/target.c b/src/gallium/targets/vdpau/target.c
> index 42b1346..308e23b 100644
> --- a/src/gallium/targets/vdpau/target.c
> +++ b/src/gallium/targets/vdpau/target.c
> @@ -1 +1,2 @@
>  #include "target-helpers/drm_helper.h"
> +#include "target-helpers/sw_helper.h"
> diff --git a/src/gallium/targets/xa/target.c b/src/gallium/targets/xa/target.c
> index 42b1346..308e23b 100644
> --- a/src/gallium/targets/xa/target.c
> +++ b/src/gallium/targets/xa/target.c
> @@ -1 +1,2 @@
>  #include "target-helpers/drm_helper.h"
> +#include "target-helpers/sw_helper.h"
> --
> 2.6.2
>

For the series:
Tested-by: Oded Gabbay <oded.gabbay at gmail.com>