1 files changed, 4 insertions, 3 deletions
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index b760ebcb40a..07b63e9b112 100644
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -87,8 +87,8 @@ _eglLookupContext(EGLContext ctx)
 _EGLContext *
 _eglGetCurrentContext(void)
 {
-   /* XXX this should be per-thread someday */
-   return _eglGlobal.CurrentContext;
+   _EGLThreadInfo *t = _eglGetCurrentThread();
+   return t->CurrentContext;
 }
 
 
@@ -176,6 +176,7 @@ EGLBoolean
 _eglMakeCurrent(_EGLDriver *drv, EGLDisplay dpy, EGLSurface d,
                 EGLSurface r, EGLContext context)
 {
+   _EGLThreadInfo *t = _eglGetCurrentThread();
    _EGLContext *ctx = _eglLookupContext(context);
    _EGLSurface *draw = _eglLookupSurface(d);
    _EGLSurface *read = _eglLookupSurface(r);
@@ -250,7 +251,7 @@ _eglMakeCurrent(_EGLDriver *drv, EGLDisplay dpy, EGLSurface d,
       read->IsBound = EGL_TRUE;
    }
 
-   _eglGlobal.CurrentContext = ctx;
+   t->CurrentContext = ctx;
 
    return EGL_TRUE;
 }