Enable debug-util markers with an env var/property

src/common/system_utils.cpp

@@ -26,6 +26,42 @@ std::string GetExecutableName()
 #endif  // ANGLE_PLATFORM_ANDROID
 }
 
+// Call out to 'getprop' on a shell to get an Android property.  If the value was set, set an
+// environment variable with that value.  Return the value of the environment variable.
+std::string GetEnvironmentVarFromAndroidProperty(const char *variableName, const char *propertyName)
+{
+#if defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21
+    std::string sanitizedPropertyName = propertyName;
+    sanitizedPropertyName.erase(
+        std::remove(sanitizedPropertyName.begin(), sanitizedPropertyName.end(), '\''),
+        sanitizedPropertyName.end());
+
+    std::string command("getprop '");
+    command += sanitizedPropertyName;
+    command += "'";
+
+    // Run the command and open a I/O stream to read the value
+    constexpr int kStreamSize = 64;
+    char stream[kStreamSize]  = {};
+    FILE *pipe                = popen(command.c_str(), "r");
+    if (pipe != nullptr)
+    {
+        fgets(stream, kStreamSize, pipe);
+        pclose(pipe);
+    }
+
+    // Right strip white space
+    std::string value(stream);
+    value.erase(value.find_last_not_of(" \n\r\t") + 1);
+
+    // Set the environment variable with the value.
+    SetEnvironmentVar(variableName, value.c_str());
+    return value;
+#endif  // ANGLE_PLATFORM_ANDROID
+    // Return the environment variable's value.
+    return GetEnvironmentVar(variableName);
+}
+
 bool PrependPathToEnvironmentVar(const char *variableName, const char *path)
 {
     std::string oldValue = GetEnvironmentVar(variableName);

src/common/system_utils.h

@@ -28,6 +28,8 @@ bool SetCWD(const char *dirName);
 bool SetEnvironmentVar(const char *variableName, const char *value);
 bool UnsetEnvironmentVar(const char *variableName);
 std::string GetEnvironmentVar(const char *variableName);
+std::string GetEnvironmentVarFromAndroidProperty(const char *variableName,
+                                                 const char *propertyName);
 const char *GetPathSeparatorForEnvironmentVar();
 bool PrependPathToEnvironmentVar(const char *variableName, const char *path);
 bool IsDirectory(const char *filename);

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -442,6 +442,9 @@ ANGLE_MAYBE_UNUSED bool SemaphorePropertiesCompatibleWithAndroid(
     return true;
 }
 
+// Environment variable (and associated Android property) to enable Vulkan debug-utils markers
+constexpr char kEnableDebugMarkersVarName[]      = "ANGLE_ENABLE_DEBUG_MARKERS";
+constexpr char kEnableDebugMarkersPropertyName[] = "debug.angle.markers";
 }  // namespace
 
 // RendererVk implementation.
@@ -2462,12 +2465,29 @@ void RendererVk::onCompletedSerial(Serial serial)
 
 void RendererVk::setGlobalDebugAnnotator()
 {
-    // If the vkCmd*DebugUtilsLabelEXT functions exist, initialize DebugAnnotatorVk to log the
-    // OpenGL ES commands that are used, for debuggers (e.g. AGI).
+    // If the vkCmd*DebugUtilsLabelEXT functions exist, and if the kEnableDebugMarkersVarName
+    // environment variable is set, initialize DebugAnnotatorVk to log the OpenGL ES commands that
+    // are used, for debuggers (e.g. AGI).  Otherwise, uninitialize the global  DebugAnnotator
+    // pointer so that applications run full speed.
+    bool enableDebugAnnotatorVk = false;
     if (vkCmdBeginDebugUtilsLabelEXT)
     {
+        std::string enabled = angle::GetEnvironmentVarFromAndroidProperty(
+            kEnableDebugMarkersVarName, kEnableDebugMarkersPropertyName);
+        if (!enabled.empty() && enabled.compare("0") != 0)
+        {
+            enableDebugAnnotatorVk = true;
+        }
+    }
+
+    if (enableDebugAnnotatorVk)
+    {
         gl::InitializeDebugAnnotations(&mAnnotator);
     }
+    else
+    {
+        gl::UninitializeDebugAnnotations();
+    }
 }
 
 void RendererVk::reloadVolkIfNeeded() const