Move ANGLE Platform Methods init to GetDisplay.

Moving the Platform Methods init to GetDisplay allows us to override the platform methods as soon as possible. This lets Chromium override the methods via ANGLEGetDisplayPlatform. It also lets us reset the platform methods when making a new display. Note that because the methods pointer is global it's a bit tricky to manage between swapping configs in ANGLE tests. Using a separate test process for each config should help. Bug: angleproject:3393 Change-Id: I351f86422e53075563f6d8fce32efbd40023cd23 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1592045 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

Move ANGLE Platform Methods init to GetDisplay.
989bc9a3 · Jamie Madill · Commit Bot · 7d36b55e · 989bc9a3
Commit 989bc9a3 authored May 02, 2019 by Jamie Madill Committed by Commit Bot May 03, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 11 deletions

Display.cpp src/libANGLE/Display.cpp +6 -11

No files found.
--- a/src/libANGLE/Display.cpp
+++ b/src/libANGLE/Display.cpp
@@ -312,11 +312,6 @@ void Display_logInfo(angle::PlatformMethods *platform, const char *infoMessage)
 void ANGLESetDefaultDisplayPlatform(angle::EGLDisplayType display)
 {
    angle::PlatformMethods *platformMethods = ANGLEPlatformCurrent();
-    if (platformMethods->logError != angle::DefaultLogError)
-    {
-        // Don't reset pre-set Platform to Default
-        return;
-    }
    ANGLEResetDisplayPlatform(display);
    platformMethods->logError   = Display_logError;
@@ -490,12 +485,6 @@ void Display::setAttributes(rx::DisplayImpl *impl, const AttributeMap &attribMap
    mImplementation = impl;
    mAttributeMap = attribMap;
-}
-Error Display::initialize()
-{
-    ASSERT(mImplementation != nullptr);
-    mImplementation->setBlobCache(&mBlobCache);
    // TODO(jmadill): Store Platform in Display and init here.
    const angle::PlatformMethods *platformMethods =
@@ -509,6 +498,12 @@ Error Display::initialize()
    {
        ANGLESetDefaultDisplayPlatform(this);
    }
+}
+Error Display::initialize()
+{
+    ASSERT(mImplementation != nullptr);
+    mImplementation->setBlobCache(&mBlobCache);
    gl::InitializeDebugAnnotations(&mAnnotator);