Mesa (master): mesa/main: make use of lookup_samplerobj_locked()

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: d54b4986946c306e7efb91cdc54227dfe3c90895
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d54b4986946c306e7efb91cdc54227dfe3c90895

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Mar  9 10:50:14 2017 +0100

mesa/main: make use of lookup_samplerobj_locked()

There is no need to check sampler == 0 twice. This removes now
unused _mesa_lookup_samplerobj_locked().

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/main/samplerobj.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 5587e9e..a36563a 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -50,16 +50,6 @@ _mesa_lookup_samplerobj(struct gl_context *ctx, GLuint name)
          _mesa_HashLookup(ctx->Shared->SamplerObjects, name);
 }
 
-static struct gl_sampler_object *
-_mesa_lookup_samplerobj_locked(struct gl_context *ctx, GLuint name)
-{
-   if (name == 0)
-      return NULL;
-   else
-      return (struct gl_sampler_object *)
-         _mesa_HashLookupLocked(ctx->Shared->SamplerObjects, name);
-}
-
 static inline struct gl_sampler_object *
 lookup_samplerobj_locked(struct gl_context *ctx, GLuint name)
 {
@@ -230,7 +220,7 @@ _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers)
       if (samplers[i]) {
          GLuint j;
          struct gl_sampler_object *sampObj =
-            _mesa_lookup_samplerobj_locked(ctx, samplers[i]);
+            lookup_samplerobj_locked(ctx, samplers[i]);
    
          if (sampObj) {
             /* If the sampler is currently bound, unbind it. */