diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-09-09 12:09:05 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-09-09 12:40:15 +0100 |
| commit | 1a77ca74bc829e019a06fe9ad559f013054c27ff (patch) | |
| tree | 255a4067c219d3d0e5c49106c335e384da72f8d0 /src/i915_render.c | |
| parent | ce10b5b6fca086eb4af45c1db28352e06ee4ce0b (diff) | |
i915: Restore nearest sampling
My recent commit [94fc93] to use the pixel centre for sampling with the i830
broke the i915. This restores the previous sampling coordinates for the
i915 whilst preserving the correct coordinates for i830.
Fixes: gnome characters disappear
http://bugs.freedesktop.org/show_bug.cgi?id=23803
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/i915_render.c')
| -rw-r--r-- | src/i915_render.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i915_render.c b/src/i915_render.c index c7858aec..ed0b615d 100644 --- a/src/i915_render.c +++ b/src/i915_render.c @@ -166,7 +166,6 @@ static Bool i915_get_dest_format(PicturePtr pDstPicture, uint32_t *dst_format) (int)pDstPicture->format); } } - *dst_format |= DSTORG_HORT_BIAS (0x8) | DSTORG_VERT_BIAS (0x8); return TRUE; } @@ -347,16 +346,17 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture, if (!i915_texture_setup(pSrcPicture, pSrc, 0)) I830FALLBACK("fail to setup src texture\n"); + pI830->dst_coord_adjust = 0; pI830->src_coord_adjust = 0; + pI830->mask_coord_adjust = 0; if (pSrcPicture->filter == PictFilterNearest) - pI830->src_coord_adjust = 0.375; + pI830->dst_coord_adjust = -0.125; if (pMask != NULL) { if (!i915_texture_setup(pMaskPicture, pMask, 1)) I830FALLBACK("fail to setup mask texture\n"); - pI830->mask_coord_adjust = 0; if (pMaskPicture->filter == PictFilterNearest) - pI830->mask_coord_adjust = 0.375; + pI830->dst_coord_adjust = -0.125; } else { pI830->transform[1] = NULL; pI830->scale_units[1][0] = -1; |