From 82b420df32c829c0ff177771af2188cfcaf47374 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 1 Oct 2021 15:59:00 -0400 Subject: [PATCH] mesa: use simple_mtx_t for ShaderIncludeMutex Acked-By: Mike Blumenkrantz Reviewed-by: Timothy Arceri Reviewed-by: Kristian H. Kristensen Part-of: --- src/mesa/main/mtypes.h | 2 +- src/mesa/main/shaderapi.c | 12 ++++++------ src/mesa/main/shared.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 96875b9..f00f58a 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3442,7 +3442,7 @@ struct gl_shared_state /* glCompileShaderInclude expects ShaderIncludes not to change while it is * in progress. */ - mtx_t ShaderIncludeMutex; + simple_mtx_t ShaderIncludeMutex; /** * Some context in this share group was affected by a GPU reset diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 9381924..1dda13d 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -3577,7 +3577,7 @@ _mesa_NamedStringARB(GLenum type, GLint namelen, const GLchar *name, return; } - mtx_lock(&ctx->Shared->ShaderIncludeMutex); + simple_mtx_lock(&ctx->Shared->ShaderIncludeMutex); struct hash_table *path_ht = ctx->Shared->ShaderIncludes->shader_include_tree; @@ -3606,7 +3606,7 @@ _mesa_NamedStringARB(GLenum type, GLint namelen, const GLchar *name, } } - mtx_unlock(&ctx->Shared->ShaderIncludeMutex); + simple_mtx_unlock(&ctx->Shared->ShaderIncludeMutex); free(name_cp); ralloc_free(mem_ctx); @@ -3632,12 +3632,12 @@ _mesa_DeleteNamedStringARB(GLint namelen, const GLchar *name) return; } - mtx_lock(&ctx->Shared->ShaderIncludeMutex); + simple_mtx_lock(&ctx->Shared->ShaderIncludeMutex); free(shader_include->shader_source); shader_include->shader_source = NULL; - mtx_unlock(&ctx->Shared->ShaderIncludeMutex); + simple_mtx_unlock(&ctx->Shared->ShaderIncludeMutex); free(name_cp); } @@ -3657,7 +3657,7 @@ _mesa_CompileShaderIncludeARB(GLuint shader, GLsizei count, void *mem_ctx = ralloc_context(NULL); - mtx_lock(&ctx->Shared->ShaderIncludeMutex); + simple_mtx_lock(&ctx->Shared->ShaderIncludeMutex); ctx->Shared->ShaderIncludes->include_paths = ralloc_array_size(mem_ctx, sizeof(struct sh_incl_path_entry *), count); @@ -3701,7 +3701,7 @@ exit: ctx->Shared->ShaderIncludes->relative_path_cursor = 0; ctx->Shared->ShaderIncludes->include_paths = NULL; - mtx_unlock(&ctx->Shared->ShaderIncludeMutex); + simple_mtx_unlock(&ctx->Shared->ShaderIncludeMutex); ralloc_free(mem_ctx); } diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index f91dfd6..0f7256b 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -96,7 +96,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx) /* ARB_shading_language_include */ _mesa_init_shader_includes(shared); - mtx_init(&shared->ShaderIncludeMutex, mtx_plain); + simple_mtx_init(&shared->ShaderIncludeMutex, mtx_plain); /* Create default texture objects */ for (i = 0; i < NUM_TEXTURE_TARGETS; i++) { @@ -446,7 +446,7 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared) /* ARB_shading_language_include */ _mesa_destroy_shader_includes(shared); - mtx_destroy(&shared->ShaderIncludeMutex); + simple_mtx_destroy(&shared->ShaderIncludeMutex); if (shared->MemoryObjects) { _mesa_HashDeleteAll(shared->MemoryObjects, delete_memory_object_cb, ctx); -- 2.7.4