From 969e8d15b77434a0505e883557529ed1073583a6 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 22 Feb 2014 03:21:40 +0000 Subject: [PATCH] pipe-loader: introduce pipe_loader_sw_probe_dri helper Will be used in the following commits. v2: Link gallium tests against the library. v3: Handle dri_create_sw_winsys failure v4: Rebase on top of the targets/xa changes Signed-off-by: Emil Velikov Reviewed-by: Jakob Bornecrantz (v2) --- .../auxiliary/pipe-loader/pipe_loader.h | 13 +++++++++++ .../auxiliary/pipe-loader/pipe_loader_sw.c | 23 +++++++++++++++++++ src/gallium/tests/trivial/Makefile.am | 1 + 3 files changed, 37 insertions(+) diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h index 315ab32fde0..9a461608d99 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h @@ -44,6 +44,7 @@ extern "C" { #endif struct pipe_screen; +struct drisw_loader_funcs; enum pipe_loader_device_type { PIPE_LOADER_DEVICE_SOFTWARE, @@ -118,6 +119,18 @@ pipe_loader_sw_probe_xlib(struct pipe_loader_device **devs, Display *display); #endif +/** + * Initialize sw dri device give the drisw_loader_funcs. + * + * This function is platform-specific. + * + * \sa pipe_loader_probe + */ +bool +pipe_loader_sw_probe_dri(struct pipe_loader_device **devs, + struct drisw_loader_funcs *drisw_lf); + + /** * Get a list of known software devices. * diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c index 7e2585e1c7b..abc87a2c744 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c @@ -29,9 +29,11 @@ #include "util/u_memory.h" #include "util/u_dl.h" +#include "sw/dri/dri_sw_winsys.h" #include "sw/null/null_sw_winsys.h" #include "sw/xlib/xlib_sw_winsys.h" #include "target-helpers/inline_sw_helper.h" +#include "state_tracker/drisw_api.h" struct pipe_loader_sw_device { struct pipe_loader_device base; @@ -70,6 +72,27 @@ pipe_loader_sw_probe_xlib(struct pipe_loader_device **devs, Display *display) } #endif +bool +pipe_loader_sw_probe_dri(struct pipe_loader_device **devs, struct drisw_loader_funcs *drisw_lf) +{ + struct pipe_loader_sw_device *sdev = CALLOC_STRUCT(pipe_loader_sw_device); + + if (!sdev) + return false; + + sdev->base.type = PIPE_LOADER_DEVICE_SOFTWARE; + sdev->base.driver_name = "swrast"; + sdev->base.ops = &pipe_loader_sw_ops; + sdev->ws = dri_create_sw_winsys(drisw_lf); + if (!sdev->ws) { + FREE(sdev); + return false; + } + *devs = &sdev->base; + + return true; +} + int pipe_loader_sw_probe(struct pipe_loader_device **devs, int ndev) { diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am index debb2e24e91..656ee64e0f5 100644 --- a/src/gallium/tests/trivial/Makefile.am +++ b/src/gallium/tests/trivial/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \ + $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(DLOPEN_LIBS) \ -- 2.30.2