From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 21 Aug 2022 17:59:41 +0000 (-0400)
Subject: mesa: trivial simplifications in _mesa_reference_buffer_object_
X-Git-Tag: upstream/22.3.5~2327
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1885608184d249d5ffa8cd02ee41dee5378a3142;p=platform%2Fupstream%2Fmesa.git

mesa: trivial simplifications in _mesa_reference_buffer_object_

The else statement conditions were tautological.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18828>
---

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 4f528ce..64a4da3 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1079,25 +1079,22 @@ _mesa_reference_buffer_object_(struct gl_context *ctx,
          if (p_atomic_dec_zero(&oldObj->RefCount)) {
             _mesa_delete_buffer_object(ctx, oldObj);
          }
-      } else if (ctx == oldObj->Ctx) {
+      } else {
          /* Update the private ref count. */
          assert(oldObj->CtxRefCount >= 1);
          oldObj->CtxRefCount--;
       }
-
-      *ptr = NULL;
    }
-   assert(!*ptr);
 
    if (bufObj) {
       /* reference new buffer */
       if (shared_binding || ctx != bufObj->Ctx)
          p_atomic_inc(&bufObj->RefCount);
-      else if (ctx == bufObj->Ctx)
+      else
          bufObj->CtxRefCount++;
-
-      *ptr = bufObj;
    }
+
+   *ptr = bufObj;
 }