OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Use util_call_once_data instead of mtx_t init_once_lock

Browse Source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19154>
This commit is contained in:
Yonggang Luo
2022-08-24 04:00:04 +08:00
committed by Marge Bot
parent 86290c81b2
commit 2b3529d3d8
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mesa/main/context.c
View File

@@ -127,6 +127,7 @@
#include "util/debug.h"
#include "util/disk_cache.h"
#include "util/strtod.h"
#include "util/u_call_once.h"
#include "stencil.h"
#include "shaderimage.h"
#include "texcompress_s3tc.h"
@@ -238,20 +239,6 @@ one_time_init(const char *extensions_override)
_mesa_init_remap_table();
}
/**
* One-time initialization flag
*
* \sa Used by _mesa_initialize().
*/
static bool init_done = false;
static mtx_t init_once_lock;
static once_flag init_once = ONCE_FLAG_INIT;
static void init_lock(void) {
mtx_init(&init_once_lock, mtx_plain);
}
/**
* Calls all the various one-time-init functions in Mesa.
*
@@ -262,14 +249,9 @@ static void init_lock(void) {
void
_mesa_initialize(const char *extensions_override)
{
call_once(&init_once, init_lock);
mtx_lock(&init_once_lock);
if (!init_done) {
one_time_init(extensions_override);
init_done = true;
}
mtx_unlock(&init_once_lock);
static util_once_flag once = UTIL_ONCE_FLAG_INIT;
util_call_once_data(&once,
(util_call_once_data_func)one_time_init, extensions_override);
}