summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/tilemap.h
diff options
context:
space:
mode:
author cam900 <dbtlrchl@naver.com>2019-07-18 23:17:11 +0900
committer R. Belmont <rb6502@users.noreply.github.com>2019-07-18 10:17:11 -0400
commita5e00faf88ec05d1705b9bc4796cc6f21f2cc7a9 (patch)
treece9426cca7d5a2393a93a6438ffeec2f784f1533 /src/emu/tilemap.h
parent1c91003578a8b73e1d3039ada7b3a278d8c607ad (diff)
Allow 16bpp gfxdecode (#5167)
* digfx.cpp : Add 16bpp case of RAW gfx layout drawgfx.cpp, tilemap.cpp : Make changeable total elements of gfx_elements constructor at RAW case, Allow 16bpp gfxdecode, Fix spacing tilemap.cpp : Allow 16bpp tilemap pen data gstream.cpp : Use gfxdecode for 16bpp gfx of X2222, Fix spacing igs017_igs031.cpp : Cleanup single sprite drawing routine jedi.cpp : Improve debug gfxdecode viewer(text gfx) * cps1.cpp : Minor fixes * gstream.cpp : Fix regression in x2222 drawgfx.cpp : Fix 16bpp transparent pen * gstream.cpp : Fix regression, Reduce unnecessary lines * Sync to master
Diffstat (limited to 'src/emu/tilemap.h')
-rw-r--r--src/emu/tilemap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index 15794247a4f..d73b3a23ef0 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -372,13 +372,13 @@ typedef u32 tilemap_memory_index;
struct tile_data
{
device_gfx_interface *decoder; // set in tilemap_t::init()
- const u8 * pen_data; // required
+ const u16 * pen_data; // required
const u8 * mask_data; // required
pen_t palette_base; // defaults to 0
u8 category; // defaults to 0; range from 0..15
u8 group; // defaults to 0; range from 0..TILEMAP_NUM_GROUPS
u8 flags; // defaults to 0; one or more of TILE_* flags above
- u8 pen_mask; // defaults to 0xff; mask to apply to pen_data while rendering the tile
+ u16 pen_mask; // defaults to 0xff; mask to apply to pen_data while rendering the tile
u8 gfxnum; // defaults to 0xff; specify index of gfx for auto-invalidation on dirty
u32 code;
@@ -421,7 +421,7 @@ class tilemap_t
static const logical_index INVALID_LOGICAL_INDEX = (logical_index)~0;
// maximum index in each array
- static const pen_t MAX_PEN_TO_FLAGS = 256;
+ static const pen_t MAX_PEN_TO_FLAGS = 65536;
protected:
// tilemap_manager controls our allocations
@@ -548,7 +548,7 @@ private:
// internal drawing
void pixmap_update();
void tile_update(logical_index logindex, u32 col, u32 row);
- u8 tile_draw(const u8 *pendata, u32 x0, u32 y0, u32 palette_base, u8 category, u8 group, u8 flags, u8 pen_mask);
+ u8 tile_draw(const u16 *pendata, u32 x0, u32 y0, u32 palette_base, u8 category, u8 group, u8 flags, u16 pen_mask);
u8 tile_apply_bitmask(const u8 *maskdata, u32 x0, u32 y0, u8 category, u8 flags);
void configure_blit_parameters(blit_parameters &blit, bitmap_ind8 &priority_bitmap, const rectangle &cliprect, u32 flags, u8 priority, u8 priority_mask);
template<class _BitmapClass> void draw_common(screen_device &screen, _BitmapClass &dest, const rectangle &cliprect, u32 flags, u8 priority, u8 priority_mask);