fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

egl: Drop _eglSetFuncName() return

Browse source 
It always returned EGL_TRUE

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18111>
This commit is contained in:
Rob Clark 2022-08-11 09:07:18 -07:00 • committed by Marge Bot
parent 45d9c94a28
commit c11583b164
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/egl/main/eglapi.c
View file

@ -264,7 +264,7 @@ _eglUnlockDisplay(_EGLDisplay *disp)
mtx_unlock(&disp->Mutex);
}
static EGLBoolean
static void
_eglSetFuncName(const char *funcName, _EGLDisplay *disp, EGLenum objectType, _EGLResource *object)
{
_EGLThreadInfo *thr = _eglGetCurrentThread();
@ -277,18 +277,12 @@ _eglSetFuncName(const char *funcName, _EGLDisplay *disp, EGLenum objectType, _EG
thr->CurrentObjectLabel = disp->Label;
else if (object)
thr->CurrentObjectLabel = object->Label;
return EGL_TRUE;
}
#define _EGL_FUNC_START(disp, objectType, object, ret) \
do { \
MESA_TRACE_FUNC(); \
if (!_eglSetFuncName(__func__, disp, objectType, (_EGLResource *) object)) { \
if (disp) \
_eglUnlockDisplay(disp); \
return ret; \
} \
_eglSetFuncName(__func__, disp, objectType, (_EGLResource *) object); \
} while(0)
/**
@ -2622,11 +2616,7 @@ eglSetBlobCacheFuncsANDROID(EGLDisplay *dpy, EGLSetBlobFuncANDROID set,
* utilize the helper macros _EGL_FUNC_START or _EGL_CHECK_DISPLAY.
*/
_EGLDisplay *disp = _eglLockDisplay(dpy);
if (!_eglSetFuncName(__func__, disp, EGL_OBJECT_DISPLAY_KHR, NULL)) {
if (disp)
_eglUnlockDisplay(disp);
return;
}
_eglSetFuncName(__func__, disp, EGL_OBJECT_DISPLAY_KHR, NULL);
if (!_eglCheckDisplay(disp, __func__)) {
if (disp)