commit 83740f9795844dd947543e03fd9a69155054b79b
author Cody Northrop <cnorthrop@google.com> Mon Apr 22 17:56:56 2019
committer Commit Bot <commit-bot@chromium.org> Tue Apr 23 18:59:14 2019
tree bb6c63e7080eeb77838ba68d9b562e42f5a7f12b
parent cff6f150eae166d0b3aefb11dba11947a6d12a3d

Android: Add ANGLE version to logcat

We need addtional info in logcat to diagnose ANGLE issues.

Before this, only Vulkan version and hardware details are reported:

  ANGLE : Vulkan 1.1.87(Adreno (TM) 540 (0x05040001))

After this, we also get the ANGLE version:

  ANGLE : Version (2.1.0.bc20af89d498), Renderer (Vulkan 1.1.87(Adreno (TM) 540 (0x05040001)))

Bug: angleproject:3395
Change-Id: I4b67fe5ce389d3d2d641a4cc8b2e0b67649dc70d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1579044
Reviewed-by: Tim Van Patten <timvp@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Cody Northrop <cnorthrop@google.com>

src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp

diff --git a/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp b/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
index 66fdadb..cdb25dd 100644
--- a/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
+++ b/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
@@ -13,6 +13,7 @@
 #include <android/native_window.h>
 #include <vulkan/vulkan.h>
 
+#include "common/version.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.h"
 #include "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h"
@@ -26,8 +27,12 @@
 egl::Error DisplayVkAndroid::initialize(egl::Display *display)
 {
     ANGLE_TRY(DisplayVk::initialize(display));
-    std::string rendererDescription = mRenderer->getRendererDescription();
-    __android_log_print(ANDROID_LOG_INFO, "ANGLE", "%s", rendererDescription.c_str());
+
+    std::stringstream strstr;
+    strstr << "Version (" << ANGLE_VERSION_STRING << "), ";
+    strstr << "Renderer (" << mRenderer->getRendererDescription() << ")";
+    __android_log_print(ANDROID_LOG_INFO, "ANGLE", "%s", strstr.str().c_str());
+
     return egl::NoError();
 }