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@lists.freedesktop.org> Cc: Ilia Mirkin <imirkin@alum.mit.edu> Cc: Edward O'Callaghan <edward.ocallaghan@koparo.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Tested-by: Oded Gabbay <oded.gabbay@gmail.com> Tested-by: Nick Sarnie <commendsarnex@gmail.com>tags/11.2-branchpoint
| @@ -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; | |||
| @@ -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" | |||
| @@ -1,4 +1,5 @@ | |||
| #include "target-helpers/drm_helper.h" | |||
| #include "target-helpers/sw_helper.h" | |||
| #include "dri_screen.h" | |||
| @@ -1 +1,2 @@ | |||
| #include "target-helpers/drm_helper.h" | |||
| #include "target-helpers/sw_helper.h" | |||
| @@ -1 +1,2 @@ | |||
| #include "target-helpers/drm_helper.h" | |||
| #include "target-helpers/sw_helper.h" | |||
| @@ -1 +1,2 @@ | |||
| #include "target-helpers/drm_helper.h" | |||
| #include "target-helpers/sw_helper.h" | |||
| @@ -1 +1,2 @@ | |||
| #include "target-helpers/drm_helper.h" | |||
| #include "target-helpers/sw_helper.h" | |||