Fix crash in multi-context D3D11 backend.

src/libGLESv2/egl_stubs.cpp

@@ -481,7 +481,6 @@ EGLBoolean MakeCurrent(Thread *thread,
         ANGLE_EGL_TRY_RETURN(
             thread, display->makeCurrent(previousContext, drawSurface, readSurface, context),
             "eglMakeCurrent", GetContextIfValid(display, context), EGL_FALSE);
-
         SetContextCurrent(thread, context);
     }
 

src/libGLESv2/global_state.cpp

@@ -99,7 +99,11 @@ void SetContextCurrent(Thread *thread, gl::Context *context)
     gCurrentThread->setCurrent(context);
     SetContextToAndroidOpenGLTLSSlot(context);
     gl::gCurrentValidContext = context;
+#if defined(ANGLE_FORCE_CONTEXT_CHECK_EVERY_CALL)
+    DirtyContextIfNeeded(context);
+#endif
 }
+
 }  // namespace egl
 
 namespace gl

src/libGLESv2/global_state.h

@@ -140,17 +140,26 @@ ANGLE_INLINE Context *GetValidGlobalContext()
 void GenerateContextLostErrorOnContext(Context *context);
 void GenerateContextLostErrorOnCurrentGlobalContext();
 
-ANGLE_INLINE std::unique_lock<angle::GlobalMutex> GetContextLock(Context *context)
-{
 #if defined(ANGLE_FORCE_CONTEXT_CHECK_EVERY_CALL)
-    auto lock = std::unique_lock<angle::GlobalMutex>(egl::GetGlobalMutex());
-    // TODO(b/177574181): This should be handled in a backend-specific way.
-    // if previous context different from current context, dirty all state
-    if (context != egl::GetGlobalLastContext())
+// TODO(b/177574181): This should be handled in a backend-specific way.
+// if previous context different from current context, dirty all state
+static ANGLE_INLINE void DirtyContextIfNeeded(Context *context)
+{
+    if (context && context != egl::GetGlobalLastContext())
     {
         context->dirtyAllState();
         SetGlobalLastContext(context);
     }
+}
+
+#endif
+
+ANGLE_INLINE std::unique_lock<angle::GlobalMutex> GetContextLock(Context *context)
+{
+#if defined(ANGLE_FORCE_CONTEXT_CHECK_EVERY_CALL)
+    auto lock = std::unique_lock<angle::GlobalMutex>(egl::GetGlobalMutex());
+
+    DirtyContextIfNeeded(context);
     return lock;
 #else
     return context->isShared() ? std::unique_lock<angle::GlobalMutex>(egl::GetGlobalMutex())