Rev 4251 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4251 | Rev 4281 | ||
|---|---|---|---|
| Line 300... | Line 300... | ||
| 300 | } |
300 | } |
| 301 | } |
301 | } |
| Line 302... | Line 302... | ||
| 302 | 302 | ||
| 303 | static uint32_t gen5_get_dest_format(PictFormat format) |
303 | static uint32_t gen5_get_dest_format(PictFormat format) |
| - | 304 | { |
|
| - | 305 | return GEN5_SURFACEFORMAT_B8G8R8A8_UNORM; |
|
| 304 | { |
306 | #if 0 |
| 305 | switch (format) { |
307 | switch (format) { |
| 306 | default: |
308 | default: |
| 307 | return -1; |
309 | return -1; |
| 308 | case PICT_a8r8g8b8: |
310 | case PICT_a8r8g8b8: |
| Line 323... | Line 325... | ||
| 323 | return GEN5_SURFACEFORMAT_A8_UNORM; |
325 | return GEN5_SURFACEFORMAT_A8_UNORM; |
| 324 | case PICT_a4r4g4b4: |
326 | case PICT_a4r4g4b4: |
| 325 | case PICT_x4r4g4b4: |
327 | case PICT_x4r4g4b4: |
| 326 | return GEN5_SURFACEFORMAT_B4G4R4A4_UNORM; |
328 | return GEN5_SURFACEFORMAT_B4G4R4A4_UNORM; |
| 327 | } |
329 | } |
| - | 330 | #endif |
|
| 328 | } |
331 | } |
| 329 | typedef struct gen5_surface_state_padded { |
332 | typedef struct gen5_surface_state_padded { |
| 330 | struct gen5_surface_state state; |
333 | struct gen5_surface_state state; |
| 331 | char pad[32 - sizeof(struct gen5_surface_state)]; |
334 | char pad[32 - sizeof(struct gen5_surface_state)]; |
| 332 | } gen5_surface_state_padded; |
335 | } gen5_surface_state_padded; |
| Line 2445... | Line 2448... | ||
| 2445 | 2448 | ||
| 2446 | tmp->mask.scale[0] = 1.f/mask->drawable.width; |
2449 | tmp->mask.scale[0] = 1.f/mask->drawable.width; |
| Line 2447... | Line 2450... | ||
| 2447 | tmp->mask.scale[1] = 1.f/mask->drawable.height; |
2450 | tmp->mask.scale[1] = 1.f/mask->drawable.height; |
| - | 2451 | ||
| 2448 | 2452 | ||
| 2449 | 2453 | tmp->u.gen5.wm_kernel = WM_KERNEL_MASK; |
|
| 2450 | tmp->u.gen5.wm_kernel = |
2454 | |
| 2451 | gen5_choose_composite_kernel(tmp->op, |
2455 | // gen5_choose_composite_kernel(tmp->op, |
| 2452 | tmp->mask.bo != NULL, |
2456 | // tmp->mask.bo != NULL, |
| Line 2453... | Line 2457... | ||
| 2453 | tmp->has_component_alpha, |
2457 | // tmp->has_component_alpha, |
| 2454 | tmp->is_affine); |
2458 | // tmp->is_affine); |