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

glsl: Remove the need of _MTX_INITIALIZER_NP by using simple_mtx_t/SIMPLE_MTX_INITIALIZER

Browse Source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18493>
This commit is contained in:
Yonggang Luo
2022-09-06 23:03:47 +08:00
committed by Marge Bot
parent db708b7e9c
commit e518ff4fd5
3 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/compiler/glsl/builtin_functions.cpp
View File

@@ -75,6 +75,7 @@
#include <stdarg.h>
#include <stdio.h>
#include "util/simple_mtx.h"
#include "main/consts_exts.h"
#include "main/shader_types.h"
#include "main/shaderobj.h"
@@ -97,7 +98,7 @@
using namespace ir_builder;
static mtx_t builtins_lock = _MTX_INITIALIZER_NP;
static simple_mtx_t builtins_lock = SIMPLE_MTX_INITIALIZER;
/**
* Availability predicates:
@@ -1388,7 +1389,7 @@ builtin_builder::builtin_builder()
builtin_builder::~builtin_builder()
{
mtx_lock(&builtins_lock);
simple_mtx_lock(&builtins_lock);
ralloc_free(mem_ctx);
mem_ctx = NULL;
@@ -1396,7 +1397,7 @@ builtin_builder::~builtin_builder()
ralloc_free(shader);
shader = NULL;
mtx_unlock(&builtins_lock);
simple_mtx_unlock(&builtins_lock);
}
ir_function_signature *
@@ -8510,20 +8511,20 @@ static uint32_t builtin_users = 0;
extern "C" void
_mesa_glsl_builtin_functions_init_or_ref()
{
mtx_lock(&builtins_lock);
simple_mtx_lock(&builtins_lock);
if (builtin_users++ == 0)
builtins.initialize();
mtx_unlock(&builtins_lock);
simple_mtx_unlock(&builtins_lock);
}
extern "C" void
_mesa_glsl_builtin_functions_decref()
{
mtx_lock(&builtins_lock);
simple_mtx_lock(&builtins_lock);
assert(builtin_users != 0);
if (--builtin_users == 0)
builtins.release();
mtx_unlock(&builtins_lock);
simple_mtx_unlock(&builtins_lock);
}
ir_function_signature *
@@ -8531,9 +8532,9 @@ _mesa_glsl_find_builtin_function(_mesa_glsl_parse_state *state,
const char *name, exec_list *actual_parameters)
{
ir_function_signature *s;
mtx_lock(&builtins_lock);
simple_mtx_lock(&builtins_lock);
s = builtins.find(state, name, actual_parameters);
mtx_unlock(&builtins_lock);
simple_mtx_unlock(&builtins_lock);
return s;
}
@@ -8543,7 +8544,7 @@ _mesa_glsl_has_builtin_function(_mesa_glsl_parse_state *state, const char *name)
{
ir_function *f;
bool ret = false;
mtx_lock(&builtins_lock);
simple_mtx_lock(&builtins_lock);
f = builtins.shader->symbols->get_function(name);
if (f != NULL) {
foreach_in_list(ir_function_signature, sig, &f->signatures) {
@@ -8553,7 +8554,7 @@ _mesa_glsl_has_builtin_function(_mesa_glsl_parse_state *state, const char *name)
}
}
}
mtx_unlock(&builtins_lock);
simple_mtx_unlock(&builtins_lock);
return ret;
}