mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fb_accel_hd1: fix blit2FB for backbuffer-to-fb case

Browse Source 
For source bitmaps smaller than xRes, the offset calculation goes wrong.
Calcuclate an address offset instead and drop the Y offset.
This commit is contained in:
Stefan Seyfried
2018-02-25 02:27:07 +01:00
committed by Thilo Graf
parent 5f783f0012
commit 4bb731ed61
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/driver/fb_accel_cs_hd1.cpp
View File

@@ -288,9 +288,12 @@ void CFbAccelCSHD1::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint3
yc = (height > yRes) ? yRes : height;
u32 cmd;
uint32_t addr = 0, bb = 0;
fb_pixel_t *fbb = (fb_pixel_t *)fbbuff;
if (fbbuff == backbuffer) {
/* we could probably also copy around in the visible part of the framebuffer... */
if (fbbuff >= backbuffer && (fbb + width * height) < lfb + available / sizeof(fb_pixel_t)) {
addr = _read_gxa(gxa_base, GXA_BMP2_ADDR_REG);
addr += (fbb - lfb) * sizeof(fb_pixel_t);
bb = yRes;
} else {
void *uKva = cs_phys_addr(fbbuff);
@@ -312,11 +315,11 @@ void CFbAccelCSHD1::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint3
_write_gxa(gxa_base, cmd, GXA_POINT(xoff, yoff)); /* destination pos */
_write_gxa(gxa_base, cmd, GXA_POINT(xc - xp, yc - yp)); /* source size */
_write_gxa(gxa_base, cmd, GXA_POINT(xp, yp + bb)); /* source pos */
_write_gxa(gxa_base, cmd, GXA_POINT(xp, yp)); /* source pos */
return;
}
printf(LOGTAG "%s(%p, %u %u %u %u %u %u %d) swrender fallback\n",
__func__, fbbuff, width, height, xoff, yoff, xp, yp, transp);
printf(LOGTAG "%s(%p+%d, %u %u %u %u %u %u %d) swrender fallback\n",
__func__, fbbuff, bb, width, height, xoff, yoff, xp, yp, transp);
CFrameBuffer::blit2FB(fbbuff, width, height, xoff, yoff, xp, yp, transp);
}