diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/auxiliary/pipe-loader/Makefile.am | 4 | ||||
-rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader.h | 18 | ||||
-rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 26 |
3 files changed, 45 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am index ccdbea56d7a..232fe40f12e 100644 --- a/src/gallium/auxiliary/pipe-loader/Makefile.am +++ b/src/gallium/auxiliary/pipe-loader/Makefile.am @@ -8,6 +8,10 @@ AM_CPPFLAGS = $(DEFINES) \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/winsys +if NEED_WINSYS_XLIB +AM_CPPFLAGS += -DHAVE_WINSYS_XLIB +endif + noinst_LTLIBRARIES = if HAVE_LOADER_GALLIUM diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h index ce2118f7baa..315ab32fde0 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h @@ -35,6 +35,10 @@ #include "pipe/p_compiler.h" +#ifdef HAVE_WINSYS_XLIB +#include <X11/Xlib.h> +#endif + #ifdef __cplusplus extern "C" { #endif @@ -100,6 +104,20 @@ pipe_loader_create_screen(struct pipe_loader_device *dev, void pipe_loader_release(struct pipe_loader_device **devs, int ndev); +#ifdef HAVE_WINSYS_XLIB + +/** + * Initialize Xlib for an associated display. + * + * This function is platform-specific. + * + * \sa pipe_loader_probe + */ +bool +pipe_loader_sw_probe_xlib(struct pipe_loader_device **devs, Display *display); + +#endif + /** * 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 90d2975fd43..7e2585e1c7b 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c @@ -44,12 +44,32 @@ struct pipe_loader_sw_device { static struct pipe_loader_ops pipe_loader_sw_ops; static struct sw_winsys *(*backends[])() = { -#ifdef HAVE_WINSYS_XLIB - x11_sw_create, -#endif null_sw_create }; +#ifdef HAVE_WINSYS_XLIB +bool +pipe_loader_sw_probe_xlib(struct pipe_loader_device **devs, Display *display) +{ + 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 = xlib_create_sw_winsys(display); + if (!sdev->ws) { + FREE(sdev); + return false; + } + *devs = &sdev->base; + + return true; +} +#endif + int pipe_loader_sw_probe(struct pipe_loader_device **devs, int ndev) { |