diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-07-24 09:17:59 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-07-24 09:17:59 -0600 |
| commit | 5b737b7df21b418c71f71af987a20c495b1133f8 (patch) | |
| tree | 6aa3a54cb5d3c43f789488147f3b61b56e09c5fc /src/mesa/drivers/dri/nouveau/nouveau_context.c | |
| parent | f0636d9653d142bdf71475d2d2066f5c7c436978 (diff) | |
| parent | 98eaf5503d0d7c4f18fab6910a08aba7a3d08639 (diff) | |
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_context.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c index d96b00242c..44392c0267 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c @@ -180,7 +180,7 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual, driParseConfigFiles (&nmesa->optionCache, &screen->optionCache, screen->driScreen->myNum, "nouveau"); - nmesa->sarea = (drm_nouveau_sarea_t *)((char *)sPriv->pSAREA + + nmesa->sarea = (struct drm_nouveau_sarea *)((char *)sPriv->pSAREA + screen->sarea_priv_offset); /* Enable any supported extensions */ @@ -224,6 +224,8 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual, nv04TriInitFunctions( ctx ); break; case NV_10: + case NV_11: + case NV_17: case NV_20: case NV_30: case NV_40: |