Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-29 23:48:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup (nw)

Browse Source
This commit is contained in:
Vas Crabb 2018-08-27 01:30:08 +10:00
parent 8105b73548
commit c87777a015
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/render.cpp
View File

@ -622,10 +622,8 @@ void render_container::set_overlay(bitmap_argb32 *bitmap)
m_overlaybitmap = bitmap;
if (m_overlaybitmap != nullptr)
{
printf("Allocating overlay\n");
m_overlaytexture = m_manager.texture_alloc(render_container::overlay_scale);
m_overlaytexture->set_bitmap(*bitmap, bitmap->cliprect(), TEXFORMAT_ARGB32);
printf("Done allocating overlay\n");
}
}

10
src/emu/render.h
View File

@ -215,8 +215,8 @@ struct render_texinfo
u32 width; // width of the image
u32 height; // height of the image
u32 seqid; // sequence ID
u64 unique_id; // unique identifier to pass to osd
u64 old_id; // previously allocated id, if applicable
u64 unique_id; // unique identifier to pass to osd
u64 old_id; // previously allocated id, if applicable
const rgb_t * palette; // palette for PALETTE16 textures, bcg lookup table for RGB32/YUY16
};
@ -468,8 +468,8 @@ private:
bitmap_t * m_bitmap; // pointer to the original bitmap
rectangle m_sbounds; // source bounds within the bitmap
texture_format m_format; // format of the texture data
u64 m_id; // unique id to pass to osd
u64 m_old_id; // previous id, if applicable
u64 m_id; // unique id to pass to osd
u64 m_old_id; // previous id, if applicable
// scaling state (ARGB32 only)
texture_scaler_func m_scaler; // scaling callback
@ -1183,7 +1183,7 @@ private:
// texture lists
u32 m_live_textures; // number of live textures
u64 m_texture_id; // rolling texture ID counter
u64 m_texture_id; // rolling texture ID counter
fixed_allocator<render_texture> m_texture_allocator;// texture allocator
// containers for the UI and for screens

6
src/mame/drivers/snk68.cpp
View File

@ -889,8 +889,8 @@ ROM_START( ikari3w ) /* Initial boot shows Ikari III The Rescue, then the title
ROM_LOAD16_BYTE( "ik_2.c10", 0x000000, 0x20000, CRC(d0b690d3) SHA1(6c31b27e6b9f1438e8ddbefe41fa8ded22cdb51c) ) /* Rotary Joystick - hand written label */
ROM_LOAD16_BYTE( "ik_3.c9", 0x000001, 0x20000, CRC(11a9e664) SHA1(bf2d8a5f3f2aeff99a45d26279c88ebf04b7f79b) ) /* Rotary Joystick - hand written label */
ROM_REGION( 0x20000, "soundcpu", 0 ) /* Sound CPU */
ROM_LOAD( "ik3-6.18e", 0x000000, 0x20000, CRC(59d256a4) SHA1(1e7b33329f761c695bc9a817bbc0c5e13386d073) )
ROM_REGION( 0x10000, "soundcpu", 0 ) /* Sound CPU */
ROM_LOAD( "ik3-5.16d", 0x000000, 0x10000, CRC(ce6706fc) SHA1(95505b90a9524abf0c8c1ec6b2c40d8f25cb1d92) )
ROM_REGION( 0x010000, "gfx1", 0 ) /* characters */
ROM_LOAD( "ik3-7.16l", 0x000000, 0x08000, CRC(0b4804df) SHA1(66d16d245bfc404366164823faaea0bfec83e487) )
@ -909,7 +909,7 @@ ROM_START( ikari3w ) /* Initial boot shows Ikari III The Rescue, then the title
// 340000-3fffff empty
ROM_REGION( 0x20000, "upd", 0 ) /* UPD7759 samples */
ROM_LOAD( "ik_6.18e", 0x000000, 0x20000, CRC(df0d860f) SHA1(dff59a8eaadf83e79da6a15f4be4998721902f5b) ) /* hand written label */
ROM_LOAD( "ik3-6.18e", 0x000000, 0x20000, CRC(59d256a4) SHA1(1e7b33329f761c695bc9a817bbc0c5e13386d073) )
ROM_REGION16_BE( 0x40000, "user1", 0 ) /* Extra code bank */
ROM_LOAD16_BYTE( "ik3-1.c8", 0x000000, 0x10000, CRC(47e4d256) SHA1(7c6921cf2f1b8c3dae867eb1fc14e3da218cc1e0) )

2
src/osd/modules/render/drawbgfx.h
View File

@ -162,4 +162,4 @@ private:
static uint32_t s_current_view;
};
#endif // RENDER_BGFX
#endif // RENDER_BGFX