pipe-loader: remove pipe_loader_sw_probe_xlib
It was only useful for st/egl, although I've never got to merging the pipe-loader and inline-helpers before it was removed. There are no users for it ATM. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
parent
c73d30dfe9
commit
132031b110
13
configure.ac
13
configure.ac
|
@ -953,11 +953,9 @@ dnl
|
||||||
dnl Driver specific build directories
|
dnl Driver specific build directories
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
case "x$enable_glx$enable_xlib_glx" in
|
if test -n "$with_gallium_drivers" -a "x$enable_glx$enable_xlib_glx" = xyesyes; then
|
||||||
xyesyes)
|
|
||||||
NEED_WINSYS_XLIB="yes"
|
NEED_WINSYS_XLIB="yes"
|
||||||
;;
|
fi
|
||||||
esac
|
|
||||||
|
|
||||||
if test "x$enable_dri" = xyes; then
|
if test "x$enable_dri" = xyes; then
|
||||||
enable_gallium_loader="$enable_shared_pipe_drivers"
|
enable_gallium_loader="$enable_shared_pipe_drivers"
|
||||||
|
@ -1806,9 +1804,6 @@ else
|
||||||
EGL_NATIVE_PLATFORM="_EGL_INVALID_PLATFORM"
|
EGL_NATIVE_PLATFORM="_EGL_INVALID_PLATFORM"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if echo "$egl_platforms" | grep -q 'x11'; then
|
|
||||||
NEED_WINSYS_XLIB=yes
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11')
|
AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11')
|
||||||
AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland')
|
AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland')
|
||||||
AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
|
AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm')
|
||||||
|
@ -2232,10 +2227,6 @@ AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "x$enable_shared_pipe_drivers"
|
||||||
# use by XA tracker in particular, but could be used in any case
|
# use by XA tracker in particular, but could be used in any case
|
||||||
# where communication with xserver is not desired).
|
# where communication with xserver is not desired).
|
||||||
if test "x$enable_gallium_loader" = xyes; then
|
if test "x$enable_gallium_loader" = xyes; then
|
||||||
if test "x$NEED_WINSYS_XLIB" = xyes; then
|
|
||||||
GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$enable_dri" = xyes; then
|
if test "x$enable_dri" = xyes; then
|
||||||
GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_DRI"
|
GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_DRI"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -67,10 +67,3 @@ if HAVE_DRISW
|
||||||
GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
|
GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
|
||||||
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
|
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if NEED_WINSYS_XLIB
|
|
||||||
GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
|
|
||||||
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
|
|
||||||
-lX11 -lXext -lXfixes \
|
|
||||||
$(LIBDRM_LIBS)
|
|
||||||
endif
|
|
||||||
|
|
|
@ -36,10 +36,6 @@
|
||||||
#include "pipe/p_compiler.h"
|
#include "pipe/p_compiler.h"
|
||||||
#include "state_tracker/drm_driver.h"
|
#include "state_tracker/drm_driver.h"
|
||||||
|
|
||||||
#ifdef HAVE_PIPE_LOADER_XLIB
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
@ -116,21 +112,6 @@ pipe_loader_configuration(struct pipe_loader_device *dev,
|
||||||
void
|
void
|
||||||
pipe_loader_release(struct pipe_loader_device **devs, int ndev);
|
pipe_loader_release(struct pipe_loader_device **devs, int ndev);
|
||||||
|
|
||||||
#ifdef HAVE_PIPE_LOADER_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
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef HAVE_PIPE_LOADER_DRI
|
#ifdef HAVE_PIPE_LOADER_DRI
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -32,10 +32,6 @@
|
||||||
#include "sw/dri/dri_sw_winsys.h"
|
#include "sw/dri/dri_sw_winsys.h"
|
||||||
#include "sw/null/null_sw_winsys.h"
|
#include "sw/null/null_sw_winsys.h"
|
||||||
#include "sw/wrapper/wrapper_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"
|
|
||||||
#endif
|
|
||||||
#include "target-helpers/inline_sw_helper.h"
|
#include "target-helpers/inline_sw_helper.h"
|
||||||
#include "state_tracker/drisw_api.h"
|
#include "state_tracker/drisw_api.h"
|
||||||
|
|
||||||
|
@ -53,29 +49,6 @@ static struct sw_winsys *(*backends[])() = {
|
||||||
null_sw_create
|
null_sw_create
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAVE_PIPE_LOADER_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
|
|
||||||
|
|
||||||
#ifdef HAVE_PIPE_LOADER_DRI
|
#ifdef HAVE_PIPE_LOADER_DRI
|
||||||
bool
|
bool
|
||||||
pipe_loader_sw_probe_dri(struct pipe_loader_device **devs, struct drisw_loader_funcs *drisw_lf)
|
pipe_loader_sw_probe_dri(struct pipe_loader_device **devs, struct drisw_loader_funcs *drisw_lf)
|
||||||
|
|
Loading…
Reference in New Issue