Vulkan: Print the device id in the renderer string.

Add a end2end test that prints all strings to help debug on the bots. BUG=angleproject:3026 Change-Id: Ia524a0d7dac88e55e0aa67412339e646a5564e64 Reviewed-on: https://chromium-review.googlesource.com/c/1378686 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Print the device id in the renderer string.
a7af56be · Geoff Lang · Commit Bot · e1f742af · a7af56be · a7af56be
Commit a7af56be authored Dec 14, 2018 by Geoff Lang Committed by Commit Bot Dec 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +4 -1

RendererTest.cpp src/tests/gl_tests/RendererTest.cpp +10 -0

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -745,7 +745,10 @@ std::string RendererVk::getRendererDescription() const
        strstr << GetVendorString(mPhysicalDeviceProperties.vendorID) << " ";
    }

-    strstr << mPhysicalDeviceProperties.deviceName << ")";
+    strstr << mPhysicalDeviceProperties.deviceName;
+    strstr << " (" << gl::FmtHex(mPhysicalDeviceProperties.deviceID) << ")";
+
+    strstr << ")";

    return strstr.str();
 }

--- a/src/tests/gl_tests/RendererTest.cpp
+++ b/src/tests/gl_tests/RendererTest.cpp
@@ -28,6 +28,16 @@ class RendererTest : public ANGLETest
    }
 };

+// Print vendor, renderer, version and extension strings. Useful for debugging.
+TEST_P(RendererTest, Strings)
+{
+    std::cout << "Renderer: " << glGetString(GL_RENDERER) << std::endl;
+    std::cout << "Vendor: " << glGetString(GL_VENDOR) << std::endl;
+    std::cout << "Version: " << glGetString(GL_VERSION) << std::endl;
+    std::cout << "Extensions: " << glGetString(GL_EXTENSIONS) << std::endl;
+    EXPECT_GL_NO_ERROR();
+}
+
 TEST_P(RendererTest, RequestedRendererCreated)
 {
    std::string rendererString =