diff options
author | Matt Turner <mattst88@gmail.com> | 2015-07-30 14:31:04 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2016-05-20 10:05:09 -0700 |
commit | 015f2207cfa2334fb3bca5b6b941666ebf73e829 (patch) | |
tree | f81f353c0401073c5e0d0748d1530045fe06b0ea /src/mesa/main/atifragshader.c | |
parent | aded1160e5e722610dd474583d78e745291cbd75 (diff) | |
download | external_mesa3d-015f2207cfa2334fb3bca5b6b941666ebf73e829.zip external_mesa3d-015f2207cfa2334fb3bca5b6b941666ebf73e829.tar.gz external_mesa3d-015f2207cfa2334fb3bca5b6b941666ebf73e829.tar.bz2 |
mesa: Replace uses of Shared->Mutex with hash-table mutexes
We were locking the Shared->Mutex and then using calling functions like
_mesa_HashInsert that do additional per-hash-table locking internally.
Instead just lock each hash-table's mutex and use functions like
_mesa_HashInsertLocked and the new _mesa_HashRemoveLocked.
In order to do this, we need to remove the locking from
_mesa_HashFindFreeKeyBlock since it will always be called with the
per-hash-table lock taken.
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/atifragshader.c')
-rw-r--r-- | src/mesa/main/atifragshader.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c index 34f45c6..83a449a 100644 --- a/src/mesa/main/atifragshader.c +++ b/src/mesa/main/atifragshader.c @@ -201,11 +201,15 @@ _mesa_GenFragmentShadersATI(GLuint range) return 0; } + _mesa_HashLockMutex(ctx->Shared->ATIShaders); + first = _mesa_HashFindFreeKeyBlock(ctx->Shared->ATIShaders, range); for (i = 0; i < range; i++) { - _mesa_HashInsert(ctx->Shared->ATIShaders, first + i, &DummyShader); + _mesa_HashInsertLocked(ctx->Shared->ATIShaders, first + i, &DummyShader); } + _mesa_HashUnlockMutex(ctx->Shared->ATIShaders); + return first; } |