summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2019-07-08 16:20:01 -0700
committerChia-I Wu <[email protected]>2019-07-09 14:26:55 -0700
commit5f6aab2ee2795ee1b295bf9379b707d6db4d91dc (patch)
tree02ed663f1bcdac03bd211c6e6bff83de9f3b1621 /src/gallium
parent6ca1bbabbe27a5005c69f1dd4c69fe0fe7feb807 (diff)
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 <[email protected]> Reviewed-by: Alexandros Frantzis <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/virgl/virgl_transfer_queue.c9
1 files 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, &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,