aco: fix wait_entry::join() when changing vmem_types
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

This is a bitmask, not a boolean.

No fossil-db changes.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34935>
This commit is contained in:
Rhys Perry 2025-05-01 17:04:38 +01:00 committed by Marge Bot
parent 171920ceed
commit e7a7d9ea2e

View file

@ -86,7 +86,7 @@ struct wait_entry {
bool join(const wait_entry& other)
{
bool changed = (other.events & ~events) || (other.counters & ~counters) ||
(other.wait_on_read && !wait_on_read) || (other.vmem_types & !vmem_types) ||
(other.wait_on_read && !wait_on_read) || (other.vmem_types & ~vmem_types) ||
(!other.logical && logical);
events |= other.events;
counters |= other.counters;