| /drivers/video/Intel-2D/gen4_source.h |
|---|
| File deleted |
| /drivers/video/Intel-2D/gen4_vertex.c |
|---|
| File deleted |
| /drivers/video/Intel-2D/gen7_render.c |
|---|
| File deleted |
| /drivers/video/Intel-2D/gen5_render.c |
|---|
| File deleted |
| /drivers/video/Intel-2D/gen7_render.h |
|---|
| File deleted |
| /drivers/video/Intel-2D/gen5_render.h |
|---|
| File deleted |
| /drivers/video/Intel-2D/gen6_render.c |
|---|
| 2683,8 → 2683,8 |
| } |
| static bool |
| gen6_blit_tex(struct sna *sna, |
| bool |
| gen6_composite(struct sna *sna, |
| uint8_t op, |
| PixmapPtr src, struct kgem_bo *src_bo, |
| PixmapPtr mask,struct kgem_bo *mask_bo, |
| 2722,6 → 2722,7 |
| tmp->has_component_alpha = false; |
| tmp->need_magic_ca_pass = false; |
| tmp->mask.repeat = SAMPLER_EXTEND_NONE; |
| tmp->mask.filter = SAMPLER_FILTER_NEAREST; |
| tmp->mask.is_affine = true; |
| 3478,11 → 3479,8 |
| // sna->render.video = gen6_render_video; |
| // sna->render.copy_boxes = gen6_render_copy_boxes; |
| sna->render.copy = gen6_render_copy; |
| sna->render.blit_tex = gen6_blit_tex; |
| // sna->render.copy = gen6_render_copy; |
| // sna->render.fill_boxes = gen6_render_fill_boxes; |
| // sna->render.fill = gen6_render_fill; |
| // sna->render.fill_one = gen6_render_fill_one; |
| /drivers/video/Intel-2D/sna.c |
|---|
| 113,16 → 113,16 |
| no_render_init(sna); |
| if (sna->info->gen >= 0100) { |
| } else if (sna->info->gen >= 070) { |
| /* } else if (sna->info->gen >= 070) { |
| if (gen7_render_init(sna)) |
| backend = "IvyBridge"; |
| backend = "IvyBridge"; */ |
| } else if (sna->info->gen >= 060) { |
| if (gen6_render_init(sna)) |
| backend = "SandyBridge"; |
| } else if (sna->info->gen >= 050) { |
| /* } else if (sna->info->gen >= 050) { |
| if (gen5_render_init(sna)) |
| backend = "Ironlake"; |
| /* } else if (sna->info->gen >= 040) { |
| } else if (sna->info->gen >= 040) { |
| if (gen4_render_init(sna)) |
| backend = "Broadwater/Crestline"; |
| } else if (sna->info->gen >= 030) { |
| 334,6 → 334,7 |
| return kgem_bo_reference(cache->bo[i]); |
| } |
| #endif |
| int sna_blit_copy(bitmap_t *src_bitmap, int dst_x, int dst_y, |
| 380,9 → 381,7 |
| // __asm__ __volatile__("int3"); |
| }; |
| #endif |
| int sna_create_bitmap(bitmap_t *bitmap) |
| { |
| struct kgem_bo *bo; |
| 525,7 → 524,7 |
| src_bo = (struct kgem_bo*)src_bitmap->handle; |
| if( sna_device->render.blit_tex(sna_device, PictOpSrc, |
| if( gen6_composite(sna_device, PictOpSrc, |
| &src, src_bo, |
| &mask, mask_bo, |
| &dst, sna_fb.fb_bo, |
| /drivers/video/Intel-2D/sna.h |
|---|
| 320,9 → 320,9 |
| } blt_state; |
| union { |
| // struct gen2_render_state gen2; |
| struct gen3_render_state gen3; |
| struct gen4_render_state gen4; |
| struct gen5_render_state gen5; |
| // struct gen3_render_state gen3; |
| // struct gen4_render_state gen4; |
| // struct gen5_render_state gen5; |
| struct gen6_render_state gen6; |
| struct gen7_render_state gen7; |
| } render_state; |
| 347,11 → 347,6 |
| #endif |
| }; |
| static inline struct sna * |
| to_sna_from_kgem(struct kgem *kgem) |
| { |
| return container_of(kgem, struct sna, kgem); |
| } |
| #ifndef ARRAY_SIZE |
| #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) |
| /drivers/video/Intel-2D/sna_render.h |
|---|
| 217,17 → 217,6 |
| #endif |
| bool (*blit_tex)(struct sna *sna, |
| uint8_t op, |
| PixmapPtr src, struct kgem_bo *src_bo, |
| PixmapPtr mask,struct kgem_bo *mask_bo, |
| PixmapPtr dst, struct kgem_bo *dst_bo, |
| int32_t src_x, int32_t src_y, |
| int32_t msk_x, int32_t msk_y, |
| int32_t dst_x, int32_t dst_y, |
| int32_t width, int32_t height, |
| struct sna_composite_op *tmp); |
| bool (*copy)(struct sna *sna, uint8_t alu, |
| PixmapPtr src, struct kgem_bo *src_bo, |
| PixmapPtr dst, struct kgem_bo *dst_bo, |
| /drivers/video/Intel-2D/sna_stream.c |
|---|
| 93,31 → 93,7 |
| return bo; |
| } |
| unsigned |
| sna_static_stream_compile_sf(struct sna *sna, |
| struct sna_static_stream *stream, |
| bool (*compile)(struct brw_compile *)) |
| { |
| struct brw_compile p; |
| brw_compile_init(&p, sna->kgem.gen, |
| sna_static_stream_map(stream, |
| 64*sizeof(uint32_t), 64)); |
| if (!compile(&p)) { |
| stream->used -= 64*sizeof(uint32_t); |
| return 0; |
| } |
| assert(p.nr_insn*sizeof(struct brw_instruction) <= 64*sizeof(uint32_t)); |
| stream->used -= 64*sizeof(uint32_t) - p.nr_insn*sizeof(struct brw_instruction); |
| return sna_static_stream_offsetof(stream, p.store); |
| } |
| unsigned |
| sna_static_stream_compile_wm(struct sna *sna, |
| struct sna_static_stream *stream, |
| bool (*compile)(struct brw_compile *, int), |