Mesa (main): zink: remove unnecessary conditionals in resource batch tracking

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jun 16 02:58:42 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May  7 08:23:04 2021 -0400

zink: remove unnecessary conditionals in resource batch tracking

this is no longer an atomic op

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11399>

---

 src/gallium/drivers/zink/zink_batch.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c
index 7362a26495e..8b39e4c2bd1 100644
--- a/src/gallium/drivers/zink/zink_batch.c
+++ b/src/gallium/drivers/zink/zink_batch.c
@@ -566,18 +566,14 @@ zink_batch_reference_resource_rw(struct zink_batch *batch, struct zink_resource
       }
        }
    if (write) {
-      if (res->obj->writes.usage != batch->state->fence.batch_id) {
-         if (stencil)
-            zink_batch_usage_set(&stencil->obj->writes, batch->state->fence.batch_id);
-         zink_batch_usage_set(&res->obj->writes, batch->state->fence.batch_id);
-      }
+      if (stencil)
+         zink_batch_usage_set(&stencil->obj->writes, batch->state->fence.batch_id);
+      zink_batch_usage_set(&res->obj->writes, batch->state->fence.batch_id);
       res->scanout_dirty = !!res->scanout_obj;
    } else {
-      if (res->obj->reads.usage != batch->state->fence.batch_id) {
-         if (stencil)
-            zink_batch_usage_set(&stencil->obj->reads, batch->state->fence.batch_id);
-         zink_batch_usage_set(&res->obj->reads, batch->state->fence.batch_id);
-      }
+      if (stencil)
+         zink_batch_usage_set(&stencil->obj->reads, batch->state->fence.batch_id);
+      zink_batch_usage_set(&res->obj->reads, batch->state->fence.batch_id);
    }
    /* multiple array entries are fine */
    if (res->obj->persistent_maps)



More information about the mesa-commit mailing list