Enable logging API commands to Android logcat

BUILD.gn

@@ -106,10 +106,19 @@ config("internal_config") {
     defines += [ "ANGLE_IS_LINUX" ]
   }
 
+  # Enables debug/trace-related functionality, including logging every GLES/EGL API command to the
+  # "angle_debug.txt" file on desktop.  Enables debug markers for AGI, but must also set
+  # angle_enable_annotator_run_time_checks to improve performance.
   if (angle_enable_trace) {
     defines += [ "ANGLE_ENABLE_DEBUG_TRACE=1" ]
   }
 
+  # When used with angle_enable_trace, enables logging every GLES/EGL API command to Android logcat
+  # Enables debug markers for AGI regardless of run-time checks.
+  if (angle_enable_trace_android_logcat) {
+    defines += [ "ANGLE_ENABLE_TRACE_ANDROID_LOGCAT=1" ]
+  }
+
   if (is_chromeos) {
     defines += [ "ANGLE_PLATFORM_CHROMEOS" ]
   }
@@ -254,6 +263,8 @@ config("debug_annotations_config") {
     defines = [ "ANGLE_ENABLE_DEBUG_ANNOTATIONS" ]
   }
   if (angle_enable_annotator_run_time_checks) {
+    # When used with angle_enable_trace, enables debug markers for AGI with run-time checks to
+    # filter out EVENT() messages when the debug annotator is disabled.
     defines = [ "ANGLE_ENABLE_ANNOTATOR_RUN_TIME_CHECKS" ]
   }
 }

gni/angle.gni

@@ -131,6 +131,7 @@ declare_args() {
 
   angle_enable_hlsl = angle_enable_d3d9 || angle_enable_d3d11
   angle_enable_trace = false
+  angle_enable_trace_android_logcat = false
 
   # Disable the layers in ubsan builds because of really slow builds.
   # TODO(anglebug.com/4082) enable validation layers on mac for swiftshader

src/common/debug.cpp

@@ -225,6 +225,9 @@ void Trace(LogSeverity severity, const char *message)
     }
 
     if (severity == LOG_FATAL || severity == LOG_ERR || severity == LOG_WARN ||
+#if defined(ANGLE_ENABLE_TRACE_ANDROID_LOGCAT)
+        severity == LOG_EVENT ||
+#endif
         severity == LOG_INFO)
     {
 #if defined(ANGLE_PLATFORM_ANDROID)
@@ -232,6 +235,7 @@ void Trace(LogSeverity severity, const char *message)
         switch (severity)
         {
             case LOG_INFO:
+            case LOG_EVENT:
                 android_priority = ANDROID_LOG_INFO;
                 break;
             case LOG_WARN:

src/libANGLE/renderer/vulkan/DebugAnnotatorVk.cpp

@@ -25,7 +25,7 @@ void DebugAnnotatorVk::beginEvent(gl::Context *context,
                                   const char *eventMessage)
 {
     angle::LoggingAnnotator::beginEvent(context, entryPoint, eventName, eventMessage);
-    if (context)
+    if (vkCmdBeginDebugUtilsLabelEXT && context)
     {
         ContextVk *contextVk = vk::GetImpl(static_cast<gl::Context *>(context));
         contextVk->logEvent(eventMessage);
@@ -37,7 +37,7 @@ void DebugAnnotatorVk::endEvent(gl::Context *context,
                                 gl::EntryPoint entryPoint)
 {
     angle::LoggingAnnotator::endEvent(context, eventName, entryPoint);
-    if (context && isDrawOrDispatchEntryPoint(entryPoint))
+    if (vkCmdBeginDebugUtilsLabelEXT && context && isDrawOrDispatchEntryPoint(entryPoint))
     {
         ContextVk *contextVk = vk::GetImpl(static_cast<gl::Context *>(context));
         contextVk->endEventLog(entryPoint);

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -2519,6 +2519,10 @@ void RendererVk::setGlobalDebugAnnotator()
             enableDebugAnnotatorVk = true;
         }
     }
+#if defined(ANGLE_ENABLE_TRACE_ANDROID_LOGCAT)
+    // This will log all API commands to Android's logcat as well as create Vulkan debug markers.
+    enableDebugAnnotatorVk = true;
+#endif
 
     if (enableDebugAnnotatorVk)
     {