From 5f6aab2ee2795ee1b295bf9379b707d6db4d91dc Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 8 Jul 2019 16:20:01 -0700 Subject: [PATCH] virgl: fix transfers_intersect for mipmaps We never use transfers_intersect with textures, but fix it anyway to avoid confusion. Signed-off-by: Chia-I Wu Reviewed-by: Alexandros Frantzis --- src/gallium/drivers/virgl/virgl_transfer_queue.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/virgl/virgl_transfer_queue.c b/src/gallium/drivers/virgl/virgl_transfer_queue.c index 53fa6760e3b..a7767345f99 100644 --- a/src/gallium/drivers/virgl/virgl_transfer_queue.c +++ b/src/gallium/drivers/virgl/virgl_transfer_queue.c @@ -140,13 +140,8 @@ transfer_overlap(const struct virgl_transfer *xfer, static bool transfers_intersect(struct virgl_transfer *queued, struct virgl_transfer *current) { - boolean tmp; - - if (queued->hw_res != current->hw_res) - return false; - - tmp = u_box_test_intersection_2d(&queued->base.box, ¤t->base.box); - return (tmp == TRUE); + return transfer_overlap(queued, current->hw_res, current->base.level, + ¤t->base.box, true); } static bool transfers_overlap(struct virgl_transfer *queued, -- 2.11.0