diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-09-04 23:31:44 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-09-05 01:34:59 +0100 |
| commit | 9c1bf6d01ca307b7a9b91e181ad7f341862e5e1c (patch) | |
| tree | 0b0c32198f442e4e2a75577c735f796f26f79013 /src/i830_render.c | |
| parent | e903b3ebad29d943c05ff550940034c3a43e0235 (diff) | |
i830: do not use stale mask transform
Not only were incorrectly falling back if we had non-affine
transformations, but we made the decision based on a stale transformation
matrix.
Related bug 22877:
batch_start_atomic horribly breaks performance after a while
https://bugs.freedesktop.org/show_bug.cgi?id=22877
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Maximilian Grothusmann <maxi@own-hero.net>
Diffstat (limited to 'src/i830_render.c')
| -rw-r--r-- | src/i830_render.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/i830_render.c b/src/i830_render.c index e4c46231..1419043f 100644 --- a/src/i830_render.c +++ b/src/i830_render.c @@ -395,7 +395,6 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture, { ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum]; I830Ptr pI830 = I830PTR(pScrn); - Bool is_affine_src, is_affine_mask; Bool is_nearest = FALSE; pI830->render_src_picture = pSrcPicture; @@ -424,17 +423,11 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture, pI830->scale_units[1][1] = -1; } - is_affine_src = i830_transform_is_affine (pI830->transform[0]); - is_affine_mask = i830_transform_is_affine (pI830->transform[1]); - if (is_nearest) pI830->coord_adjust = -0.125; else pI830->coord_adjust = 0; - if (!is_affine_src || !is_affine_mask) - I830FALLBACK("non-affine transform unsupported on 8xx hardware\n"); - { uint32_t cblend, ablend, blendctl; @@ -602,14 +595,13 @@ i830_emit_composite_primitive(PixmapPtr pDst, int srcX, int srcY, { ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; I830Ptr pI830 = I830PTR(pScrn); - Bool is_affine_src, is_affine_mask; + Bool is_affine_src, is_affine_mask = TRUE; int per_vertex, num_floats; float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3]; - is_affine_src = i830_transform_is_affine (pI830->transform[0]); - is_affine_mask = i830_transform_is_affine (pI830->transform[1]); - per_vertex = 2; /* dest x/y */ + + is_affine_src = i830_transform_is_affine (pI830->transform[0]); if (is_affine_src) { if (!i830_get_transformed_coordinates(srcX, srcY, @@ -644,6 +636,7 @@ i830_emit_composite_primitive(PixmapPtr pDst, int srcX, int srcY, per_vertex += 4; /* src x/y/z/w */ } if (pI830->render_mask) { + is_affine_mask = i830_transform_is_affine (pI830->transform[1]); if (is_affine_mask) { if (!i830_get_transformed_coordinates(maskX, maskY, pI830->transform[1], |