From 5f26e4024284b562361e042597d7f2234d76db52 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 27 Oct 2011 02:18:21 +0300 Subject: [PATCH] gpu_neon: fix fb wrapping Tobal No.1 ... --- plugins/gpu_neon/vout_fb.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/plugins/gpu_neon/vout_fb.c b/plugins/gpu_neon/vout_fb.c index bda8d4a6..5b54bd1c 100644 --- a/plugins/gpu_neon/vout_fb.c +++ b/plugins/gpu_neon/vout_fb.c @@ -32,12 +32,12 @@ static void blit(void) int y = gpu.screen.y; int w = gpu.screen.w; int h = gpu.screen.h; + uint16_t *vram = gpu.vram; int stride = gpu.screen.hres; - int doffs; - uint16_t *srcs; - uint8_t *dest; + int fb_offs, doffs; + uint8_t *dest; - srcs = &gpu.vram[y * 1024 + x]; + fb_offs = y * 1024 + x; if ((gpu.status.reg ^ old_status) & ((7<<16)|(1<<21)) || h != old_h) // width|rgb24 change? { @@ -55,24 +55,27 @@ static void blit(void) { #ifndef MAEMO dest += (doffs / 8) * 24; - for (; h-- > 0; dest += stride * 3, srcs += 1024) + for (; h-- > 0; dest += stride * 3, fb_offs += 1024) { - bgr888_to_rgb888(dest, srcs, w * 3); + fb_offs &= 1024*512-1; + bgr888_to_rgb888(dest, vram + fb_offs, w * 3); } #else dest += doffs * 2; - for (; h-- > 0; dest += stride * 2, srcs += 1024) + for (; h-- > 0; dest += stride * 2, fb_offs += 1024) { - bgr888_to_rgb565(dest, srcs, w * 3); + fb_offs &= 1024*512-1; + bgr888_to_rgb565(dest, vram + fb_offs, w * 3); } #endif } else { dest += doffs * 2; - for (; h-- > 0; dest += stride * 2, srcs += 1024) + for (; h-- > 0; dest += stride * 2, fb_offs += 1024) { - bgr555_to_rgb565(dest, srcs, w * 2); + fb_offs &= 1024*512-1; + bgr555_to_rgb565(dest, vram + fb_offs, w * 2); } } -- 2.39.2