Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 09:20:02 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6053 from cam900/pgm_rombit

Browse Source 
pgm.cpp : Correct ROM region width, Reduce unnecessary values, Correct sprite pixel extract algorithm
This commit is contained in:
R. Belmont 2019-12-24 15:46:14 -05:00 committed by GitHub
commit 686ae29482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 272 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

494
src/mame/drivers/pgm.cpp
View File

File diff suppressed because it is too large Load Diff

13
src/mame/includes/pgm.h
View File

@ -42,6 +42,7 @@ public:
, m_soundlatch(*this, "soundlatch")
, m_soundlatch3(*this, "soundlatch3")
, m_ics(*this, "ics")
, m_adata(*this, "sprcol")
, m_bdata(*this, "sprmask")
{
m_irq4_disabled = 0;
@ -80,8 +81,6 @@ private:
u16 * m_bg_videoram;
u16 * m_tx_videoram;
u16 * m_rowscrollram;
std::unique_ptr<u8[]> m_sprite_a_region;
size_t m_sprite_a_region_size;
std::unique_ptr<u16[]> m_spritebufferram; // buffered spriteram
/* video-related */
@ -97,9 +96,11 @@ private:
required_device<ics2115_device> m_ics;
/* used by rendering */
required_region_ptr<u8> m_bdata;
int m_aoffset;
int m_boffset;
required_region_ptr<u16> m_adata;
required_region_ptr<u16> m_bdata;
u32 m_aoffset;
u8 m_abit;
u32 m_boffset;
u16 videoram_r(offs_t offset);
void videoram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
@ -122,12 +123,12 @@ private:
inline void pgm_draw_pix(int xdrawpos, int pri, u16* dest, u8* destpri, const rectangle &cliprect, u16 srcdat);
inline void pgm_draw_pix_nopri(int xdrawpos, u16* dest, u8* destpri, const rectangle &cliprect, u16 srcdat);
inline void pgm_draw_pix_pri(int xdrawpos, u16* dest, u8* destpri, const rectangle &cliprect, u16 srcdat);
inline u8 get_sprite_pix();
void draw_sprite_line(int wide, u16* dest, u8* destpri, const rectangle &cliprect, int xzoom, bool xgrow, int flip, int xpos, int pri, int realxsize, int palt, bool draw);
void draw_sprite_new_zoomed(int wide, int high, int xpos, int ypos, int palt, int flip, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, u32 xzoom, bool xgrow, u32 yzoom, bool ygrow, int pri);
void draw_sprite_line_basic(int wide, u16* dest, u8* destpri, const rectangle &cliprect, int flip, int xpos, int pri, int realxsize, int palt, bool draw);
void draw_sprite_new_basic(int wide, int high, int xpos, int ypos, int palt, int flip, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri);
void draw_sprites(bitmap_ind16& spritebitmap, const rectangle &cliprect, u16 *sprite_source, bitmap_ind8& priority_bitmap);
void expand_colourdata();
void pgm_basic_mem(address_map &map);
void pgm_z80_io(address_map &map);
void pgm_z80_mem(address_map &map);

60
src/mame/video/pgm.cpp
View File

@ -69,6 +69,18 @@ inline void pgm_state::pgm_draw_pix_pri(int xdrawpos, u16* dest, u8* destpri, co
}
}
inline u8 pgm_state::get_sprite_pix()
{
const u8 srcdat = ((m_adata[m_aoffset & m_adata.mask()] >> m_abit) & 0x1f);
m_abit += 5; // 5 bit per pixel, 3 pixels in each word; 15 bit used
if (m_abit >= 15)
{
m_aoffset++;
m_abit = 0;
}
return srcdat;
}
/*************************************************************************
Full Sprite Renderer
for complex zoomed cases
@ -78,22 +90,17 @@ void pgm_state::draw_sprite_line(int wide, u16* dest, u8* destpri, const rectang
{
int xoffset = 0;
int xdrawpos = 0;
u8 *adata = m_sprite_a_region.get();
size_t adatasize = m_sprite_a_region_size - 1;
int xcntdraw = 0;
for (int xcnt = 0; xcnt < wide; xcnt++)
{
u16 msk = ((m_bdata[(m_boffset + 1) & m_bdata.mask()] << 8) |(m_bdata[(m_boffset + 0) & m_bdata.mask()] << 0));
u16 msk = m_bdata[m_boffset & m_bdata.mask()];
for (int x = 0; x < 16; x++)
{
if (!(BIT(msk, 0)))
{
const u16 srcdat = adata[m_aoffset & adatasize] + palt * 32;
m_aoffset++;
const u16 srcdat = get_sprite_pix() + palt * 32;
if (draw)
{
@ -151,7 +158,7 @@ void pgm_state::draw_sprite_line(int wide, u16* dest, u8* destpri, const rectang
msk >>= 1;
}
m_boffset += 2;
m_boffset++;
}
}
@ -160,11 +167,11 @@ void pgm_state::draw_sprite_new_zoomed(int wide, int high, int xpos, int ypos, i
int ydrawpos;
int xcnt = 0;
m_aoffset = (m_bdata[(m_boffset + 3) & m_bdata.mask()] << 24) | (m_bdata[(m_boffset + 2) & m_bdata.mask()] << 16) |
(m_bdata[(m_boffset + 1) & m_bdata.mask()] << 8) | (m_bdata[(m_boffset + 0) & m_bdata.mask()] << 0);
m_aoffset = m_aoffset >> 2; m_aoffset *= 3;
m_aoffset = (m_bdata[(m_boffset + 1) & m_bdata.mask()] << 16) | (m_bdata[(m_boffset + 0) & m_bdata.mask()] << 0);
m_aoffset = m_aoffset >> 2;
m_abit = 0;
m_boffset += 4;
m_boffset += 2;
/* precalculate where drawing will end, for flipped zoomed cases. */
/* if we're to avoid pre-decoding the data for each sprite each time we draw then we have to draw the sprite data
@ -209,6 +216,7 @@ void pgm_state::draw_sprite_new_zoomed(int wide, int high, int xpos, int ypos, i
if (yzoombit && ygrow) // double this line
{
const int temp_aoffset = m_aoffset;
const int temp_abit = m_abit;
const int temp_boffset = m_boffset;
if (!(flip & 0x02))
@ -231,6 +239,7 @@ void pgm_state::draw_sprite_new_zoomed(int wide, int high, int xpos, int ypos, i
// we need to draw this line again, so restore our pointers to previous values
m_aoffset = temp_aoffset;
m_abit = temp_abit;
m_boffset = temp_boffset;
if (!(flip & 0x02))
@ -310,23 +319,19 @@ void pgm_state::draw_sprite_line_basic(int wide, u16* dest, u8* destpri, const r
{
int xoffset = 0;
int xdrawpos = 0;
u8 *adata = m_sprite_a_region.get();
size_t adatasize = m_sprite_a_region_size - 1;
int xcntdraw = 0;
if (!pri)
{
for (int xcnt = 0; xcnt < wide; xcnt++)
{
u16 msk = ((m_bdata[(m_boffset + 1) & m_bdata.mask()] << 8) |(m_bdata[(m_boffset + 0) & m_bdata.mask()] << 0));
u16 msk = m_bdata[m_boffset & m_bdata.mask()];
for (int x = 0; x < 16; x++)
{
if (!(BIT(msk, 0)))
{
const u16 srcdat = adata[m_aoffset & adatasize] + palt * 32;
m_aoffset++;
const u16 srcdat = get_sprite_pix() + palt * 32;
if (draw)
{
@ -352,21 +357,20 @@ void pgm_state::draw_sprite_line_basic(int wide, u16* dest, u8* destpri, const r
msk >>= 1;
}
m_boffset += 2;
m_boffset++;
}
}
else
{
for (int xcnt = 0; xcnt < wide; xcnt++)
{
u16 msk = ((m_bdata[(m_boffset + 1) & m_bdata.mask()] << 8) |(m_bdata[(m_boffset + 0) & m_bdata.mask()] << 0));
u16 msk = m_bdata[m_boffset & m_bdata.mask()];
for (int x = 0; x < 16; x++)
{
if (!(BIT(msk, 0)))
{
const u16 srcdat = adata[m_aoffset & adatasize] + palt * 32;
m_aoffset++;
const u16 srcdat = get_sprite_pix() + palt * 32;
if (draw)
{
@ -392,7 +396,7 @@ void pgm_state::draw_sprite_line_basic(int wide, u16* dest, u8* destpri, const r
msk >>= 1;
}
m_boffset += 2;
m_boffset++;
}
}
}
@ -406,11 +410,11 @@ void pgm_state::draw_sprite_new_basic(int wide, int high, int xpos, int ypos, in
{
int ydrawpos;
m_aoffset = (m_bdata[(m_boffset + 3) & m_bdata.mask()] << 24) | (m_bdata[(m_boffset + 2) & m_bdata.mask()] << 16) |
(m_bdata[(m_boffset + 1) & m_bdata.mask()] << 8) | (m_bdata[(m_boffset + 0) & m_bdata.mask()] << 0);
m_aoffset = m_aoffset >> 2; m_aoffset *= 3;
m_aoffset = (m_bdata[(m_boffset + 1) & m_bdata.mask()] << 16) | (m_bdata[(m_boffset + 0) & m_bdata.mask()] << 0);
m_aoffset = m_aoffset >> 2;
m_abit = 0;
m_boffset += 4;
m_boffset += 2;
const int realysize = high - 1;
const int realxsize = (wide * 16) - 1;
@ -506,7 +510,6 @@ void pgm_state::draw_sprites(bitmap_ind16& spritebitmap, const rectangle &clipre
u32 xzoom = (sprite_zoomtable[xzom * 2] << 16) | sprite_zoomtable[xzom * 2 + 1];
u32 yzoom = (sprite_zoomtable[yzom * 2] << 16) | sprite_zoomtable[yzom * 2 + 1];
boff *= 2;
if (xpos > 0x3ff) xpos -= 0x800;
if (ypos > 0x1ff) ypos -= 0x400;
@ -576,6 +579,7 @@ TILE_GET_INFO_MEMBER(pgm_state::get_bg_tile_info)
void pgm_state::video_start()
{
m_aoffset = 0;
m_abit = 0;
m_boffset = 0;
m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(pgm_state::get_tx_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);