diff options
| author | Christoph Bumiller <christoph.bumiller@speed.at> | 2014-11-17 16:58:24 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-11-18 02:23:10 +0000 |
| commit | 7bbf0836c829ecea289ff5cdcd8a99a12d836656 (patch) | |
| tree | 70c2b53d33f7e3b9d1a85b877a608750e2599889 | |
| parent | 8d6963f005b4406bd1ac225e19fc37a97220ef0f (diff) | |
gallium/auxiliary: implement sw_probe_wrapped (v2)
Implement pipe_loader_sw_probe_wrapped which allows to use the wrapped
software renderer backend when using the pipe loader.
v2: - remove unneeded ifdef
- use GALLIUM_PIPE_LOADER_WINSYS_LIBS
- check for CALLOC_STRUCT
thanks to Emil Velikov
Acked-by: Jose Fonseca <jfonseca@vmware.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
(cherry picked from commit e23d63cffd6103b8073c61f2740eb654c5c9b2c3)
| -rw-r--r-- | src/gallium/Automake.inc | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader.h | 11 | ||||
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 23 |
3 files changed, 36 insertions, 1 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index c43f735c3f3..9b312b113ea 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -58,7 +58,8 @@ GALLIUM_WINSYS_CFLAGS = \ GALLIUM_PIPE_LOADER_WINSYS_LIBS = \ - $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la + $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ + $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la if HAVE_DRISW GALLIUM_PIPE_LOADER_WINSYS_LIBS += \ diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h index 6127a6ac3c0..9f43f17a6e2 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h @@ -166,6 +166,17 @@ pipe_loader_sw_probe_null(struct pipe_loader_device **devs); int pipe_loader_sw_probe(struct pipe_loader_device **devs, int ndev); +/** + * Get a software device wrapped atop another device. + * + * This function is platform-specific. + * + * \sa pipe_loader_probe + */ +boolean +pipe_loader_sw_probe_wrapped(struct pipe_loader_device **dev, + struct pipe_screen *screen); + #ifdef HAVE_PIPE_LOADER_DRM /** diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c index b1b1ca61f7b..3d332645231 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c @@ -31,6 +31,7 @@ #include "util/u_dl.h" #include "sw/dri/dri_sw_winsys.h" #include "sw/null/null_sw_winsys.h" +#include "sw/wrapper/wrapper_sw_winsys.h" #ifdef HAVE_PIPE_LOADER_XLIB /* Explicitly wrap the header to ease build without X11 headers */ #include "sw/xlib/xlib_sw_winsys.h" @@ -140,6 +141,28 @@ pipe_loader_sw_probe(struct pipe_loader_device **devs, int ndev) return i; } +boolean +pipe_loader_sw_probe_wrapped(struct pipe_loader_device **dev, + struct pipe_screen *screen) +{ + 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 = wrapper_sw_winsys_wrap_pipe_screen(screen); + + if (!sdev->ws) { + FREE(sdev); + return false; + } + *dev = &sdev->base; + return true; +} + static void pipe_loader_sw_release(struct pipe_loader_device **dev) { |