Perf Tests: Handle logError callback.

This will force errors when ANGLE runs into Vulkan Validation Layer failures and other internal bugs. Currently we could sometimes fail silently. Especially on Android where the error would only show up in logcat. Bug: angleproject:4909 Change-Id: Ie2888805c577d9fbad417d45a33e3269966b7b25 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2330091 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com>

Perf Tests: Handle logError callback.
48d951e2 · Jamie Madill · Commit Bot · 6eb7756d · 48d951e2 · 48d951e2
Commit 48d951e2 authored Jul 30, 2020 by Jamie Madill Committed by Commit Bot Aug 11, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

ANGLEPerfTest.cpp src/tests/perf_tests/ANGLEPerfTest.cpp +12 -1

ANGLEPerfTest.h src/tests/perf_tests/ANGLEPerfTest.h +1 -0

No files found.
--- a/src/tests/perf_tests/ANGLEPerfTest.cpp
+++ b/src/tests/perf_tests/ANGLEPerfTest.cpp
@@ -55,6 +55,12 @@ constexpr TraceCategory gTraceCategories[2] = {

 void EmptyPlatformMethod(angle::PlatformMethods *, const char *) {}

+void CustomLogError(angle::PlatformMethods *platform, const char *errorMessage)
+{
+    auto *angleRenderTest = static_cast<ANGLERenderTest *>(platform->context);
+    angleRenderTest->onErrorMessage(errorMessage);
+}
+
 void OverrideWorkaroundsD3D(angle::PlatformMethods *platform, angle::FeaturesD3D *featuresD3D)
 {
    auto *angleRenderTest = static_cast<ANGLERenderTest *>(platform->context);
@@ -519,7 +525,7 @@ void ANGLERenderTest::SetUp()
    }

    mPlatformMethods.overrideWorkaroundsD3D      = OverrideWorkaroundsD3D;
-    mPlatformMethods.logError                    = EmptyPlatformMethod;
+    mPlatformMethods.logError                    = CustomLogError;
    mPlatformMethods.logWarning                  = EmptyPlatformMethod;
    mPlatformMethods.logInfo                     = EmptyPlatformMethod;
    mPlatformMethods.addTraceEvent               = AddPerfTraceEvent;
@@ -821,6 +827,11 @@ std::vector<TraceEvent> &ANGLERenderTest::getTraceEventBuffer()
    return mTraceEventBuffer;
 }

+void ANGLERenderTest::onErrorMessage(const char *errorMessage)
+{
+    FAIL() << "Failing test because of unexpected internal ANGLE error:\n" << errorMessage << "\n";
+}
+
 namespace angle
 {
 double GetHostTimeSeconds()

--- a/src/tests/perf_tests/ANGLEPerfTest.h
+++ b/src/tests/perf_tests/ANGLEPerfTest.h
@@ -151,6 +151,7 @@ class ANGLERenderTest : public ANGLEPerfTest
    std::vector<TraceEvent> &getTraceEventBuffer();

    virtual void overrideWorkaroundsD3D(angle::FeaturesD3D *featuresD3D) {}
+    void onErrorMessage(const char *errorMessage);

  protected:
    const RenderTestParams &mTestParams;