Rev 3291 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3291 | Rev 3769 | ||
|---|---|---|---|
| Line 2269... | Line 2269... | ||
| 2269 | kgem_bo_destroy(&sna->kgem, tmp->base.dst.bo); |
2269 | kgem_bo_destroy(&sna->kgem, tmp->base.dst.bo); |
| 2270 | return false; |
2270 | return false; |
| 2271 | } |
2271 | } |
| 2272 | #endif |
2272 | #endif |
| Line 2273... | Line -... | ||
| 2273 | - | ||
| Line 2274... | Line 2273... | ||
| 2274 | #endif |
2273 | |
| 2275 | 2274 | ||
| 2276 | static void |
2275 | static void |
| 2277 | gen6_emit_copy_state(struct sna *sna, |
2276 | gen6_emit_copy_state(struct sna *sna, |
| Line 2303... | Line 2302... | ||
| 2303 | } |
2302 | } |
| Line 2304... | Line 2303... | ||
| 2304 | 2303 | ||
| 2305 | gen6_emit_state(sna, op, offset | dirty); |
2304 | gen6_emit_state(sna, op, offset | dirty); |
| Line 2306... | Line -... | ||
| 2306 | } |
- | |
| Line 2307... | Line 2305... | ||
| 2307 | 2305 | } |
|
| 2308 | #if 0 |
2306 | |
| 2309 | 2307 | ||
| 2310 | static inline bool prefer_blt_copy(struct sna *sna, |
2308 | static inline bool prefer_blt_copy(struct sna *sna, |
| Line 2588... | Line 2586... | ||
| 2588 | src, src_bo, src_dx, src_dy, |
2586 | src, src_bo, src_dx, src_dy, |
| 2589 | dst, dst_bo, dst_dx, dst_dy, |
2587 | dst, dst_bo, dst_dx, dst_dy, |
| 2590 | box, n); |
2588 | box, n); |
| 2591 | } |
2589 | } |
| Line 2592... | Line -... | ||
| 2592 | - | ||
| 2593 | #endif |
- | |
| 2594 | 2590 | ||
| 2595 | static void |
2591 | static void |
| 2596 | gen6_render_copy_blt(struct sna *sna, |
2592 | gen6_render_copy_blt(struct sna *sna, |
| 2597 | const struct sna_copy_op *op, |
2593 | const struct sna_copy_op *op, |
| 2598 | int16_t sx, int16_t sy, |
2594 | int16_t sx, int16_t sy, |
| Line 2675... | Line 2671... | ||
| 2675 | 2671 | ||
| 2676 | op->blt = gen6_render_copy_blt; |
2672 | op->blt = gen6_render_copy_blt; |
| 2677 | op->done = gen6_render_copy_done; |
2673 | op->done = gen6_render_copy_done; |
| 2678 | return true; |
2674 | return true; |
| - | 2675 | } |
|
| Line 2679... | Line 2676... | ||
| 2679 | } |
2676 | #endif |
| 2680 | 2677 | ||
| 2681 | 2678 | ||
| 2682 | static bool |
2679 | static bool |
| 2683 | gen6_blit_tex(struct sna *sna, |
2680 | gen6_blit_tex(struct sna *sna, |
| 2684 | uint8_t op, |
2681 | uint8_t op, bool scale, |
| 2685 | PixmapPtr src, struct kgem_bo *src_bo, |
2682 | PixmapPtr src, struct kgem_bo *src_bo, |
| 2686 | PixmapPtr mask,struct kgem_bo *mask_bo, |
2683 | PixmapPtr mask,struct kgem_bo *mask_bo, |
| Line 2732... | Line 2729... | ||
| 2732 | tmp->mask.card_format = gen6_get_card_format(tmp->mask.pict_format); |
2729 | tmp->mask.card_format = gen6_get_card_format(tmp->mask.pict_format); |
| 2733 | tmp->mask.width = mask->drawable.width; |
2730 | tmp->mask.width = mask->drawable.width; |
| 2734 | tmp->mask.height = mask->drawable.height; |
2731 | tmp->mask.height = mask->drawable.height; |
| Line -... | Line 2732... | ||
| - | 2732 | ||
| - | 2733 | ||
| - | 2734 | if( scale ) |
|
| - | 2735 | { |
|
| - | 2736 | tmp->src.scale[0] = 1.f/width; |
|
| - | 2737 | tmp->src.scale[1] = 1.f/height; |
|
| - | 2738 | } |
|
| 2735 | 2739 | else |
|
| 2736 | 2740 | { |
|
| - | 2741 | tmp->src.scale[0] = 1.f/src->drawable.width; |
|
| 2737 | tmp->src.scale[0] = 1.f/width; //src->width; |
2742 | tmp->src.scale[1] = 1.f/src->drawable.height; |
| 2738 | tmp->src.scale[1] = 1.f/height; //src->height; |
2743 | } |
| Line 2739... | Line 2744... | ||
| 2739 | // tmp->src.offset[0] = -dst_x; |
2744 | // tmp->src.offset[0] = -dst_x; |