diff options
Diffstat (limited to 'src/mame/drivers/gstream.cpp')
-rw-r--r-- | src/mame/drivers/gstream.cpp | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp index dfa06d1ca95..1eb7da63744 100644 --- a/src/mame/drivers/gstream.cpp +++ b/src/mame/drivers/gstream.cpp @@ -159,17 +159,17 @@ public: optional_device<okim6295_device> m_oki_2; /* memory pointers */ - required_shared_ptr<UINT32> m_workram; - required_shared_ptr<UINT32> m_vram; -// UINT32 * m_nvram; // currently this uses generic nvram handling + required_shared_ptr<uint32_t> m_workram; + required_shared_ptr<uint32_t> m_vram; +// uint32_t * m_nvram; // currently this uses generic nvram handling /* video-related */ - UINT32 m_tmap1_scrollx; - UINT32 m_tmap2_scrollx; - UINT32 m_tmap3_scrollx; - UINT32 m_tmap1_scrolly; - UINT32 m_tmap2_scrolly; - UINT32 m_tmap3_scrolly; + uint32_t m_tmap1_scrollx; + uint32_t m_tmap2_scrollx; + uint32_t m_tmap3_scrollx; + uint32_t m_tmap1_scrolly; + uint32_t m_tmap2_scrolly; + uint32_t m_tmap3_scrolly; /* misc */ int m_oki_bank_1; @@ -198,11 +198,11 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - UINT32 screen_update_gstream(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void draw_bg_gstream(bitmap_rgb32 &bitmap, const rectangle &cliprect, int xscrl, int yscrl, int map, UINT32* ram, int palbase); + uint32_t screen_update_gstream(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void draw_bg_gstream(bitmap_rgb32 &bitmap, const rectangle &cliprect, int xscrl, int yscrl, int map, uint32_t* ram, int palbase); - void rearrange_sprite_data(UINT8* ROM, UINT32* NEW, UINT32* NEW2); - void rearrange_tile_data(UINT8* ROM, UINT32* NEW, UINT32* NEW2); + void rearrange_sprite_data(uint8_t* ROM, uint32_t* NEW, uint32_t* NEW2); + void rearrange_tile_data(uint8_t* ROM, uint32_t* NEW, uint32_t* NEW2); required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; @@ -594,8 +594,8 @@ void gstream_state::video_start() // custom drawgfx function for x2222 to draw RGB data instead of indexed data, needed because our regular drawgfx and tilemap code don't support that void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_element *gfx,gfx_element *gfx2, - UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, - UINT32 transpen) + uint32_t code, uint32_t color, int flipx, int flipy, int32_t destx, int32_t desty, + uint32_t transpen) { // use pen usage to optimize code %= gfx->elements(); @@ -605,11 +605,11 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e do { g_profiler.start(PROFILER_DRAWGFX); do { - const UINT8 *srcdata, *srcdata2; - INT32 destendx, destendy; - INT32 srcx, srcy; - INT32 curx, cury; - INT32 dy; + const uint8_t *srcdata, *srcdata2; + int32_t destendx, destendy; + int32_t srcx, srcy; + int32_t curx, cury; + int32_t dy; assert(dest.valid()); assert(gfx != nullptr); @@ -671,7 +671,7 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e srcdata2 = gfx2->get_data(code); /* compute how many blocks of 4 pixels we have */ - UINT32 leftovers = (destendx + 1 - destx); + uint32_t leftovers = (destendx + 1 - destx); /* adjust srcdata to point to the first source pixel of the row */ srcdata += srcy * gfx->rowbytes() + srcx; @@ -683,9 +683,9 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e /* iterate over pixels in Y */ for (cury = desty; cury <= destendy; cury++) { - UINT32 *destptr = &dest.pixt<UINT32>(cury, destx); - const UINT8 *srcptr = srcdata; - const UINT8 *srcptr2 = srcdata2; + uint32_t *destptr = &dest.pixt<uint32_t>(cury, destx); + const uint8_t *srcptr = srcdata; + const uint8_t *srcptr2 = srcdata2; srcdata += dy; srcdata2 += dy; @@ -694,14 +694,14 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e /* iterate over leftover pixels */ for (curx = 0; curx < leftovers; curx++) { - UINT32 srcdata = (srcptr[0]); - UINT32 srcdata2 = (srcptr2[0]); - - UINT32 fullval = (srcdata | (srcdata2 << 8)); - UINT32 r = ((fullval >> 0) & 0x1f) << 3; - UINT32 g = ((fullval >> 5) & 0x3f) << 2; - UINT32 b = ((fullval >> 11) & 0x1f) << 3; - UINT32 full = (r << 16) | (g << 8) | (b << 0); + uint32_t srcdata = (srcptr[0]); + uint32_t srcdata2 = (srcptr2[0]); + + uint32_t fullval = (srcdata | (srcdata2 << 8)); + uint32_t r = ((fullval >> 0) & 0x1f) << 3; + uint32_t g = ((fullval >> 5) & 0x3f) << 2; + uint32_t b = ((fullval >> 11) & 0x1f) << 3; + uint32_t full = (r << 16) | (g << 8) | (b << 0); if (full != 0) destptr[0] = full; @@ -718,9 +718,9 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e /* iterate over pixels in Y */ for (cury = desty; cury <= destendy; cury++) { - UINT32 *destptr = &dest.pixt<UINT32>(cury, destx); - const UINT8 *srcptr = srcdata; - const UINT8 *srcptr2 = srcdata2; + uint32_t *destptr = &dest.pixt<uint32_t>(cury, destx); + const uint8_t *srcptr = srcdata; + const uint8_t *srcptr2 = srcdata2; srcdata += dy; srcdata2 += dy; @@ -728,14 +728,14 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e /* iterate over leftover pixels */ for (curx = 0; curx < leftovers; curx++) { - UINT32 srcdata = (srcptr[0]); - UINT32 srcdata2 = (srcptr2[0]); - - UINT32 fullval = (srcdata | (srcdata2 << 8)); - UINT32 r = ((fullval >> 0) & 0x1f) << 3; - UINT32 g = ((fullval >> 5) & 0x3f) << 2; - UINT32 b = ((fullval >> 11) & 0x1f) << 3; - UINT32 full = (r << 16) | (g << 8) | (b << 0); + uint32_t srcdata = (srcptr[0]); + uint32_t srcdata2 = (srcptr2[0]); + + uint32_t fullval = (srcdata | (srcdata2 << 8)); + uint32_t r = ((fullval >> 0) & 0x1f) << 3; + uint32_t g = ((fullval >> 5) & 0x3f) << 2; + uint32_t b = ((fullval >> 11) & 0x1f) << 3; + uint32_t full = (r << 16) | (g << 8) | (b << 0); if (full != 0) destptr[0] = full; @@ -750,7 +750,7 @@ void drawgfx_transpen_x2222(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_e } while (0); } -void gstream_state::draw_bg_gstream(bitmap_rgb32 &bitmap, const rectangle &cliprect, int xscrl, int yscrl, int map, UINT32* ram, int palbase ) +void gstream_state::draw_bg_gstream(bitmap_rgb32 &bitmap, const rectangle &cliprect, int xscrl, int yscrl, int map, uint32_t* ram, int palbase ) { int scrollx; int scrolly; @@ -758,10 +758,10 @@ void gstream_state::draw_bg_gstream(bitmap_rgb32 &bitmap, const rectangle &clipr scrollx = xscrl&0x1ff; scrolly = yscrl&0x1ff; - UINT16 basey = scrolly>>5; + uint16_t basey = scrolly>>5; for (int y=0;y<13;y++) { - UINT16 basex = scrollx>>5; + uint16_t basex = scrollx>>5; for (int x=0;x<16;x++) { int vram_data = (ram[(basex&0x0f)+((basey&0x0f)*0x10)]); @@ -781,7 +781,7 @@ void gstream_state::draw_bg_gstream(bitmap_rgb32 &bitmap, const rectangle &clipr } } -UINT32 gstream_state::screen_update_gstream(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) +uint32_t gstream_state::screen_update_gstream(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { /* The tilemaps and sprite are interleaved together. Even Words are tilemap tiles @@ -1137,7 +1137,7 @@ DRIVER_INIT_MEMBER(gstream_state,gstream) } -void gstream_state::rearrange_tile_data(UINT8* ROM, UINT32* NEW, UINT32* NEW2) +void gstream_state::rearrange_tile_data(uint8_t* ROM, uint32_t* NEW, uint32_t* NEW2) { int i; for (i = 0; i < 0x80000; i++) @@ -1147,7 +1147,7 @@ void gstream_state::rearrange_tile_data(UINT8* ROM, UINT32* NEW, UINT32* NEW2) } } -void gstream_state::rearrange_sprite_data(UINT8* ROM, UINT32* NEW, UINT32* NEW2) +void gstream_state::rearrange_sprite_data(uint8_t* ROM, uint32_t* NEW, uint32_t* NEW2) { int i; for (i = 0; i < 0x200000; i++) @@ -1162,10 +1162,10 @@ DRIVER_INIT_MEMBER(gstream_state,x2222) m_maincpu->space(AS_PROGRAM).install_read_handler(0x7ffac, 0x7ffaf, read32_delegate(FUNC(gstream_state::x2222_speedup_r), this)); // older m_maincpu->space(AS_PROGRAM).install_read_handler(0x84e3c, 0x84e3f, read32_delegate(FUNC(gstream_state::x2222_speedup2_r), this)); // newer - rearrange_sprite_data(memregion("sprites")->base(), (UINT32*)memregion("gfx1")->base(), (UINT32*)memregion("gfx1_lower")->base() ); - rearrange_tile_data(memregion("bg1")->base(), (UINT32*)memregion("gfx2")->base(), (UINT32*)memregion("gfx2_lower")->base()); - rearrange_tile_data(memregion("bg2")->base(), (UINT32*)memregion("gfx3")->base(), (UINT32*)memregion("gfx3_lower")->base()); - rearrange_tile_data(memregion("bg3")->base(), (UINT32*)memregion("gfx4")->base(), (UINT32*)memregion("gfx4_lower")->base()); + rearrange_sprite_data(memregion("sprites")->base(), (uint32_t*)memregion("gfx1")->base(), (uint32_t*)memregion("gfx1_lower")->base() ); + rearrange_tile_data(memregion("bg1")->base(), (uint32_t*)memregion("gfx2")->base(), (uint32_t*)memregion("gfx2_lower")->base()); + rearrange_tile_data(memregion("bg2")->base(), (uint32_t*)memregion("gfx3")->base(), (uint32_t*)memregion("gfx3_lower")->base()); + rearrange_tile_data(memregion("bg3")->base(), (uint32_t*)memregion("gfx4")->base(), (uint32_t*)memregion("gfx4_lower")->base()); m_xoffset = 0; } |