fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 06:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Replace program locks with atomic inc/dec.

Browse source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Matt Turner 2017-04-05 10:49:35 +10:00 • committed by Timothy Arceri
parent 060a6434ec
commit d5ee55f028
3 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/glsl/standalone.cpp
View file

@ -103,8 +103,6 @@ private:
void
init_gl_program(struct gl_program *prog, GLenum target, bool is_arb_asm)
{
mtx_init(&prog->Mutex, mtx_plain);
prog->RefCount = 1;
prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;
prog->is_arb_asm = is_arb_asm;

1
src/mesa/main/mtypes.h
View file

@ -1939,7 +1939,6 @@ struct gl_program
/** FIXME: This must be first until we split shader_info from nir_shader */
struct shader_info info;
mtx_t Mutex;
GLuint Id;
GLint RefCount;
GLubyte *String; /**< Null-terminated program text */

15
src/mesa/program/program.c
View file

@ -40,6 +40,7 @@
#include "prog_parameter.h"
#include "prog_instruction.h"
#include "util/ralloc.h"
#include "util/u_atomic.h"
/**
@ -185,7 +186,6 @@ _mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint id,
return NULL;
memset(prog, 0, sizeof(*prog));
mtx_init(&prog->Mutex, mtx_plain);
prog->Id = id;
prog->Target = target;
prog->RefCount = 1;
@ -271,7 +271,6 @@ _mesa_delete_program(struct gl_context *ctx, struct gl_program *prog)
ralloc_free(prog->nir);
}
mtx_destroy(&prog->Mutex);
ralloc_free(prog);
}
@ -316,17 +315,11 @@ _mesa_reference_program_(struct gl_context *ctx,
#endif
if (*ptr) {
GLboolean deleteFlag;
struct gl_program *oldProg = *ptr;
mtx_lock(&oldProg->Mutex);
assert(oldProg->RefCount > 0);
oldProg->RefCount--;
deleteFlag = (oldProg->RefCount == 0);
mtx_unlock(&oldProg->Mutex);
if (deleteFlag) {
if (p_atomic_dec_zero(&oldProg->RefCount)) {
assert(ctx);
_mesa_reference_shader_program_data(ctx, &oldProg->sh.data, NULL);
ctx->Driver.DeleteProgram(ctx, oldProg);
@ -337,9 +330,7 @@ _mesa_reference_program_(struct gl_context *ctx,
assert(!*ptr);
if (prog) {
mtx_lock(&prog->Mutex);
prog->RefCount++;
mtx_unlock(&prog->Mutex);
p_atomic_inc(&prog->RefCount);
}
*ptr = prog;