mirror of
https://github.com/holub/mame
synced 2025-06-05 12:26:35 +03:00
removed completely konami_deinterleave_gfx usage, now that it is redundant. nw.
This commit is contained in:
parent
9963ffbdbd
commit
082a4a2f0d
@ -220,7 +220,6 @@ static const k056832_interface asterix_k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_4,
|
||||
1, 1,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
asterix_tile_callback, "none"
|
||||
};
|
||||
|
||||
|
@ -368,7 +368,6 @@ static const k056832_interface bishi_k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_8,
|
||||
1, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
bishi_tile_callback, "none"
|
||||
};
|
||||
|
||||
|
@ -294,7 +294,6 @@ static const k056832_interface dbz_k056832_intf =
|
||||
"gfx1", 2,
|
||||
K056832_BPP_4,
|
||||
1, 1,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
dbz_tile_callback, "none"
|
||||
};
|
||||
|
||||
@ -303,7 +302,6 @@ static const k053247_interface dbz_k053246_intf =
|
||||
"gfx2", 3,
|
||||
NORMAL_PLANE_ORDER,
|
||||
-52, 16,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
dbz_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -1395,7 +1395,6 @@ static const k056832_interface djmain_k056832_intf =
|
||||
"gfx2", 1,
|
||||
K056832_BPP_4dj,
|
||||
1, 1,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
djmain_tile_callback, "none"
|
||||
};
|
||||
|
||||
|
@ -300,7 +300,6 @@ static const k056832_interface gijoe_k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_4,
|
||||
1, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
gijoe_tile_callback, "none"
|
||||
};
|
||||
|
||||
@ -309,7 +308,6 @@ static const k053247_interface gijoe_k053247_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
-37, 20,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
gijoe_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -496,7 +496,6 @@ static const k056832_interface lethalen_k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_8LE,
|
||||
1, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
lethalen_tile_callback, "none"
|
||||
};
|
||||
|
||||
|
@ -519,7 +519,6 @@ static const k056832_interface moo_k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_4,
|
||||
1, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
moo_tile_callback, "none"
|
||||
};
|
||||
|
||||
@ -528,7 +527,6 @@ static const k053247_interface moo_k053247_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
-48+1, 23,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
moo_sprite_callback
|
||||
};
|
||||
|
||||
@ -537,7 +535,6 @@ static const k053247_interface bucky_k053247_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
-48, 23,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
moo_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -265,7 +265,6 @@ static const k053247_interface overdriv_k053246_intf =
|
||||
"gfx1", 0,
|
||||
NORMAL_PLANE_ORDER,
|
||||
77, 22,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
overdriv_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -552,7 +552,6 @@ static const k056832_interface qdrmfgp_k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_4dj,
|
||||
1, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
qdrmfgp_tile_callback, "none"
|
||||
};
|
||||
|
||||
@ -561,7 +560,6 @@ static const k056832_interface qdrmfgp2_k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_4dj,
|
||||
1, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
qdrmfgp2_tile_callback, "none"
|
||||
};
|
||||
|
||||
|
@ -335,7 +335,6 @@ static const k053247_interface rng_k055673_intf =
|
||||
"gfx2", 1,
|
||||
K055673_LAYOUT_RNG,
|
||||
-8, 15,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE, // there is some interleave in video_start...
|
||||
rng_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -318,7 +318,6 @@ static const k053247_interface simpsons_k053246_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
53, 23,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
simpsons_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -565,7 +565,6 @@ static const k056832_interface k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_8TASMAN,
|
||||
0, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
kongambl_tile_callback, "none"
|
||||
};
|
||||
|
||||
@ -575,7 +574,6 @@ static const k053247_interface k053247_intf =
|
||||
"gfx2", 1,
|
||||
TASMAN_PLANE_ORDER,
|
||||
-48+1, 23,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
kongambl_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -404,7 +404,6 @@ static const k053247_interface vendetta_k053246_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
53, 6,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
vendetta_sprite_callback
|
||||
};
|
||||
|
||||
@ -413,7 +412,6 @@ static const k053247_interface esckids_k053246_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
101, 6,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
vendetta_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -459,7 +459,6 @@ static const k056832_interface xexex_k056832_intf =
|
||||
"gfx1", 0,
|
||||
K056832_BPP_4,
|
||||
1, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
xexex_tile_callback, "none"
|
||||
};
|
||||
|
||||
@ -468,7 +467,6 @@ static const k053247_interface xexex_k053246_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
-48, 32,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
xexex_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -313,7 +313,6 @@ static const k053247_interface xmen_k053246_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
53, -2,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
xmen_sprite_callback
|
||||
};
|
||||
|
||||
@ -384,7 +383,6 @@ static const k053247_interface xmen6p_k053246_intf =
|
||||
"gfx2", 1,
|
||||
NORMAL_PLANE_ORDER,
|
||||
53, -2,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
xmen_sprite_callback
|
||||
};
|
||||
|
||||
|
@ -742,7 +742,6 @@ static const k056832_interface zr107_k056832_intf =
|
||||
"gfx2", 1,
|
||||
K056832_BPP_8,
|
||||
1, 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE,
|
||||
game_tile_callback, "none"
|
||||
};
|
||||
|
||||
|
@ -68,7 +68,6 @@ void k053247_device::clear_all()
|
||||
m_intf_gfx_num = -1;
|
||||
m_intf_plane_order = 0;
|
||||
m_intf_dx = m_intf_dy = 0;
|
||||
m_intf_deinterleave = 0;
|
||||
m_intf_callback = 0;
|
||||
}
|
||||
|
||||
@ -1118,9 +1117,6 @@ void k053247_device::device_start()
|
||||
}
|
||||
}
|
||||
|
||||
/* deinterleave the graphics, if needed */
|
||||
konami_deinterleave_gfx(machine(), m_intf_gfx_memory_region, m_intf_deinterleave);
|
||||
|
||||
m_dx = m_intf_dx;
|
||||
m_dy = m_intf_dy;
|
||||
m_memory_region = m_intf_gfx_memory_region;
|
||||
|
@ -48,7 +48,6 @@ struct k053247_interface
|
||||
int m_intf_gfx_num;
|
||||
int m_intf_plane_order;
|
||||
int m_intf_dx, m_intf_dy;
|
||||
int m_intf_deinterleave;
|
||||
k05324x_callback m_intf_callback;
|
||||
};
|
||||
|
||||
|
@ -261,7 +261,6 @@ void k056832_device::device_config_complete()
|
||||
m_bpp = -1;
|
||||
m_big = 0;
|
||||
m_djmain_hack = 0;
|
||||
m_deinterleave = 0;
|
||||
m_callback = NULL;
|
||||
m_k055555_tag = "";
|
||||
};
|
||||
@ -399,9 +398,6 @@ void k056832_device::device_start()
|
||||
|
||||
create_gfx(machine(), m_gfx_memory_region, m_bpp, m_big);
|
||||
|
||||
/* deinterleave the graphics, if needed */
|
||||
konami_deinterleave_gfx(machine(), m_gfx_memory_region, m_deinterleave);
|
||||
|
||||
create_tilemaps(machine());
|
||||
|
||||
finalize_init(machine());
|
||||
|
@ -26,7 +26,6 @@ struct k056832_interface
|
||||
int m_bpp;
|
||||
int m_big;
|
||||
int m_djmain_hack;
|
||||
int m_deinterleave;
|
||||
k056832_callback m_callback;
|
||||
|
||||
const char *m_k055555_tag; // tbyahhoo uses the k056832 together with a k055555
|
||||
|
@ -3,40 +3,6 @@
|
||||
#include "emu.h"
|
||||
#include "konami_helper.h"
|
||||
|
||||
/*
|
||||
This recursive function doesn't use additional memory
|
||||
(it could be easily converted into an iterative one).
|
||||
It's called shuffle because it mimics the shuffling of a deck of cards.
|
||||
*/
|
||||
static void konami_shuffle_16(UINT16 *buf,int len)
|
||||
{
|
||||
int i;
|
||||
UINT16 t;
|
||||
|
||||
if (len == 2) return;
|
||||
|
||||
if (len % 4) fatalerror("shuffle() - not modulo 4\n"); /* must not happen */
|
||||
|
||||
len /= 2;
|
||||
|
||||
for (i = 0; i < len / 2; i++)
|
||||
{
|
||||
t = buf[len / 2 + i];
|
||||
buf[len / 2 + i] = buf[len + i];
|
||||
buf[len + i] = t;
|
||||
}
|
||||
|
||||
konami_shuffle_16(buf,len);
|
||||
konami_shuffle_16(buf + len,len);
|
||||
}
|
||||
|
||||
/* helper function to join two 16-bit ROMs and form a 32-bit data stream */
|
||||
void konamid_rom_deinterleave_2(running_machine &machine, const char *mem_region)
|
||||
{
|
||||
konami_shuffle_16((UINT16 *)machine.root_device().memregion(mem_region)->base(),machine.root_device().memregion(mem_region)->bytes()/2);
|
||||
}
|
||||
|
||||
|
||||
void konami_decode_gfx(running_machine &machine, gfxdecode_device * gfxdecode, palette_device &palette, int gfx_index, UINT8 *data, UINT32 total, const gfx_layout *layout, int bpp)
|
||||
{
|
||||
gfx_layout gl;
|
||||
@ -47,18 +13,6 @@ void konami_decode_gfx(running_machine &machine, gfxdecode_device * gfxdecode, p
|
||||
}
|
||||
|
||||
|
||||
void konami_deinterleave_gfx(running_machine &machine, const char *gfx_memory_region, int deinterleave)
|
||||
{
|
||||
switch (deinterleave)
|
||||
{
|
||||
case KONAMI_ROM_DEINTERLEAVE_NONE:
|
||||
break;
|
||||
case KONAMI_ROM_DEINTERLEAVE_2:
|
||||
konamid_rom_deinterleave_2(machine, gfx_memory_region);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* useful function to sort three tile layers by priority order */
|
||||
void konami_sortlayers3( int *layer, int *pri )
|
||||
{
|
||||
|
@ -9,18 +9,7 @@
|
||||
#define GRADIUS3_PLANE_ORDER 0x1111
|
||||
#define TASMAN_PLANE_ORDER 0x1616
|
||||
|
||||
enum
|
||||
{
|
||||
KONAMI_ROM_DEINTERLEAVE_NONE = 0,
|
||||
KONAMI_ROM_DEINTERLEAVE_2
|
||||
};
|
||||
|
||||
/* helper function to join two 16-bit ROMs and form a 32-bit data stream */
|
||||
void konamid_rom_deinterleave_2(running_machine &machine, const char *mem_region);
|
||||
|
||||
|
||||
void konami_decode_gfx(running_machine &machine, gfxdecode_device * gfxdecode, palette_device &palette, int gfx_index, UINT8 *data, UINT32 total, const gfx_layout *layout, int bpp);
|
||||
void konami_deinterleave_gfx(running_machine &machine, const char *gfx_memory_region, int deinterleave);
|
||||
|
||||
/* helper function to sort three tile layers by priority order */
|
||||
void konami_sortlayers3(int *layer, int *pri);
|
||||
|
Loading…
Reference in New Issue
Block a user