From 58b4ae0411c3149e865b02bc0992d4d10ae6d5a8 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 9 Mar 2017 10:50:13 +0100 Subject: [PATCH] mesa/main: inline {begin,end}_samplerobj_lookups() Signed-off-by: Samuel Pitoiset Reviewed-by: Matt Turner --- src/mesa/main/samplerobj.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index 2baa016cd40..5587e9eadaa 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -60,20 +60,6 @@ _mesa_lookup_samplerobj_locked(struct gl_context *ctx, GLuint name) _mesa_HashLookupLocked(ctx->Shared->SamplerObjects, name); } -static inline void -begin_samplerobj_lookups(struct gl_context *ctx) -{ - _mesa_HashLockMutex(ctx->Shared->SamplerObjects); -} - - -static inline void -end_samplerobj_lookups(struct gl_context *ctx) -{ - _mesa_HashUnlockMutex(ctx->Shared->SamplerObjects); -} - - static inline struct gl_sampler_object * lookup_samplerobj_locked(struct gl_context *ctx, GLuint name) { @@ -362,7 +348,7 @@ _mesa_BindSamplers(GLuint first, GLsizei count, const GLuint *samplers) * their parameters are valid and no other error occurs." */ - begin_samplerobj_lookups(ctx); + _mesa_HashLockMutex(ctx->Shared->SamplerObjects); for (i = 0; i < count; i++) { const GLuint unit = first + i; @@ -402,7 +388,7 @@ _mesa_BindSamplers(GLuint first, GLsizei count, const GLuint *samplers) } } - end_samplerobj_lookups(ctx); + _mesa_HashUnlockMutex(ctx->Shared->SamplerObjects); } else { /* Unbind all samplers in the range through +-1 */ for (i = 0; i < count; i++) { -- 2.30.2