From f19000550d8fa4a8a6d8659fdc2a564dcaee7552 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 1 Mar 2014 10:21:07 -0700 Subject: [PATCH] glsl: switch to c11 mutex functions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: José Fonseca --- src/glsl/builtin_functions.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index b9dc95902be..a52077d0634 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -4351,7 +4351,7 @@ builtin_builder::_memory_barrier(builtin_available_predicate avail) /* The singleton instance of builtin_builder. */ static builtin_builder builtins; -_glthread_DECLARE_STATIC_MUTEX(builtins_lock); +static mtx_t builtins_lock = _MTX_INITIALIZER_NP; /** * External API (exposing the built-in module to the rest of the compiler): @@ -4360,17 +4360,17 @@ _glthread_DECLARE_STATIC_MUTEX(builtins_lock); void _mesa_glsl_initialize_builtin_functions() { - _glthread_LOCK_MUTEX(builtins_lock); + mtx_lock(&builtins_lock); builtins.initialize(); - _glthread_UNLOCK_MUTEX(builtins_lock); + mtx_unlock(&builtins_lock); } void _mesa_glsl_release_builtin_functions() { - _glthread_LOCK_MUTEX(builtins_lock); + mtx_lock(&builtins_lock); builtins.release(); - _glthread_UNLOCK_MUTEX(builtins_lock); + mtx_unlock(&builtins_lock); } ir_function_signature * @@ -4378,9 +4378,9 @@ _mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state, const char *name, exec_list *actual_parameters) { ir_function_signature * s; - _glthread_LOCK_MUTEX(builtins_lock); + mtx_lock(&builtins_lock); s = builtins.find(state, name, actual_parameters); - _glthread_UNLOCK_MUTEX(builtins_lock); + mtx_unlock(&builtins_lock); return s; } -- 2.30.2