Rev 3278 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3278 | Rev 3280 | ||
|---|---|---|---|
| Line 111... | Line 111... | ||
| 111 | 111 | ||
| 112 | backend = "no"; |
112 | backend = "no"; |
| Line 113... | Line 113... | ||
| 113 | no_render_init(sna); |
113 | no_render_init(sna); |
| 114 | 114 | ||
| 115 | if (sna->info->gen >= 0100) { |
115 | if (sna->info->gen >= 0100) { |
| 116 | /* } else if (sna->info->gen >= 070) { |
116 | } else if (sna->info->gen >= 070) { |
| 117 | if (gen7_render_init(sna)) |
117 | if (gen7_render_init(sna)) |
| 118 | backend = "IvyBridge"; */ |
118 | backend = "IvyBridge"; |
| 119 | } else if (sna->info->gen >= 060) { |
119 | } else if (sna->info->gen >= 060) { |
| 120 | if (gen6_render_init(sna)) |
120 | if (gen6_render_init(sna)) |
| 121 | backend = "SandyBridge"; |
121 | backend = "SandyBridge"; |
| 122 | /* } else if (sna->info->gen >= 050) { |
122 | } else if (sna->info->gen >= 050) { |
| 123 | if (gen5_render_init(sna)) |
123 | if (gen5_render_init(sna)) |
| 124 | backend = "Ironlake"; |
124 | backend = "Ironlake"; |
| 125 | } else if (sna->info->gen >= 040) { |
125 | /* } else if (sna->info->gen >= 040) { |
| 126 | if (gen4_render_init(sna)) |
126 | if (gen4_render_init(sna)) |
| 127 | backend = "Broadwater/Crestline"; |
127 | backend = "Broadwater/Crestline"; |
| 128 | } else if (sna->info->gen >= 030) { |
128 | } else if (sna->info->gen >= 030) { |
| Line 332... | Line 332... | ||
| 332 | done: |
332 | done: |
| 333 | cache->last = i; |
333 | cache->last = i; |
| 334 | return kgem_bo_reference(cache->bo[i]); |
334 | return kgem_bo_reference(cache->bo[i]); |
| 335 | } |
335 | } |
| Line 336... | Line -... | ||
| 336 | - | ||
| Line 337... | Line 336... | ||
| 337 | #endif |
336 | |
| 338 | 337 | ||
| Line 379... | Line 378... | ||
| 379 | kgem_submit(&sna_device->kgem); |
378 | kgem_submit(&sna_device->kgem); |
| Line 380... | Line 379... | ||
| 380 | 379 | ||
| Line 381... | Line 380... | ||
| 381 | // __asm__ __volatile__("int3"); |
380 | // __asm__ __volatile__("int3"); |
| - | 381 | ||
| - | 382 | }; |
|
| Line 382... | Line 383... | ||
| 382 | 383 | #endif |
|
| 383 | }; |
384 | |
| 384 | 385 | ||
| Line 522... | Line 523... | ||
| 522 | memset(&composite, 0, sizeof(composite)); |
523 | memset(&composite, 0, sizeof(composite)); |
| Line 523... | Line 524... | ||
| 523 | 524 | ||
| Line 524... | Line 525... | ||
| 524 | src_bo = (struct kgem_bo*)src_bitmap->handle; |
525 | src_bo = (struct kgem_bo*)src_bitmap->handle; |
| 525 | 526 | ||
| 526 | 527 | ||
| 527 | if( gen6_composite(sna_device, PictOpSrc, |
528 | if( sna_device->render.blit_tex(sna_device, PictOpSrc, |
| 528 | &src, src_bo, |
529 | &src, src_bo, |
| 529 | &mask, mask_bo, |
530 | &mask, mask_bo, |