diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/egl/drivers/xdri/egl_xdri.c | 3 | ||||
-rw-r--r-- | src/egl/main/eglapi.c | 4 | ||||
-rw-r--r-- | src/egl/main/eglcurrent.c | 37 | ||||
-rw-r--r-- | src/egl/main/eglcurrent.h | 8 | ||||
-rw-r--r-- | src/gallium/state_trackers/egl/common/egl_g3d.c | 7 |
5 files changed, 7 insertions, 52 deletions
diff --git a/src/egl/drivers/xdri/egl_xdri.c b/src/egl/drivers/xdri/egl_xdri.c index df251d908b..e13d884e71 100644 --- a/src/egl/drivers/xdri/egl_xdri.c +++ b/src/egl/drivers/xdri/egl_xdri.c @@ -574,8 +574,7 @@ xdri_eglSwapBuffers(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *draw) struct xdri_egl_surface *xdri_surf = lookup_surface(draw); /* swapBuffers does not flush commands */ - if (draw == _eglGetCurrentSurface(EGL_DRAW) && - xdri_driver->FlushCurrentContext) + if (draw->Binding && xdri_driver->FlushCurrentContext) xdri_driver->FlushCurrentContext(); xdri_dpy->psc->driScreen->swapBuffers(xdri_surf->driDrawable, 0, 0, 0); diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 2e5027a32e..492a14180a 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -629,8 +629,8 @@ eglWaitNative(EGLint engine) EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void) { - _EGLDisplay *dpy = _eglGetCurrentDisplay(); - return _eglGetDisplayHandle(dpy); + _EGLContext *ctx = _eglGetCurrentContext(); + return (ctx) ? _eglGetDisplayHandle(ctx->Resource.Display) : EGL_NO_DISPLAY; } diff --git a/src/egl/main/eglcurrent.c b/src/egl/main/eglcurrent.c index b3be2305fd..696d04e8ba 100644 --- a/src/egl/main/eglcurrent.c +++ b/src/egl/main/eglcurrent.c @@ -249,43 +249,6 @@ _eglGetCurrentContext(void) /** - * Return the display of the currently bound context, or NULL. - */ -_EGLDisplay * -_eglGetCurrentDisplay(void) -{ - _EGLThreadInfo *t = _eglGetCurrentThread(); - _EGLContext *ctx = t->CurrentContexts[t->CurrentAPIIndex]; - if (ctx) - return ctx->Resource.Display; - else - return NULL; -} - - -/** - * Return the read or write surface of the currently bound context, or NULL. - */ -_EGLSurface * -_eglGetCurrentSurface(EGLint readdraw) -{ - _EGLThreadInfo *t = _eglGetCurrentThread(); - _EGLContext *ctx = t->CurrentContexts[t->CurrentAPIIndex]; - if (ctx) { - switch (readdraw) { - case EGL_DRAW: - return ctx->DrawSurface; - case EGL_READ: - return ctx->ReadSurface; - default: - return NULL; - } - } - return NULL; -} - - -/** * Record EGL error code. */ EGLBoolean diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h index b8c2bda485..c169c93e94 100644 --- a/src/egl/main/eglcurrent.h +++ b/src/egl/main/eglcurrent.h @@ -80,14 +80,6 @@ PUBLIC _EGLContext * _eglGetCurrentContext(void); -PUBLIC _EGLDisplay * -_eglGetCurrentDisplay(void); - - -PUBLIC _EGLSurface * -_eglGetCurrentSurface(EGLint readdraw); - - PUBLIC EGLBoolean _eglError(EGLint errCode, const char *msg); diff --git a/src/gallium/state_trackers/egl/common/egl_g3d.c b/src/gallium/state_trackers/egl/common/egl_g3d.c index d073f226f2..aa4f012216 100644 --- a/src/gallium/state_trackers/egl/common/egl_g3d.c +++ b/src/gallium/state_trackers/egl/common/egl_g3d.c @@ -1037,14 +1037,15 @@ egl_g3d_wait_client(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *ctx) static EGLBoolean egl_g3d_wait_native(_EGLDriver *drv, _EGLDisplay *dpy, EGLint engine) { - _EGLSurface *surf = _eglGetCurrentSurface(EGL_DRAW); - struct egl_g3d_surface *gsurf = egl_g3d_surface(surf); + _EGLContext *ctx = _eglGetCurrentContext(); if (engine != EGL_CORE_NATIVE_ENGINE) return _eglError(EGL_BAD_PARAMETER, "eglWaitNative"); - if (gsurf) + if (ctx && ctx->DrawSurface) { + struct egl_g3d_surface *gsurf = egl_g3d_surface(ctx->DrawSurface); gsurf->native->wait(gsurf->native); + } return EGL_TRUE; } |