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

egl: Switch to mesa_log(..)

Browse source 
Mesa's common logging framework supports Android already - switch
to it.

Note: on non-Android platforms this changes the message format -
the "libEGL" prefix is gone, replaced by mesa_log's "MESA-EGL" tag.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33975>
This commit is contained in:
Christian Gmeiner 2025-02-23 23:07:09 +01:00 • committed by Marge Bot
parent d04945ed96
commit 3e51d35d1a
1 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/egl/main/egllog.c
View file

@ -38,6 +38,7 @@
#include <stdlib.h>
#include <string.h>
#include "c11/threads.h"
#include "util/log.h"
#include "util/macros.h"
#include "util/os_misc.h"
#include "util/simple_mtx.h"
@ -45,16 +46,6 @@
#include "egllog.h"
#ifdef HAVE_ANDROID_PLATFORM
#define LOG_TAG "EGL-MAIN"
#if ANDROID_API_LEVEL >= 26
#include <log/log.h>
#else
#include <cutils/log.h>
#endif /* use log/log.h start from android 8 major version */
#endif /* HAVE_ANDROID_PLATFORM */
#define MAXSTRING 1000
#define FALLBACK_LOG_LEVEL _EGL_WARNING
@ -77,22 +68,19 @@ static const char *level_strings[] = {
};
/**
* The default logger. It prints the message to stderr.
* The default logger.
*/
static void
_eglDefaultLogger(EGLint level, const char *msg)
{
#ifdef HAVE_ANDROID_PLATFORM
static const int egl2alog[] = {
[_EGL_FATAL] = ANDROID_LOG_ERROR,
[_EGL_WARNING] = ANDROID_LOG_WARN,
[_EGL_INFO] = ANDROID_LOG_INFO,
[_EGL_DEBUG] = ANDROID_LOG_DEBUG,
static const int egl2log[] = {
[_EGL_FATAL] = MESA_LOG_ERROR,
[_EGL_WARNING] = MESA_LOG_WARN,
[_EGL_INFO] = MESA_LOG_INFO,
[_EGL_DEBUG] = MESA_LOG_DEBUG,
};
LOG_PRI(egl2alog[level], LOG_TAG, "%s", msg);
#else
fprintf(stderr, "libEGL %s: %s\n", level_strings[level], msg);
#endif /* HAVE_ANDROID_PLATFORM */
mesa_log(egl2log[level], "MESA-EGL", "%s", msg);
}
/**