diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-24 08:10:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-24 08:10:01 +0200 |
| commit | 4eb0b643ad978d94837e2d587a5d4358f974a25c (patch) | |
| tree | ecb04ee3cf0d7c2fa80707218382d68e7a49f621 /xorg-server | |
| parent | 6d895f30ab93d71afddc612d8b007f2de7f04165 (diff) | |
| download | vcxsrv-4eb0b643ad978d94837e2d587a5d4358f974a25c.tar.gz vcxsrv-4eb0b643ad978d94837e2d587a5d4358f974a25c.tar.bz2 vcxsrv-4eb0b643ad978d94837e2d587a5d4358f974a25c.zip | |
fontconfig mesa xserver git update 24 oct 2013
xserver commit 7ecfab47eb221dbb996ea6c033348b8eceaeb893
fontconfig commit 76ea9af816a50c6bb0b3dc2960460a90fadd9cdb
mesa commit a6e45b6a17462f4d261a2d176791469847356923
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/glx/glxdricommon.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c index b027f2498..0ab3e3071 100644 --- a/xorg-server/glx/glxdricommon.c +++ b/xorg-server/glx/glxdricommon.c @@ -211,6 +211,14 @@ glxConvertConfigs(const __DRIcoreExtension * core, static const char dri_driver_path[] = DRI_DRIVER_PATH; +/* Temporary define to allow building without a dri_interface.h from + * updated Mesa. Some day when we don't care about Mesa that old any + * more this can be removed. + */ +#ifndef __DRI_DRIVER_GET_EXTENSIONS +#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions" +#endif + void * glxProbeDriver(const char *driverName, void **coreExt, const char *coreName, int coreVersion, @@ -219,7 +227,8 @@ glxProbeDriver(const char *driverName, int i; void *driver; char filename[PATH_MAX]; - const __DRIextension **extensions; + char *get_extensions_name; + const __DRIextension **extensions = NULL; snprintf(filename, sizeof filename, "%s/%s_dri.so", dri_driver_path, driverName); @@ -231,7 +240,18 @@ glxProbeDriver(const char *driverName, goto cleanup_failure; } - extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS); + if (asprintf(&get_extensions_name, "%s_%s", + __DRI_DRIVER_GET_EXTENSIONS, driverName) != -1) { + const __DRIextension **(*get_extensions)(void); + + get_extensions = dlsym(driver, get_extensions_name); + if (get_extensions) + extensions = get_extensions(); + free(get_extensions_name); + } + + if (!extensions) + extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS); if (extensions == NULL) { LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n", driverName, dlerror()); |