diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-05 11:36:44 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-05 11:36:44 -0700 |
| commit | 3cf20ddbfc9d3a1dad4c058050595c54589257d3 (patch) | |
| tree | 57de53410bb0fb40979eed20d3c80d4c0ed68664 /src/mesa/drivers/x11/glxapi.c | |
| parent | 2ac17c68e2d64260168a54a275e839775828f534 (diff) | |
| parent | 4fe48b4e8568896cdbc822323aeec0a41c72ff2a (diff) | |
Merge branch 'i915-unification' of git+ssh://people.freedesktop.org/~anholt/mesa into i915-unification
Diffstat (limited to 'src/mesa/drivers/x11/glxapi.c')
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 5f11c90c13..309a0008d7 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -141,7 +141,7 @@ static void SetCurrentContext(GLXContext c) { #if defined(GLX_USE_TLS) - CurrentContext = context; + CurrentContext = c; #elif defined(THREADS) _glthread_SetTSD(&ContextTSD, c); #else @@ -1169,7 +1169,7 @@ _glxapi_get_extensions(void) #ifdef GLX_SGIX_pbuffer "GLX_SGIX_pbuffer", #endif -#ifdef GLX_EXT_texture_from_pixmap, +#ifdef GLX_EXT_texture_from_pixmap "GLX_EXT_texture_from_pixmap", #endif NULL |