projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pipe-loader: check if winsys.name is non-null prior to strcmp
[mesa.git]
/
src
/
gallium
/
auxiliary
/
pipe-loader
/
pipe_loader.h
diff --git
a/src/gallium/auxiliary/pipe-loader/pipe_loader.h
b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
index 9f43f17a6e23cec0d9f8526a31b882f3adcc138a..690d088ed82e4bf309b042b6d1e253f45944d325 100644
(file)
--- a/
src/gallium/auxiliary/pipe-loader/pipe_loader.h
+++ b/
src/gallium/auxiliary/pipe-loader/pipe_loader.h
@@
-36,10
+36,6
@@
#include "pipe/p_compiler.h"
#include "state_tracker/drm_driver.h"
#include "pipe/p_compiler.h"
#include "state_tracker/drm_driver.h"
-#ifdef HAVE_PIPE_LOADER_XLIB
-#include <X11/Xlib.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
@@
-86,13
+82,9
@@
pipe_loader_probe(struct pipe_loader_device **devs, int ndev);
* Create a pipe_screen for the specified device.
*
* \param dev Device the screen will be created for.
* Create a pipe_screen for the specified device.
*
* \param dev Device the screen will be created for.
- * \param library_paths Colon-separated list of filesystem paths that
- * will be used to look for the pipe driver
- * module that handles this device.
*/
struct pipe_screen *
*/
struct pipe_screen *
-pipe_loader_create_screen(struct pipe_loader_device *dev,
- const char *library_paths);
+pipe_loader_create_screen(struct pipe_loader_device *dev);
/**
* Query the configuration parameters for the specified device.
/**
* Query the configuration parameters for the specified device.
@@
-116,35
+108,26
@@
pipe_loader_configuration(struct pipe_loader_device *dev,
void
pipe_loader_release(struct pipe_loader_device **devs, int ndev);
void
pipe_loader_release(struct pipe_loader_device **devs, int ndev);
-#ifdef HAVE_PIPE_LOADER_XLIB
-
/**
/**
- * Initialize
Xlib for an associated display
.
+ * Initialize
sw dri device give the drisw_loader_funcs
.
*
* This function is platform-specific.
*
* \sa pipe_loader_probe
*/
bool
*
* 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
+pipe_loader_sw_probe_dri(struct pipe_loader_device **devs,
+ struct drisw_loader_funcs *drisw_lf);
/**
/**
- * Initialize
sw dri device give the drisw_loader_funcs
.
+ * Initialize
a kms backed sw device given an fd
.
*
* This function is platform-specific.
*
* \sa pipe_loader_probe
*/
bool
*
* 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);
-
-#endif
+pipe_loader_sw_probe_kms(struct pipe_loader_device **devs, int fd);
/**
* Initialize a null sw device.
/**
* Initialize a null sw device.
@@
-177,8
+160,6
@@
boolean
pipe_loader_sw_probe_wrapped(struct pipe_loader_device **dev,
struct pipe_screen *screen);
pipe_loader_sw_probe_wrapped(struct pipe_loader_device **dev,
struct pipe_screen *screen);
-#ifdef HAVE_PIPE_LOADER_DRM
-
/**
* Get a list of known DRM devices.
*
/**
* Get a list of known DRM devices.
*
@@
-195,15
+176,9
@@
pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev);
* This function is platform-specific.
*
* \sa pipe_loader_probe
* This function is platform-specific.
*
* \sa pipe_loader_probe
- *
- * \param auth_x If true, the pipe-loader will attempt to
- * authenticate with the X server.
*/
bool
*/
bool
-pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd,
- boolean auth_x);
-
-#endif
+pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd);
#ifdef __cplusplus
}
#ifdef __cplusplus
}