summaryrefslogtreecommitdiff
path: root/src/sna/gen6_render.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sna/gen6_render.c')
-rw-r--r--src/sna/gen6_render.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 5641b3ca..eb67fc67 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2307,7 +2307,8 @@ gen6_render_copy_boxes(struct sna *sna, uint8_t alu,
2307 __FUNCTION__, src_dx, src_dy, dst_dx, dst_dy, n, alu, 2307 __FUNCTION__, src_dx, src_dy, dst_dx, dst_dy, n, alu,
2308 src_bo == dst_bo)); 2308 src_bo == dst_bo));
2309 2309
2310 if (sna->kgem.mode == KGEM_BLT && 2310 /* XXX benchmark me! */
2311 if (sna->kgem.mode != KGEM_RENDER &&
2311 sna_blt_compare_depth(&src->drawable, &dst->drawable) && 2312 sna_blt_compare_depth(&src->drawable, &dst->drawable) &&
2312 sna_blt_copy_boxes(sna, alu, 2313 sna_blt_copy_boxes(sna, alu,
2313 src_bo, src_dx, src_dy, 2314 src_bo, src_dx, src_dy,
@@ -2464,7 +2465,8 @@ gen6_render_copy(struct sna *sna, uint8_t alu,
2464 src->drawable.width, src->drawable.height, 2465 src->drawable.width, src->drawable.height,
2465 dst->drawable.width, dst->drawable.height)); 2466 dst->drawable.width, dst->drawable.height));
2466 2467
2467 if (sna->kgem.mode == KGEM_BLT && 2468 /* XXX benchmark me! */
2469 if (sna->kgem.mode != KGEM_RENDER &&
2468 sna_blt_compare_depth(&src->drawable, &dst->drawable) && 2470 sna_blt_compare_depth(&src->drawable, &dst->drawable) &&
2469 sna_blt_copy(sna, alu, 2471 sna_blt_copy(sna, alu,
2470 src_bo, dst_bo, 2472 src_bo, dst_bo,
@@ -2577,7 +2579,7 @@ gen6_render_fill_boxes(struct sna *sna,
2577 return FALSE; 2579 return FALSE;
2578 } 2580 }
2579 2581
2580 if (sna->kgem.mode == KGEM_BLT || 2582 if (sna->kgem.mode != KGEM_RENDER ||
2581 dst->drawable.width > 8192 || 2583 dst->drawable.width > 8192 ||
2582 dst->drawable.height > 8192 || 2584 dst->drawable.height > 8192 ||
2583 !gen6_check_dst_format(format)) { 2585 !gen6_check_dst_format(format)) {
@@ -2734,7 +2736,7 @@ gen6_render_fill(struct sna *sna, uint8_t alu,
2734 op); 2736 op);
2735#endif 2737#endif
2736 2738
2737 if (sna->kgem.mode == KGEM_BLT && 2739 if (sna->kgem.mode != KGEM_RENDER &&
2738 sna_blt_fill(sna, alu, 2740 sna_blt_fill(sna, alu,
2739 dst_bo, dst->drawable.bitsPerPixel, 2741 dst_bo, dst->drawable.bitsPerPixel,
2740 color, 2742 color,