fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pipe-loader: introduce pipe_loader_sw_probe_xlib helper

Browse source 
Will be used in the upcoming patches.

v2: handle xlib_create_sw_winsys failure, drop unneeded header

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> (v1)
This commit is contained in:
Emil Velikov 2014-02-10 20:19:20 +00:00
parent 6325fdd6cf
commit cc3aeacab6
3 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/auxiliary/pipe-loader/Makefile.am
View file

@ -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

18
src/gallium/auxiliary/pipe-loader/pipe_loader.h
View file

@ -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.
*

26
src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
View file

@ -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)
{