KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Samuel Pitoiset 2017-03-09 10:50:14 +01:00
parent 58b4ae0411
commit d54b498694
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/main/samplerobj.c
View File

@ -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. */