Lock around all EGL and GL calls with a global mutex.

BUG=angleproject:2464 Change-Id: I0231cc84777272f9cf26298c6a137f1ad3fd51d6 Reviewed-on: https://chromium-review.googlesource.com/1183441 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
justinoue · Aug 31, 2018 · b02fc66 · b02fc66
1 parent 86792f4
commit b02fc66
Show file tree

Hide file tree

Showing 14 changed files with 1,321 additions and 5 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -76,6 +76,10 @@ config("internal_config") {
   } else {
     defines += [ "ANGLE_IS_32_BIT_CPU" ]
   }
+
+  if (angle_force_thread_safety) {
+    defines += [ "ANGLE_FORCE_THREAD_SAFETY=1" ]
+  }
 }
 
 config("extra_warnings") {

diff --git a/gni/angle.gni b/gni/angle.gni
@@ -64,6 +64,7 @@ declare_args() {
   angle_enable_null = true
   angle_enable_essl = true
   angle_enable_glsl = true
+  angle_force_thread_safety = false
 }
 
 declare_args() {

diff --git a/scripts/generate_entry_points.py b/scripts/generate_entry_points.py
@@ -181,6 +181,7 @@
 
 template_entry_point_def = """{return_type}GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params})
 {{
+    ANGLE_SCOPED_GLOBAL_LOCK();
     {event_comment}EVENT("({format_params})"{comma_if_needed}{pass_params});
 
     Context *context = {context_getter};

diff --git a/scripts/run_code_generation_hashes.json b/scripts/run_code_generation_hashes.json
@@ -48,7 +48,7 @@
   "GL entry point:scripts/entry_point_packed_gl_enums.json":
     "df2c879ccb62109a31c24d4b1df45354",
   "GL entry point:scripts/generate_entry_points.py":
-    "bfe4041311e3ae882ed218e306d7b683",
+    "5a110a1e99777cf8c904f30e54af15a1",
   "GL entry point:scripts/gl.xml":
     "b470cb06b06cbbe7adb2c8129ec85708",
   "GL format map:src/libANGLE/es3_format_type_combinations.json":

diff --git a/src/libANGLE/features.h b/src/libANGLE/features.h
@@ -62,4 +62,9 @@
 #endif  // defined(ANGLE_PLATFORM_WINDOWS)
 #endif  // !defined(ANGLE_STD_ASYNC_WORKERS)
 
-#endif // LIBANGLE_FEATURES_H_
+// Force thread safety in all of ANGLE by locking a global mutex in every ANGLE entry point.
+#if !defined(ANGLE_FORCE_THREAD_SAFETY)
+#define ANGLE_FORCE_THREAD_SAFETY ANGLE_DISABLED
+#endif  // !defined(ANGLE_FORCE_THREAD_SAFETY)
+
+#endif  // LIBANGLE_FEATURES_H_