fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 04:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use dlsym() to avoid referencing __dri2DriverInitScreen.

Browse source 
Sort-of a stop-gap workaround.  There are a couple of nicer ways to
do this that doesn't require dlfcn.h, but they're more invasive.
This commit is contained in:
Kristian Høgsberg 2008-02-25 20:02:25 -05:00
parent bcecea6ea6
commit 129b9ad16f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/drivers/dri/common/dri_util.c
View file

@ -883,6 +883,11 @@ __DRI2_CREATE_NEW_SCREEN(int scrn, __DRIscreen *psc,
static const __DRIextension *emptyExtensionList[] = { NULL }; static const __DRIextension *emptyExtensionList[] = { NULL };
dri_interface = interface; dri_interface = interface;
unsigned int *p; unsigned int *p;
__GLcontextModes *(*initScreen)(__DRIscreen *psc);
initScreen = dlsym(NULL, __dri2DriverInitScreen);
if (initScreen == NULL)
return NULL;
psp = _mesa_malloc(sizeof(*psp)); psp = _mesa_malloc(sizeof(*psp));
if (!psp) if (!psp)
@ -931,7 +936,7 @@ __DRI2_CREATE_NEW_SCREEN(int scrn, __DRIscreen *psc,
psc->createNewDrawable = driCreateNewDrawable; psc->createNewDrawable = driCreateNewDrawable;
psc->createNewContext = driCreateNewContext; psc->createNewContext = driCreateNewContext;
*driver_modes = __dri2DriverInitScreen(psp); *driver_modes = initScreen(psp);
if (*driver_modes == NULL) { if (*driver_modes == NULL) {
drmBOUnmap(psp->fd, &psp->dri2.sareaBO); drmBOUnmap(psp->fd, &psp->dri2.sareaBO);
drmBOUnreference(psp->fd, &psp->dri2.sareaBO); drmBOUnreference(psp->fd, &psp->dri2.sareaBO);