From 8cad1eb1a80fc6cd9efb81371b1b5305490c702e Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sun, 19 Feb 2017 23:45:12 +0100 Subject: [PATCH] tuxtxt: Use hw blitting with fbCopyArea() for cs hd2 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b7110faaf6e19346c620924729bb8c5824ab4e16 Author: Michael Liebmann Date: 2017-02-19 (Sun, 19 Feb 2017) --- lib/libtuxtxt/tuxtxt.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index dc7d5a7c5..394d8e29f 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -5595,7 +5595,7 @@ void CopyBB2FB() { fb_pixel_t *src, *dst, *topsrc; int fillcolor, i, screenwidth, swtmp; -#ifdef HAVE_SPARK_HARDWARE +#if defined(HAVE_SPARK_HARDWARE) || defined(BOXMODEL_CS_HD2) CFrameBuffer *f = CFrameBuffer::getInstance(); #endif @@ -5620,6 +5620,8 @@ void CopyBB2FB() #else #ifdef HAVE_SPARK_HARDWARE f->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, 0, true); +#elif defined BOXMODEL_CS_HD2 + f->fbCopyArea(var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, var_screeninfo.yres); #else memcpy(lfb, lbb, fix_screeninfo.line_length*var_screeninfo.yres); #endif @@ -5668,12 +5670,16 @@ void CopyBB2FB() if (screenmode == 1) { screenwidth = ( TV43STARTX ); -#ifdef HAVE_SPARK_HARDWARE +#if defined(HAVE_SPARK_HARDWARE) || defined(BOXMODEL_CS_HD2) int cx = var_screeninfo.xres - TV43STARTX; /* x start */ int cw = TV43STARTX; /* width */ int cy = StartY; int ch = 24*fontheight; +#endif +#ifdef HAVE_SPARK_HARDWARE f->blit2FB(lbb, cw, ch, cx, cy, cx, cy, true); +#elif defined BOXMODEL_CS_HD2 + f->fbCopyArea(cw, ch, cx, cy, cx, cy+var_screeninfo.yres); #else fb_pixel_t *topdst = dst; size_t width = (ex - screenwidth) * sizeof(fb_pixel_t);