Commit ea49f6f5 by James Dong Committed by Commit Bot

Debug: Add LOG_INFO logging level

Will be used for logging GL/EGL debug messages. Bug: angleproject:3505 Change-Id: I10ff32dd4f9227cabac2f3d9425b0428e7af1398 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1648714Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 148ecd89
...@@ -36,7 +36,7 @@ DebugAnnotator *g_debugAnnotator = nullptr; ...@@ -36,7 +36,7 @@ DebugAnnotator *g_debugAnnotator = nullptr;
std::mutex *g_debugMutex = nullptr; std::mutex *g_debugMutex = nullptr;
constexpr std::array<const char *, LOG_NUM_SEVERITIES> g_logSeverityNames = { constexpr std::array<const char *, LOG_NUM_SEVERITIES> g_logSeverityNames = {
{"EVENT", "WARN", "ERR", "FATAL"}}; {"EVENT", "INFO", "WARN", "ERR", "FATAL"}};
constexpr const char *LogSeverityName(int severity) constexpr const char *LogSeverityName(int severity)
{ {
...@@ -158,7 +158,7 @@ LogMessage::~LogMessage() ...@@ -158,7 +158,7 @@ LogMessage::~LogMessage()
lock = std::unique_lock<std::mutex>(*g_debugMutex); lock = std::unique_lock<std::mutex>(*g_debugMutex);
} }
if (DebugAnnotationsInitialized() && (mSeverity >= LOG_WARN)) if (DebugAnnotationsInitialized() && (mSeverity >= LOG_INFO))
{ {
g_debugAnnotator->logMessage(*this); g_debugAnnotator->logMessage(*this);
} }
...@@ -203,12 +203,16 @@ void Trace(LogSeverity severity, const char *message) ...@@ -203,12 +203,16 @@ void Trace(LogSeverity severity, const char *message)
} }
} }
if (severity == LOG_FATAL || severity == LOG_ERR || severity == LOG_WARN) if (severity == LOG_FATAL || severity == LOG_ERR || severity == LOG_WARN ||
severity == LOG_INFO)
{ {
#if defined(ANGLE_PLATFORM_ANDROID) #if defined(ANGLE_PLATFORM_ANDROID)
android_LogPriority android_priority = ANDROID_LOG_ERROR; android_LogPriority android_priority = ANDROID_LOG_ERROR;
switch (severity) switch (severity)
{ {
case LOG_INFO:
android_priority = ANDROID_LOG_INFO;
break;
case LOG_WARN: case LOG_WARN:
android_priority = ANDROID_LOG_WARN; android_priority = ANDROID_LOG_WARN;
break; break;
...@@ -242,7 +246,7 @@ void Trace(LogSeverity severity, const char *message) ...@@ -242,7 +246,7 @@ void Trace(LogSeverity severity, const char *message)
#if defined(ANGLE_ENABLE_DEBUG_TRACE) #if defined(ANGLE_ENABLE_DEBUG_TRACE)
# if defined(NDEBUG) # if defined(NDEBUG)
if (severity == LOG_EVENT || severity == LOG_WARN) if (severity == LOG_EVENT || severity == LOG_WARN || severity == LOG_INFO)
{ {
return; return;
} }
......
...@@ -44,10 +44,11 @@ using LogSeverity = int; ...@@ -44,10 +44,11 @@ using LogSeverity = int;
// Note: the log severities are used to index into the array of names, // Note: the log severities are used to index into the array of names,
// see g_logSeverityNames. // see g_logSeverityNames.
constexpr LogSeverity LOG_EVENT = 0; constexpr LogSeverity LOG_EVENT = 0;
constexpr LogSeverity LOG_WARN = 1; constexpr LogSeverity LOG_INFO = 1;
constexpr LogSeverity LOG_ERR = 2; constexpr LogSeverity LOG_WARN = 2;
constexpr LogSeverity LOG_FATAL = 3; constexpr LogSeverity LOG_ERR = 3;
constexpr LogSeverity LOG_NUM_SEVERITIES = 4; constexpr LogSeverity LOG_FATAL = 4;
constexpr LogSeverity LOG_NUM_SEVERITIES = 5;
void Trace(LogSeverity severity, const char *message); void Trace(LogSeverity severity, const char *message);
...@@ -188,6 +189,8 @@ std::ostream &FmtHex(std::ostream &os, T value) ...@@ -188,6 +189,8 @@ std::ostream &FmtHex(std::ostream &os, T value)
// better to have compact code for these operations. // better to have compact code for these operations.
#define COMPACT_ANGLE_LOG_EX_EVENT(ClassName, ...) \ #define COMPACT_ANGLE_LOG_EX_EVENT(ClassName, ...) \
::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_EVENT, ##__VA_ARGS__) ::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_EVENT, ##__VA_ARGS__)
#define COMPACT_ANGLE_LOG_EX_INFO(ClassName, ...) \
::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_INFO, ##__VA_ARGS__)
#define COMPACT_ANGLE_LOG_EX_WARN(ClassName, ...) \ #define COMPACT_ANGLE_LOG_EX_WARN(ClassName, ...) \
::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_WARN, ##__VA_ARGS__) ::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_WARN, ##__VA_ARGS__)
#define COMPACT_ANGLE_LOG_EX_ERR(ClassName, ...) \ #define COMPACT_ANGLE_LOG_EX_ERR(ClassName, ...) \
...@@ -196,6 +199,7 @@ std::ostream &FmtHex(std::ostream &os, T value) ...@@ -196,6 +199,7 @@ std::ostream &FmtHex(std::ostream &os, T value)
::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_FATAL, ##__VA_ARGS__) ::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_FATAL, ##__VA_ARGS__)
#define COMPACT_ANGLE_LOG_EVENT COMPACT_ANGLE_LOG_EX_EVENT(LogMessage) #define COMPACT_ANGLE_LOG_EVENT COMPACT_ANGLE_LOG_EX_EVENT(LogMessage)
#define COMPACT_ANGLE_LOG_INFO COMPACT_ANGLE_LOG_EX_INFO(LogMessage)
#define COMPACT_ANGLE_LOG_WARN COMPACT_ANGLE_LOG_EX_WARN(LogMessage) #define COMPACT_ANGLE_LOG_WARN COMPACT_ANGLE_LOG_EX_WARN(LogMessage)
#define COMPACT_ANGLE_LOG_ERR COMPACT_ANGLE_LOG_EX_ERR(LogMessage) #define COMPACT_ANGLE_LOG_ERR COMPACT_ANGLE_LOG_EX_ERR(LogMessage)
#define COMPACT_ANGLE_LOG_FATAL COMPACT_ANGLE_LOG_EX_FATAL(LogMessage) #define COMPACT_ANGLE_LOG_FATAL COMPACT_ANGLE_LOG_EX_FATAL(LogMessage)
...@@ -229,6 +233,7 @@ std::ostream &FmtHex(std::ostream &os, T value) ...@@ -229,6 +233,7 @@ std::ostream &FmtHex(std::ostream &os, T value)
# define ANGLE_ENABLE_ASSERTS # define ANGLE_ENABLE_ASSERTS
#endif #endif
#define INFO() ANGLE_LOG(INFO)
#define WARN() ANGLE_LOG(WARN) #define WARN() ANGLE_LOG(WARN)
#define ERR() ANGLE_LOG(ERR) #define ERR() ANGLE_LOG(ERR)
#define FATAL() ANGLE_LOG(FATAL) #define FATAL() ANGLE_LOG(FATAL)
......
...@@ -306,7 +306,7 @@ void Display_logWarning(angle::PlatformMethods *platform, const char *warningMes ...@@ -306,7 +306,7 @@ void Display_logWarning(angle::PlatformMethods *platform, const char *warningMes
void Display_logInfo(angle::PlatformMethods *platform, const char *infoMessage) void Display_logInfo(angle::PlatformMethods *platform, const char *infoMessage)
{ {
// Uncomment to get info spam // Uncomment to get info spam
// gl::Trace(gl::LOG_WARN, infoMessage); gl::Trace(gl::LOG_INFO, infoMessage);
} }
void ANGLESetDefaultDisplayPlatform(angle::EGLDisplayType display) void ANGLESetDefaultDisplayPlatform(angle::EGLDisplayType display)
......
...@@ -48,6 +48,9 @@ void LoggingAnnotator::logMessage(const gl::LogMessage &msg) const ...@@ -48,6 +48,9 @@ void LoggingAnnotator::logMessage(const gl::LogMessage &msg) const
case gl::LOG_WARN: case gl::LOG_WARN:
plat->logWarning(plat, msg.getMessage().c_str()); plat->logWarning(plat, msg.getMessage().c_str());
break; break;
case gl::LOG_INFO:
plat->logInfo(plat, msg.getMessage().c_str());
break;
default: default:
UNREACHABLE(); UNREACHABLE();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment