diff options
| author | Felix Domke <tmbinc@2mac.waldobjekt.org> | 2009-06-22 13:10:07 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@2mac.waldobjekt.org> | 2009-06-22 13:10:07 +0200 |
| commit | 1f3e4e59174d695fd9cfe2fb16caf883e8e9477f (patch) | |
| tree | 9281f6325c2462af3fb448f6898ace2831c51534 /lib/gdi | |
| parent | beb76be8b094d0deeded0ad42f1258222e1210cb (diff) | |
| download | enigma2-1f3e4e59174d695fd9cfe2fb16caf883e8e9477f.tar.gz enigma2-1f3e4e59174d695fd9cfe2fb16caf883e8e9477f.zip | |
support indexed 8bit blits for broadcom-accel (requires recent drivers)
Diffstat (limited to 'lib/gdi')
| -rw-r--r-- | lib/gdi/accel.cpp | 29 | ||||
| -rw-r--r-- | lib/gdi/bcm.cpp | 18 |
2 files changed, 40 insertions, 7 deletions
diff --git a/lib/gdi/accel.cpp b/lib/gdi/accel.cpp index bf9a5a44..5e489eb3 100644 --- a/lib/gdi/accel.cpp +++ b/lib/gdi/accel.cpp @@ -28,10 +28,11 @@ extern void ati_accel_fill( extern int bcm_accel_init(void); extern void bcm_accel_close(void); extern void bcm_accel_blit( - int src_addr, int src_width, int src_height, int src_stride, + int src_addr, int src_width, int src_height, int src_stride, int src_format, int dst_addr, int dst_width, int dst_height, int dst_stride, int src_x, int src_y, int width, int height, - int dst_x, int dst_y, int dwidth, int dheight); + int dst_x, int dst_y, int dwidth, int dheight, + int pal_addr); extern void bcm_accel_fill( int dst_addr, int dst_width, int dst_height, int dst_stride, int x, int y, int width, int height, @@ -97,11 +98,31 @@ int gAccel::blit(gSurface *dst, const gSurface *src, const eRect &p, const eRect #ifdef BCM_ACCEL if (!m_bcm_accel_state) { + if (flags & (gPixmap::blitAlphaTest|gPixmap::blitAlphaBlend)) /* unsupported flags */ + return -1; + unsigned long pal_addr = 0; + int src_format = 0; + if (src->bpp == 32) + src_format = 0; + else if ((src->bpp == 8) && src->clut.data) + { + src_format = 1; + /* sync pal */ + int i; + pal_addr = src->stride * src->y; + unsigned long *pal = (unsigned long*)(((unsigned char*)src->data) + pal_addr); + pal_addr += src->data_phys; + for (i = 0; i < 256; ++i) + *pal++ = src->clut.data[i].argb() ^ 0xFF000000; + } else + return -1; /* unsupported source format */ + bcm_accel_blit( - src->data_phys, src->x, src->y, src->stride, + src->data_phys, src->x, src->y, src->stride, src_format, dst->data_phys, dst->x, dst->y, dst->stride, area.left(), area.top(), area.width(), area.height(), - p.x(), p.y(), p.width(), p.height()); + p.x(), p.y(), p.width(), p.height(), + pal_addr); return 0; } #endif diff --git a/lib/gdi/bcm.cpp b/lib/gdi/bcm.cpp index bd820913..3beb6772 100644 --- a/lib/gdi/bcm.cpp +++ b/lib/gdi/bcm.cpp @@ -60,10 +60,11 @@ static int exec_list(void) } void bcm_accel_blit( - int src_addr, int src_width, int src_height, int src_stride, + int src_addr, int src_width, int src_height, int src_stride, int src_format, int dst_addr, int dst_width, int dst_height, int dst_stride, int src_x, int src_y, int width, int height, - int dst_x, int dst_y, int dwidth, int dheight) + int dst_x, int dst_y, int dwidth, int dheight, + int pal_addr) { C(0x43); // reset source C(0x53); // reset dest @@ -75,7 +76,18 @@ void bcm_accel_blit( P(0x1, src_stride); // set source pitch P(0x2, src_width); // source width P(0x3, src_height); // height - P(0x4, 0x7e48888); // format: ARGB 8888 + switch (src_format) + { + case 0: + P(0x4, 0x7e48888); // format: ARGB 8888 + break; + case 1: + P(0x4, 0x12e40008); // indexed 8bit + P(0x78, 256); + P(0x79, pal_addr); + P(0x7a, 0x7e48888); + break; + } C(0x5); // set source surface (based on last parameters) |