Log Renderer string on Android displays.

This adds a custom logging step to DisplayAndroid and DisplayVkAndroid. It's easiest to add to these two classes since we have no common info logging code and other platforms may not want startup spam. It would also be possible to put this into debug info hooks. Bug: angleproject:2823 Change-Id: I12a1ea9e27880648d8a73a9e3faa56f318620cbe Reviewed-on: https://chromium-review.googlesource.com/1230273Reviewed-by: Ian Elliott <ianelliott@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>

Log Renderer string on Android displays.
80efe08d · Jamie Madill · Commit Bot · fcfd3382 · 80efe08d · 80efe08d
Commit 80efe08d authored Sep 18, 2018 by Jamie Madill Committed by Commit Bot Sep 18, 2018
3 changed files
--- a/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
+++ b/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
@@ -6,6 +6,9 @@

 // DisplayAndroid.cpp: Android implementation of egl::Display

+#include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h"
+
+#include <android/log.h>
 #include <android/native_window.h>

 #include "common/debug.h"
@@ -19,7 +22,6 @@
 #include "libANGLE/renderer/gl/egl/PbufferSurfaceEGL.h"
 #include "libANGLE/renderer/gl/egl/RendererEGL.h"
 #include "libANGLE/renderer/gl/egl/WindowSurfaceEGL.h"
-#include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h"
 #include "libANGLE/renderer/gl/renderergl_utils.h"

 namespace
@@ -161,7 +163,11 @@ egl::Error DisplayAndroid::initialize(egl::Display *display)
        return egl::EglNotInitialized() << "OpenGL ES 2.0 is not supportable.";
    }

-    return DisplayGL::initialize(display);
+    ANGLE_TRY(DisplayGL::initialize(display));
+
+    std::string rendererDescription = mRenderer->getRendererDescription();
+    __android_log_print(ANDROID_LOG_INFO, "ANGLE", "%s", rendererDescription.c_str());
+    return egl::NoError();
 }

 void DisplayAndroid::terminate()

--- a/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
+++ b/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.cpp
@@ -9,9 +9,11 @@

 #include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h"

+#include <android/log.h>
 #include <android/native_window.h>
 #include <vulkan/vulkan.h>

+#include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.h"
 #include "libANGLE/renderer/vulkan/vk_caps_utils.h"

@@ -22,6 +24,14 @@ DisplayVkAndroid::DisplayVkAndroid(const egl::DisplayState &state) : DisplayVk(s
 {
 }

+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());
+    return egl::NoError();
+}
+
 bool DisplayVkAndroid::isValidNativeWindow(EGLNativeWindowType window) const
 {
    return (ANativeWindow_getFormat(window) >= 0);

--- a/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
+++ b/src/libANGLE/renderer/vulkan/android/DisplayVkAndroid.h
@@ -19,6 +19,8 @@ class DisplayVkAndroid : public DisplayVk
  public:
    DisplayVkAndroid(const egl::DisplayState &state);

+    egl::Error initialize(egl::Display *display) override;
+
    bool isValidNativeWindow(EGLNativeWindowType window) const override;

    SurfaceImpl *createWindowSurfaceVk(const egl::SurfaceState &state,