DisplayNULL::makeCurrent() must install DebugAnnotator

When the ANGLE end2end tests change back-ends, the null driver must install the correct global DebugAnnotator, so that the DebugAnnotator from another driver is not used. Bug: chromium:1135860 Change-Id: I11aa386995283aa214df1faa62392dc6a6cbef0d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2457126Reviewed-by: Ian Elliott <ianelliott@google.com> Commit-Queue: Ian Elliott <ianelliott@google.com>

DisplayNULL::makeCurrent() must install DebugAnnotator
4c5f602c · Ian Elliott · Commit Bot · 34951b79 · 4c5f602c
Commit 4c5f602c authored Oct 07, 2020 by Ian Elliott Committed by Commit Bot Oct 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

DisplayNULL.cpp src/libANGLE/renderer/null/DisplayNULL.cpp +5 -0

No files found.
--- a/src/libANGLE/renderer/null/DisplayNULL.cpp
+++ b/src/libANGLE/renderer/null/DisplayNULL.cpp
@@ -11,6 +11,7 @@
 #include "common/debug.h"
+#include "libANGLE/Display.h"
 #include "libANGLE/renderer/null/ContextNULL.h"
 #include "libANGLE/renderer/null/DeviceNULL.h"
 #include "libANGLE/renderer/null/ImageNULL.h"
@@ -41,6 +42,10 @@ egl::Error DisplayNULL::makeCurrent(egl::Display *display,
                                    egl::Surface *readSurface,
                                    gl::Context *context)
 {
+    // Ensure that the correct global DebugAnnotator is installed when the end2end tests change
+    // the ANGLE back-end (done frequently).
+    display->setGlobalDebugAnnotator();
    return egl::NoError();
 }