diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2004-12-21 22:42:00 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2004-12-21 22:42:00 +0000 |
| commit | 302c5694c681fb19e4b1855ed82a87c2d0ba5de4 (patch) | |
| tree | 4c6fa7f2b493685f1da9b49295b3acb0c62bf626 /src/mesa/drivers/dri/unichrome/via_screen.c | |
| parent | 1d27084043855d2609b54d3435f0bd85e39762e2 (diff) | |
Push a number of global variables into the viaContext struct.
Remove the bogus 'current_vmesa' pointer.
Diffstat (limited to 'src/mesa/drivers/dri/unichrome/via_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/via_screen.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c index ec2affb333..1a47fe57c6 100644 --- a/src/mesa/drivers/dri/unichrome/via_screen.c +++ b/src/mesa/drivers/dri/unichrome/via_screen.c @@ -60,8 +60,6 @@ DRI_CONF_END; static const GLuint __driNConfigOptions = 3; -extern viaContextPtr current_mesa; - #ifdef USE_NEW_INTERFACE static PFNGLXCREATECONTEXTMODES create_context_modes = NULL; #endif /* USE_NEW_INTERFACE */ @@ -221,10 +219,17 @@ viaCreateBuffer(__DRIscreenPrivate *driScrnPriv, const __GLcontextModes *mesaVis, GLboolean isPixmap) { - viaContextPtr vmesa = current_mesa; + /* KW: Bogus: Do this sort of thing in MakeCurrent or similar. + */ + viaContextPtr vmesa; + GET_CURRENT_CONTEXT(ctx); + + if (ctx) + vmesa = VIA_CONTEXT(ctx); + if (VIA_DEBUG) fprintf(stderr, "%s - in\n", __FUNCTION__); /*=* John Sheng [2003.7.2] for visual config & patch viewperf *=*/ - if (mesaVis->depthBits == 32 && vmesa->depthBits == 16) { + if (vmesa && mesaVis->depthBits == 32 && vmesa->depthBits == 16) { vmesa->depthBits = mesaVis->depthBits; vmesa->depth.size *= 2; vmesa->depth.pitch *= 2; |