zink: remove unnecessary conditionals in resource batch tracking

this is no longer an atomic op

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11399>
This commit is contained in:
Mike Blumenkrantz 2021-05-07 08:23:04 -04:00 committed by Marge Bot
parent fec24a2fa4
commit a96c6e4589
1 changed files with 6 additions and 10 deletions

View File

@ -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)