Create a recursive version of MutexLock, and apply it to EGL.

src/Common/RecursiveLock.hpp

+// Copyright 2019 The SwiftShader Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef sw_RecursiveLock_hpp
+#define sw_RecursiveLock_hpp
+
+#include "Thread.hpp"
+
+#include <mutex>
+
+namespace sw
+{
+	class RecursiveLock
+	{
+	public:
+		RecursiveLock()
+		{
+		}
+
+		bool attemptLock()
+		{
+			return mutex.try_lock();
+		}
+
+		void lock()
+		{
+			mutex.lock();
+		}
+
+		void unlock()
+		{
+			mutex.unlock();
+		}
+	private:
+		std::recursive_mutex mutex;
+	};
+}
+
+class RecursiveLockGuard
+{
+public:
+	explicit RecursiveLockGuard(sw::RecursiveLock &mutex) : mutex(&mutex)
+	{
+		mutex.lock();
+	}
+
+	explicit RecursiveLockGuard(sw::RecursiveLock *mutex) : mutex(mutex)
+	{
+		if (mutex) mutex->lock();
+	}
+
+	~RecursiveLockGuard()
+	{
+		if (mutex) mutex->unlock();
+	}
+
+protected:
+	sw::RecursiveLock *mutex;
+};
+
+#endif   // sw_RecursiveLock_hpp

src/OpenGL/libEGL/Display.cpp

@@ -23,7 +23,7 @@
 #include "libEGL/Context.hpp"
 #include "common/Image.hpp"
 #include "common/debug.h"
-#include "Common/MutexLock.hpp"
+#include "Common/RecursiveLock.hpp"
 
 #ifdef __ANDROID__
 #include <system/window.h>

src/OpenGL/libEGL/Display.h

@@ -20,8 +20,8 @@
 #define INCLUDE_DISPLAY_H_
 
 #include "Config.h"
-#include "Common/MutexLock.hpp"
 #include "Sync.hpp"
+#include "Common/RecursiveLock.hpp"
 #include "common/NameSpace.hpp"
 
 #include <set>
@@ -86,7 +86,7 @@ namespace egl
 		bool destroySharedImage(EGLImageKHR);
 		virtual Image *getSharedImage(EGLImageKHR name) = 0;
 
-		sw::MutexLock *getLock() { return &mApiMutex; }
+		sw::RecursiveLock *getLock() { return &mApiMutex; }
 
 	private:
 		sw::Format getDisplayFormat() const;
@@ -109,7 +109,7 @@ namespace egl
 		SyncSet mSyncSet;
 
 		gl::NameSpace<Image> mSharedImageNameSpace;
-		sw::MutexLock mApiMutex;
+		sw::RecursiveLock mApiMutex;
 	};
 }