diff options
author | 2019-07-20 12:31:21 +1000 | |
---|---|---|
committer | 2019-07-20 12:31:21 +1000 | |
commit | d2926fa02cef5bf728eac74c9e5586aced02a80b (patch) | |
tree | 820d62305954ff68c7c8bb87c8a08d1b7ce4b2c3 /src/emu/drawgfxm.h | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/emu/drawgfxm.h')
-rw-r--r-- | src/emu/drawgfxm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/drawgfxm.h b/src/emu/drawgfxm.h index e6f2b363272..6361ed8bf92 100644 --- a/src/emu/drawgfxm.h +++ b/src/emu/drawgfxm.h @@ -470,7 +470,7 @@ while (0) do { \ g_profiler.start(PROFILER_DRAWGFX); \ do { \ - const u16 *srcdata; \ + const u8 *srcdata; \ s32 destendx, destendy; \ s32 srcx, srcy; \ s32 curx, cury; \ @@ -549,7 +549,7 @@ do { { \ PRIORITY_TYPE *priptr = PRIORITY_ADDR(priority, PRIORITY_TYPE, cury, destx); \ PIXEL_TYPE *destptr = &dest.pixt<PIXEL_TYPE>(cury, destx); \ - const u16 *srcptr = srcdata; \ + const u8 *srcptr = srcdata; \ srcdata += dy; \ \ /* iterate over unrolled blocks of 4 */ \ @@ -584,7 +584,7 @@ do { { \ PRIORITY_TYPE *priptr = PRIORITY_ADDR(priority, PRIORITY_TYPE, cury, destx); \ PIXEL_TYPE *destptr = &dest.pixt<PIXEL_TYPE>(cury, destx); \ - const u16 *srcptr = srcdata; \ + const u8 *srcptr = srcdata; \ srcdata += dy; \ \ /* iterate over unrolled blocks of 4 */ \ @@ -642,7 +642,7 @@ do { do { \ g_profiler.start(PROFILER_DRAWGFX); \ do { \ - const u16 *srcdata; \ + const u8 *srcdata; \ u32 dstwidth, dstheight; \ s32 destendx, destendy; \ s32 srcx, srcy; \ @@ -730,7 +730,7 @@ do { { \ PRIORITY_TYPE *priptr = PRIORITY_ADDR(priority, PRIORITY_TYPE, cury, destx); \ PIXEL_TYPE *destptr = &dest.pixt<PIXEL_TYPE>(cury, destx); \ - const u16 *srcptr = srcdata + (srcy >> 16) * rowbytes(); \ + const u8 *srcptr = srcdata + (srcy >> 16) * rowbytes(); \ s32 cursrcx = srcx; \ srcy += dy; \ \ |