Debug: Add LOG_INFO logging level

src/common/debug.cpp

@@ -36,7 +36,7 @@ DebugAnnotator *g_debugAnnotator = nullptr;
 std::mutex *g_debugMutex = nullptr;
 
 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)
 {
@@ -158,7 +158,7 @@ LogMessage::~LogMessage()
         lock = std::unique_lock<std::mutex>(*g_debugMutex);
     }
 
-    if (DebugAnnotationsInitialized() && (mSeverity >= LOG_WARN))
+    if (DebugAnnotationsInitialized() && (mSeverity >= LOG_INFO))
     {
         g_debugAnnotator->logMessage(*this);
     }
@@ -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)
         android_LogPriority android_priority = ANDROID_LOG_ERROR;
         switch (severity)
         {
+            case LOG_INFO:
+                android_priority = ANDROID_LOG_INFO;
+                break;
             case LOG_WARN:
                 android_priority = ANDROID_LOG_WARN;
                 break;
@@ -242,7 +246,7 @@ void Trace(LogSeverity severity, const char *message)
 
 #if defined(ANGLE_ENABLE_DEBUG_TRACE)
 #    if defined(NDEBUG)
-    if (severity == LOG_EVENT || severity == LOG_WARN)
+    if (severity == LOG_EVENT || severity == LOG_WARN || severity == LOG_INFO)
     {
         return;
     }

src/common/debug.h

@@ -44,10 +44,11 @@ using LogSeverity = int;
 // Note: the log severities are used to index into the array of names,
 // see g_logSeverityNames.
 constexpr LogSeverity LOG_EVENT          = 0;
-constexpr LogSeverity LOG_WARN           = 1;
-constexpr LogSeverity LOG_ERR            = 2;
-constexpr LogSeverity LOG_FATAL          = 3;
-constexpr LogSeverity LOG_NUM_SEVERITIES = 4;
+constexpr LogSeverity LOG_INFO           = 1;
+constexpr LogSeverity LOG_WARN           = 2;
+constexpr LogSeverity LOG_ERR            = 3;
+constexpr LogSeverity LOG_FATAL          = 4;
+constexpr LogSeverity LOG_NUM_SEVERITIES = 5;
 
 void Trace(LogSeverity severity, const char *message);
 
@@ -188,6 +189,8 @@ std::ostream &FmtHex(std::ostream &os, T value)
 // better to have compact code for these operations.
 #define COMPACT_ANGLE_LOG_EX_EVENT(ClassName, ...) \
     ::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, ...) \
     ::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_WARN, ##__VA_ARGS__)
 #define COMPACT_ANGLE_LOG_EX_ERR(ClassName, ...) \
@@ -196,6 +199,7 @@ std::ostream &FmtHex(std::ostream &os, T value)
     ::gl::ClassName(__FUNCTION__, __LINE__, ::gl::LOG_FATAL, ##__VA_ARGS__)
 
 #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_ERR COMPACT_ANGLE_LOG_EX_ERR(LogMessage)
 #define COMPACT_ANGLE_LOG_FATAL COMPACT_ANGLE_LOG_EX_FATAL(LogMessage)
@@ -229,6 +233,7 @@ std::ostream &FmtHex(std::ostream &os, T value)
 #    define ANGLE_ENABLE_ASSERTS
 #endif
 
+#define INFO() ANGLE_LOG(INFO)
 #define WARN() ANGLE_LOG(WARN)
 #define ERR() ANGLE_LOG(ERR)
 #define FATAL() ANGLE_LOG(FATAL)

src/libANGLE/Display.cpp

@@ -306,7 +306,7 @@ void Display_logWarning(angle::PlatformMethods *platform, const char *warningMes
 void Display_logInfo(angle::PlatformMethods *platform, const char *infoMessage)
 {
     // Uncomment to get info spam
-    // gl::Trace(gl::LOG_WARN, infoMessage);
+    gl::Trace(gl::LOG_INFO, infoMessage);
 }
 
 void ANGLESetDefaultDisplayPlatform(angle::EGLDisplayType display)

src/libANGLE/LoggingAnnotator.cpp

@@ -48,6 +48,9 @@ void LoggingAnnotator::logMessage(const gl::LogMessage &msg) const
             case gl::LOG_WARN:
                 plat->logWarning(plat, msg.getMessage().c_str());
                 break;
+            case gl::LOG_INFO:
+                plat->logInfo(plat, msg.getMessage().c_str());
+                break;
             default:
                 UNREACHABLE();
         }