diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2019-09-16 15:59:50 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2019-09-16 22:21:29 -0400 |
commit | 0abac3ba453383edf381e310cacd472bf37ea50f (patch) | |
tree | fbe4655d2d84299af18229e87a4156664bab3dcd /src/emu | |
parent | 406655a9fcd512a4ffd1514b2ea777b1fb5a3d52 (diff) |
Eliminate extract_scanline8/16/32, replacing the scant existing usage with std::copy_n (nw)
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/drawgfx.cpp | 53 | ||||
-rw-r--r-- | src/emu/drawgfx.h | 16 | ||||
-rw-r--r-- | src/emu/drawgfxm.h | 51 |
3 files changed, 0 insertions, 120 deletions
diff --git a/src/emu/drawgfx.cpp b/src/emu/drawgfx.cpp index 841ae7c670f..d6d9019fb8a 100644 --- a/src/emu/drawgfx.cpp +++ b/src/emu/drawgfx.cpp @@ -1975,59 +1975,6 @@ void primask_draw_scanline32(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 len /*************************************************************************** - EXTRACT_SCANLINE IMPLEMENTATIONS -***************************************************************************/ - -/*------------------------------------------------- - extract_scanline8 - copy pixels from a single - scanline of a bitmap to an 8bpp buffer --------------------------------------------------*/ - -void extract_scanline8(const bitmap_ind16 &bitmap, s32 srcx, s32 srcy, s32 length, u8 *destptr) -{ - EXTRACTSCANLINE_CORE(u16); -} - -void extract_scanline8(const bitmap_rgb32 &bitmap, s32 srcx, s32 srcy, s32 length, u8 *destptr) -{ - EXTRACTSCANLINE_CORE(u32); -} - - -/*------------------------------------------------- - extract_scanline16 - copy pixels from a single - scanline of a bitmap to a 16bpp buffer --------------------------------------------------*/ - -void extract_scanline16(const bitmap_ind16 &bitmap, s32 srcx, s32 srcy, s32 length, u16 *destptr) -{ - EXTRACTSCANLINE_CORE(u16); -} - -void extract_scanline16(const bitmap_rgb32 &bitmap, s32 srcx, s32 srcy, s32 length, u16 *destptr) -{ - EXTRACTSCANLINE_CORE(u32); -} - - -/*------------------------------------------------- - extract_scanline32 - copy pixels from a single - scanline of a bitmap to a 32bpp buffer --------------------------------------------------*/ - -void extract_scanline32(const bitmap_ind16 &bitmap, s32 srcx, s32 srcy, s32 length, u32 *destptr) -{ - EXTRACTSCANLINE_CORE(u16); -} - -void extract_scanline32(const bitmap_rgb32 &bitmap, s32 srcx, s32 srcy, s32 length, u32 *destptr) -{ - EXTRACTSCANLINE_CORE(u32); -} - - - -/*************************************************************************** COPYBITMAP IMPLEMENTATIONS ***************************************************************************/ diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h index 4d3f4d0e0c9..ec2e650a11a 100644 --- a/src/emu/drawgfx.h +++ b/src/emu/drawgfx.h @@ -344,22 +344,6 @@ void primask_draw_scanline32(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 len -// ----- scanline extraction ----- - -// copy pixels from a single scanline of a bitmap to an 8bpp buffer -void extract_scanline8(const bitmap_ind16 &bitmap, s32 srcx, s32 srcy, s32 length, u8 *destptr); -void extract_scanline8(const bitmap_rgb32 &bitmap, s32 srcx, s32 srcy, s32 length, u8 *destptr); - -// copy pixels from a single scanline of a bitmap to a 16bpp buffer -void extract_scanline16(const bitmap_ind16 &bitmap, s32 srcx, s32 srcy, s32 length, u16 *destptr); -void extract_scanline16(const bitmap_rgb32 &bitmap, s32 srcx, s32 srcy, s32 length, u16 *destptr); - -// copy pixels from a single scanline of a bitmap to a 32bpp buffer -void extract_scanline32(const bitmap_ind16 &bitmap, s32 srcx, s32 srcy, s32 length, u32 *destptr); -void extract_scanline32(const bitmap_rgb32 &bitmap, s32 srcx, s32 srcy, s32 length, u32 *destptr); - - - // ----- bitmap copying ----- // copy from one bitmap to another, copying all unclipped pixels diff --git a/src/emu/drawgfxm.h b/src/emu/drawgfxm.h index 6361ed8bf92..6699b866697 100644 --- a/src/emu/drawgfxm.h +++ b/src/emu/drawgfxm.h @@ -1289,55 +1289,4 @@ do { } while (0) - -/*************************************************************************** - BASIC EXTRACTSCANLINE CORE -***************************************************************************/ - -/* - Assumed input parameters: - - bitmap_t &bitmap - the bitmap to extract from - s32 srcx - the X coordinate to begin extraction - s32 srcy - the Y coordinate to begin extraction - s32 length - the total number of pixels to extract - UINTx *destptr - pointer to memory to receive the extracted pixels -*/ - -#define EXTRACTSCANLINE_CORE(PIXEL_TYPE) \ -do { \ - assert(bitmap.valid()); \ - assert(srcx >= 0); \ - assert(srcx + length <= bitmap.width()); \ - assert(srcy >= 0); \ - assert(srcy < bitmap.height()); \ - assert(destptr != nullptr); \ - \ - { \ - const PIXEL_TYPE *srcptr = &bitmap.pixt<PIXEL_TYPE>(srcy, srcx); \ - \ - /* iterate over unrolled blocks of 4 */ \ - while (length >= 4) \ - { \ - destptr[0] = srcptr[0]; \ - destptr[1] = srcptr[1]; \ - destptr[2] = srcptr[2]; \ - destptr[3] = srcptr[3]; \ - length -= 4; \ - srcptr += 4; \ - destptr += 4; \ - } \ - \ - /* iterate over leftover pixels */ \ - while (length > 0) \ - { \ - destptr[0] = srcptr[0]; \ - length--; \ - srcptr++; \ - destptr++; \ - } \ - } \ -} while (0) - - #endif /* __DRAWGFXM_H__ */ |