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

We need nmesa->driFd and friends setup before we call nouveauFifoInit

Browse source
This commit is contained in:
Ben Skeggs 2006-11-12 02:06:30 +00:00
parent 6464787bfd
commit b8e05366e1
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mesa/drivers/dri/nouveau/nouveau_context.c
View file

@ -78,6 +78,16 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual,
if ( !nmesa ) if ( !nmesa )
return GL_FALSE; return GL_FALSE;
nmesa->driContext = driContextPriv;
nmesa->driScreen = sPriv;
nmesa->driDrawable = NULL;
nmesa->hHWContext = driContextPriv->hHWContext;
nmesa->driHwLock = &sPriv->pSAREA->lock;
nmesa->driFd = sPriv->fd;
nmesa->screen = (nouveauScreenPtr)(sPriv->private);
screen=nmesa->screen;
/* Create the hardware context */ /* Create the hardware context */
if (!nouveauFifoInit(nmesa)) if (!nouveauFifoInit(nmesa))
return GL_FALSE; return GL_FALSE;
@ -104,16 +114,6 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual,
driContextPriv->driverPrivate = nmesa; driContextPriv->driverPrivate = nmesa;
ctx = nmesa->glCtx; ctx = nmesa->glCtx;
nmesa->driContext = driContextPriv;
nmesa->driScreen = sPriv;
nmesa->driDrawable = NULL;
nmesa->hHWContext = driContextPriv->hHWContext;
nmesa->driHwLock = &sPriv->pSAREA->lock;
nmesa->driFd = sPriv->fd;
nmesa->screen = (nouveauScreenPtr)(sPriv->private);
screen=nmesa->screen;
/* Parse configuration files */ /* Parse configuration files */
driParseConfigFiles (&nmesa->optionCache, &screen->optionCache, driParseConfigFiles (&nmesa->optionCache, &screen->optionCache,
screen->driScreen->myNum, "nouveau"); screen->driScreen->myNum, "nouveau");