summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texobj.c
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-04-06 14:43:32 +1000
committerTimothy Arceri <[email protected]>2017-04-07 08:03:02 +1000
commit93d7014c1d522616eceac3addaebba17244cd353 (patch)
tree16884b6915609fe6d2a39237d404b5f406971403 /src/mesa/main/texobj.c
parent31cb6fd0a3069ac7c03c1ce28b2f24d8bb9a4154 (diff)
mesa: stop abstracting texture object hashtable locking
This doesn't do anything useful so just remove it. Reviewed-by: Iago Toral Quiroga <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/mesa/main/texobj.c')
-rw-r--r--src/mesa/main/texobj.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index a5e64c3e57b..ad644ca1ca3 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -127,19 +127,6 @@ _mesa_lookup_texture_err(struct gl_context *ctx, GLuint id, const char* func)
return texObj;
}
-void
-_mesa_begin_texture_lookups(struct gl_context *ctx)
-{
- _mesa_HashLockMutex(ctx->Shared->TexObjects);
-}
-
-
-void
-_mesa_end_texture_lookups(struct gl_context *ctx)
-{
- _mesa_HashUnlockMutex(ctx->Shared->TexObjects);
-}
-
struct gl_texture_object *
_mesa_lookup_texture_locked(struct gl_context *ctx, GLuint id)
@@ -1833,7 +1820,7 @@ _mesa_BindTextures(GLuint first, GLsizei count, const GLuint *textures)
* their parameters are valid and no other error occurs."
*/
- _mesa_begin_texture_lookups(ctx);
+ _mesa_HashLockMutex(ctx->Shared->TexObjects);
for (i = 0; i < count; i++) {
if (textures[i] != 0) {
@@ -1865,7 +1852,7 @@ _mesa_BindTextures(GLuint first, GLsizei count, const GLuint *textures)
}
}
- _mesa_end_texture_lookups(ctx);
+ _mesa_HashUnlockMutex(ctx->Shared->TexObjects);
} else {
/* Unbind all textures in the range <first> through <first>+<count>-1 */
for (i = 0; i < count; i++)