From ef6af0d5f7b59bd567c65a41165c321e43de6353 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 5 Apr 2017 14:29:00 +1000 Subject: [PATCH] mesa: Remove deleteFlag pattern from container objects. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This pattern was only useful when we used mutex locks, which the previous commit removed. Reviewed-by: Nicolai Hähnle Reviewed-by: Samuel Pitoiset --- src/mesa/main/arrayobj.c | 4 +--- src/mesa/main/pipelineobj.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 9f4477e..24555d9 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -188,14 +188,12 @@ _mesa_reference_vao_(struct gl_context *ctx, if (*ptr) { /* Unreference the old array object */ - GLboolean deleteFlag = GL_FALSE; struct gl_vertex_array_object *oldObj = *ptr; assert(oldObj->RefCount > 0); oldObj->RefCount--; - deleteFlag = (oldObj->RefCount == 0); - if (deleteFlag) + if (oldObj->RefCount == 0) _mesa_delete_vao(ctx, oldObj); *ptr = NULL; diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index a0fa55a..9a852be 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -184,14 +184,12 @@ _mesa_reference_pipeline_object_(struct gl_context *ctx, if (*ptr) { /* Unreference the old pipeline object */ - GLboolean deleteFlag = GL_FALSE; struct gl_pipeline_object *oldObj = *ptr; assert(oldObj->RefCount > 0); oldObj->RefCount--; - deleteFlag = (oldObj->RefCount == 0); - if (deleteFlag) { + if (oldObj->RefCount == 0) { _mesa_delete_pipeline_object(ctx, oldObj); } -- 2.7.4