openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-11-25 08:20:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

egl/dri2: remove error checks on return values from mtx_lock and cnd_wait

Browse Source 
This removes unnecessary error checks on return result of mtx_lock
and cnd_wait calls as in all other places in MESA source since there
is no chance that any of these functions return any of error codes
in current implementation.

This patch also removes a redundent _eglError call that follows
EGL_FALSE check in the bottom of dri2_client_wait_sync.

Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Dongwon Kim 2016-08-15 15:12:03 -07:00 committed by Emil Velikov
parent 96ea753d9e
commit c6e97aaf75
1 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/egl/drivers/dri2/egl_dri2.c
View File

@ -2666,19 +2666,9 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
/* if timeout is EGL_FOREVER_KHR, it should wait without any timeout.*/
if (timeout == EGL_FOREVER_KHR) {
if (mtx_lock(&dri2_sync->mutex)) {
ret = EGL_FALSE;
goto cleanup;
}
ret = cnd_wait(&dri2_sync->cond, &dri2_sync->mutex);
mtx_lock(&dri2_sync->mutex);
cnd_wait(&dri2_sync->cond, &dri2_sync->mutex);
mtx_unlock(&dri2_sync->mutex);
if (ret) {
_eglError(EGL_BAD_PARAMETER, "eglClientWaitSyncKHR");
ret = EGL_FALSE;
}
} else {
/* if reusable sync has not been yet signaled */
if (dri2_sync->base.SyncStatus != EGL_SIGNALED_KHR) {
@ -2697,38 +2687,25 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
expire.nsec -= 1000000000L;
}
if (mtx_lock(&dri2_sync->mutex)) {
ret = EGL_FALSE;
goto cleanup;
}
mtx_lock(&dri2_sync->mutex);
ret = cnd_timedwait(&dri2_sync->cond, &dri2_sync->mutex, &expire);
mtx_unlock(&dri2_sync->mutex);
if (ret)
if (ret == thrd_busy) {
if (dri2_sync->base.SyncStatus == EGL_UNSIGNALED_KHR) {
ret = EGL_TIMEOUT_EXPIRED_KHR;
} else {
_eglError(EGL_BAD_ACCESS, "eglClientWaitSyncKHR");
ret = EGL_FALSE;
}
if (ret == thrd_busy) {
if (dri2_sync->base.SyncStatus == EGL_UNSIGNALED_KHR) {
ret = EGL_TIMEOUT_EXPIRED_KHR;
} else {
_eglError(EGL_BAD_ACCESS, "eglClientWaitSyncKHR");
ret = EGL_FALSE;
}
}
}
}
break;
}
dri2_egl_unref_sync(dri2_dpy, dri2_sync);
cleanup:
dri2_egl_unref_sync(dri2_dpy, dri2_sync);
if (ret == EGL_FALSE) {
_eglError(EGL_BAD_ACCESS, "eglClientWaitSyncKHR");
return EGL_FALSE;
}
return ret;
return ret;
}
static EGLBoolean