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/digfx.h | |
parent | 24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff) | |
parent | 68139508715a0375e657add4197582271ef446ec (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/emu/digfx.h
Diffstat (limited to 'src/emu/digfx.h')
-rw-r--r-- | src/emu/digfx.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/emu/digfx.h b/src/emu/digfx.h index 1c9ebc2d6c5..b991ff15f12 100644 --- a/src/emu/digfx.h +++ b/src/emu/digfx.h @@ -24,7 +24,7 @@ //************************************************************************** constexpr u8 MAX_GFX_ELEMENTS = 32; -constexpr u16 MAX_GFX_PLANES = 16; +constexpr u16 MAX_GFX_PLANES = 8; // HBMAME - needed by monaco constexpr u16 MAX_GFX_SIZE = 64; @@ -39,9 +39,7 @@ constexpr u16 MAX_GFX_SIZE = 64; #define GFX_RAW 0x12345678 #define GFXLAYOUT_RAW( name, width, height, linemod, charmod ) \ -const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW, 0 }, { 0 }, { linemod }, charmod }; -#define GFXLAYOUT_RAW16( name, width, height, linemod, charmod ) \ -const gfx_layout name = { width, height, RGN_FRAC(1,1), 16, { GFX_RAW, GFX_RAW }, { 0 }, { linemod }, charmod }; +const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW }, { 0 }, { linemod }, charmod }; // When planeoffset[0] is set to GFX_RAW, the gfx data is left as-is, with no conversion. // No buffer is allocated for the decoded data, and gfxdata is set to point to the source // data. |