Guard ID3DUserDefinedAnnotation access in DebugAnnotator11.

src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp

@@ -26,6 +26,7 @@ void DebugAnnotator11::beginEvent(const char *eventName, const char *eventMessag
     {
         std::mbstate_t state = std::mbstate_t();
         std::mbsrtowcs(mWCharMessage, &eventMessage, kMaxMessageLength, &state);
+        std::lock_guard<std::mutex> lock(mAnnotationMutex);
         mUserDefinedAnnotation->BeginEvent(mWCharMessage);
     }
 }
@@ -35,6 +36,7 @@ void DebugAnnotator11::endEvent(const char *eventName)
     angle::LoggingAnnotator::endEvent(eventName);
     if (mUserDefinedAnnotation != nullptr)
     {
+        std::lock_guard<std::mutex> lock(mAnnotationMutex);
         mUserDefinedAnnotation->EndEvent();
     }
 }
@@ -46,6 +48,7 @@ void DebugAnnotator11::setMarker(const char *markerName)
     {
         std::mbstate_t state = std::mbstate_t();
         std::mbsrtowcs(mWCharMessage, &markerName, kMaxMessageLength, &state);
+        std::lock_guard<std::mutex> lock(mAnnotationMutex);
         mUserDefinedAnnotation->SetMarker(mWCharMessage);
     }
 }
@@ -54,6 +57,7 @@ bool DebugAnnotator11::getStatus()
 {
     if (mUserDefinedAnnotation != nullptr)
     {
+        std::lock_guard<std::mutex> lock(mAnnotationMutex);
         return !!(mUserDefinedAnnotation->GetStatus());
     }
 

src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h

@@ -11,6 +11,8 @@
 
 #include "libANGLE/LoggingAnnotator.h"
 
+#include <mutex>
+
 namespace rx
 {
 
@@ -30,6 +32,7 @@ class DebugAnnotator11 : public angle::LoggingAnnotator
     angle::ComPtr<ID3DUserDefinedAnnotation> mUserDefinedAnnotation;
     static constexpr size_t kMaxMessageLength = 256;
     wchar_t mWCharMessage[kMaxMessageLength];
+    std::mutex mAnnotationMutex;
 };
 
 }  // namespace rx