summaryrefslogtreecommitdiff
path: root/src/sna/blt.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-11-06 09:40:56 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-11-06 09:40:56 +0000
commitc3d5b1d8fcb1b65c35827d38bf5b309e433d0907 (patch)
treede892ce31d35fbd93b962f3a4a671083330e21f0 /src/sna/blt.c
parent1a31335954b4d244d10e2594ae00e60762536a77 (diff)
sna: Move initialisation of loop counter to common code
It was only being defined in x86-64 and left unitialized for x86-32. Fixes regression from commit 587c4866652e40e1e228b333028114766a6d3b08 Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Mon Nov 4 15:10:40 2013 +0000 sna: Promote uint16_t to a full int to avoid overflow in computing w*h in memcpy_xor Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71286 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/blt.c')
-rw-r--r--src/sna/blt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/blt.c b/src/sna/blt.c
index 4843a415..f861f65e 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -1000,13 +1000,13 @@ memcpy_xor(const void *src, void *dst, int bpp,
or |= or << 16;
}
case 4:
-#if USE_SSE2
w = width;
if (w * 4 == dst_stride && dst_stride == src_stride) {
w *= height;
height = 1;
}
+#if USE_SSE2
if (have_sse2()) {
do {
uint32_t *d = (uint32_t *)dst_bytes;