OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: inline _eglReportError(), and drop this and all the other unused defines

Browse Source 
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20565>
This commit is contained in:
Eric Engestrom
2021-11-08 15:01:40 +00:00
committed by Marge Bot
parent 3632d39835
commit f83a0e0a14
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/egl/main/eglapi.c
View File

@@ -2649,7 +2649,7 @@ eglDebugMessageControlKHR(EGLDEBUGPROCKHR callback,
// On error, set the last error code, call the current
// debug callback, and return the error code.
simple_mtx_unlock(_eglGlobal.Mutex);
_eglReportError(EGL_BAD_ATTRIBUTE, NULL,
_eglDebugReport(EGL_BAD_ATTRIBUTE, NULL, EGL_DEBUG_MSG_ERROR_KHR,
"Invalid attribute 0x%04lx", (unsigned long) attrib_list[i]);
return EGL_BAD_ATTRIBUTE;
}
@@ -2690,7 +2690,7 @@ eglQueryDebugKHR(EGLint attribute, EGLAttrib *value)
break;
default:
simple_mtx_unlock(_eglGlobal.Mutex);
_eglReportError(EGL_BAD_ATTRIBUTE, NULL,
_eglDebugReport(EGL_BAD_ATTRIBUTE, NULL, EGL_DEBUG_MSG_ERROR_KHR,
"Invalid attribute 0x%04lx", (unsigned long) attribute);
return EGL_FALSE;
}

12
src/egl/main/eglcurrent.h
View File

@@ -100,18 +100,6 @@ extern void
_eglDebugReport(EGLenum error, const char *funcName,
EGLint type, const char *message, ...);
#define _eglReportCritical(error, funcName, ...) \
_eglDebugReport(error, funcName, EGL_DEBUG_MSG_CRITICAL_KHR, __VA_ARGS__)
#define _eglReportError(error, funcName, ...) \
_eglDebugReport(error, funcName, EGL_DEBUG_MSG_ERROR_KHR, __VA_ARGS__)
#define _eglReportWarn(funcName, ...) \
_eglDebugReport(EGL_SUCCESS, funcName, EGL_DEBUG_MSG_WARN_KHR, __VA_ARGS__)
#define _eglReportInfo(funcName, ...) \
_eglDebugReport(EGL_SUCCESS, funcName, EGL_DEBUG_MSG_INFO_KHR, __VA_ARGS__)
#ifdef __cplusplus
}
#endif