virgl: fix transfers_intersect for mipmaps
authorChia-I Wu <olvaffe@gmail.com>
Mon, 8 Jul 2019 23:20:01 +0000 (16:20 -0700)
committerChia-I Wu <olvaffe@gmail.com>
Tue, 9 Jul 2019 21:26:55 +0000 (14:26 -0700)
We never use transfers_intersect with textures, but fix it anyway to
avoid confusion.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
src/gallium/drivers/virgl/virgl_transfer_queue.c

index 53fa6760e3b12429f3b050469ee823aeb7a29852..a7767345f992171d5da507b1e1030e8b4eccb055 100644 (file)
@@ -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, &current->base.box);
-   return (tmp == TRUE);
+   return transfer_overlap(queued, current->hw_res, current->base.level,
+         &current->base.box, true);
 }
 
 static bool transfers_overlap(struct virgl_transfer *queued,