Rev 3280 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3280 | Rev 3291 | ||
|---|---|---|---|
| Line 40... | Line 40... | ||
| 40 | #include "sna_render_inline.h" |
40 | #include "sna_render_inline.h" |
| 41 | //#include "sna_video.h" |
41 | //#include "sna_video.h" |
| Line 42... | Line 42... | ||
| 42 | 42 | ||
| 43 | #include "brw/brw.h" |
43 | #include "brw/brw.h" |
| 44 | #include "gen6_render.h" |
- | |
| - | 44 | #include "gen6_render.h" |
|
| 45 | 45 | #include "gen4_source.h" |
|
| Line 46... | Line 46... | ||
| 46 | #include "gen4_vertex.h" |
46 | #include "gen4_vertex.h" |
| 47 | 47 | ||
| 48 | #define NO_COMPOSITE 0 |
48 | #define NO_COMPOSITE 0 |
| Line 207... | Line 207... | ||
| 207 | bool has_component_alpha, |
207 | bool has_component_alpha, |
| 208 | uint32_t dst_format) |
208 | uint32_t dst_format) |
| 209 | { |
209 | { |
| 210 | uint32_t src, dst; |
210 | uint32_t src, dst; |
| Line 211... | Line -... | ||
| 211 | - | ||
| 212 | // src = GEN6_BLENDFACTOR_ONE; //gen6_blend_op[op].src_blend; |
- | |
| Line 213... | Line 211... | ||
| 213 | // dst = GEN6_BLENDFACTOR_ZERO; //gen6_blend_op[op].dst_blend; |
211 | |
| 214 | 212 | ||
| Line -... | Line 213... | ||
| - | 213 | src = GEN6_BLENDFACTOR_ONE; //gen6_blend_op[op].src_blend; |
|
| - | 214 | dst = GEN6_BLENDFACTOR_INV_SRC_ALPHA; //gen6_blend_op[op].dst_blend; |
|
| 215 | src = GEN6_BLENDFACTOR_ONE; //gen6_blend_op[op].src_blend; |
215 | |
| 216 | dst = GEN6_BLENDFACTOR_INV_SRC_ALPHA; //gen6_blend_op[op].dst_blend; |
216 | // dst = GEN6_BLENDFACTOR_ZERO; //gen6_blend_op[op].dst_blend; |
| 217 | 217 | ||
| 218 | #if 0 |
218 | #if 0 |
| 219 | /* If there's no dst alpha channel, adjust the blend op so that |
219 | /* If there's no dst alpha channel, adjust the blend op so that |
| Line 1834... | Line 1834... | ||
| 1834 | if (sna->render.vertex_offset) { |
1834 | if (sna->render.vertex_offset) { |
| 1835 | gen4_vertex_flush(sna); |
1835 | gen4_vertex_flush(sna); |
| 1836 | gen6_magic_ca_pass(sna, op); |
1836 | gen6_magic_ca_pass(sna, op); |
| 1837 | } |
1837 | } |
| Line 1838... | Line -... | ||
| 1838 | - | ||
| 1839 | if (op->mask.bo) |
- | |
| 1840 | kgem_bo_destroy(&sna->kgem, op->mask.bo); |
- | |
| 1841 | if (op->src.bo) |
- | |
| Line 1842... | Line 1838... | ||
| 1842 | kgem_bo_destroy(&sna->kgem, op->src.bo); |
1838 | |
| 1843 | 1839 | ||
| Line 1844... | Line 1840... | ||
| 1844 | // sna_render_composite_redirect_done(sna, op); |
1840 | // sna_render_composite_redirect_done(sna, op); |
| Line 2706... | Line 2702... | ||
| 2706 | tmp->dst.width = dst->drawable.width; |
2702 | tmp->dst.width = dst->drawable.width; |
| 2707 | tmp->dst.height = dst->drawable.height; |
2703 | tmp->dst.height = dst->drawable.height; |
| 2708 | tmp->dst.format = PICT_x8r8g8b8; |
2704 | tmp->dst.format = PICT_x8r8g8b8; |
| Line 2709... | Line 2705... | ||
| 2709 | 2705 | ||
| 2710 | - | ||
| 2711 | tmp->src.repeat = RepeatNone; |
2706 | |
| Line 2712... | Line 2707... | ||
| 2712 | tmp->src.filter = PictFilterNearest; |
2707 | tmp->src.repeat = SAMPLER_EXTEND_NONE; |
| 2713 | tmp->src.is_affine = true; |
2708 | tmp->src.is_affine = true; |
| 2714 | 2709 | ||
| 2715 | tmp->src.bo = src_bo; |
2710 | tmp->src.bo = src_bo; |
| 2716 | tmp->src.pict_format = PICT_x8r8g8b8; |
2711 | tmp->src.pict_format = PICT_x8r8g8b8; |
| Line -... | Line 2712... | ||
| - | 2712 | tmp->src.card_format = gen6_get_card_format(tmp->src.pict_format); |
|
| - | 2713 | tmp->src.width = src->drawable.width; |
|
| - | 2714 | tmp->src.height = src->drawable.height; |
|
| - | 2715 | ||
| - | 2716 | if ( (tmp->src.width == width) && |
|
| - | 2717 | (tmp->src.height == height) ) |
|
| 2717 | tmp->src.card_format = gen6_get_card_format(tmp->src.pict_format); |
2718 | tmp->src.filter = SAMPLER_FILTER_NEAREST; |
| 2718 | tmp->src.width = src->drawable.width; |
2719 | else |
| 2719 | tmp->src.height = src->drawable.height; |
2720 | tmp->src.filter = SAMPLER_FILTER_BILINEAR; |
| Line 2720... | Line 2721... | ||
| 2720 | 2721 | ||
| Line 3492... | Line 3493... | ||
| 3492 | sna->render.reset = gen6_render_reset; |
3493 | sna->render.reset = gen6_render_reset; |
| 3493 | sna->render.fini = gen6_render_fini; |
3494 | sna->render.fini = gen6_render_fini; |
| Line 3494... | Line 3495... | ||
| 3494 | 3495 | ||
| 3495 | sna->render.max_3d_size = GEN6_MAX_SIZE; |
3496 | sna->render.max_3d_size = GEN6_MAX_SIZE; |
| - | 3497 | sna->render.max_3d_pitch = 1 << 18; |
|
| - | 3498 | sna->render.caps = HW_BIT_BLIT | HW_TEX_BLIT; |
|
| 3496 | sna->render.max_3d_pitch = 1 << 18; |
3499 | |
| 3497 | return true; |
3500 | return true; |