diff options
Diffstat (limited to 'src/emu/digfx.cpp')
-rw-r--r-- | src/emu/digfx.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/emu/digfx.cpp b/src/emu/digfx.cpp index 3ab059ee5e0..56fe96865b9 100644 --- a/src/emu/digfx.cpp +++ b/src/emu/digfx.cpp @@ -124,23 +124,23 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo) // local variables to hold mutable copies of gfx layout data gfx_layout glcopy; - std::vector<UINT32> extxoffs(0); - std::vector<UINT32> extyoffs(0); + std::vector<uint32_t> extxoffs(0); + std::vector<uint32_t> extyoffs(0); // loop over all elements - for (UINT8 curgfx = 0; curgfx < MAX_GFX_ELEMENTS && gfxdecodeinfo[curgfx].gfxlayout != nullptr; curgfx++) + for (uint8_t curgfx = 0; curgfx < MAX_GFX_ELEMENTS && gfxdecodeinfo[curgfx].gfxlayout != nullptr; curgfx++) { const gfx_decode_entry &gfx = gfxdecodeinfo[curgfx]; // extract the scale factors and xormask - UINT32 xscale = GFXENTRY_GETXSCALE(gfx.flags); - UINT32 yscale = GFXENTRY_GETYSCALE(gfx.flags); - UINT32 xormask = GFXENTRY_ISREVERSE(gfx.flags) ? 7 : 0; + uint32_t xscale = GFXENTRY_GETXSCALE(gfx.flags); + uint32_t yscale = GFXENTRY_GETYSCALE(gfx.flags); + uint32_t xormask = GFXENTRY_ISREVERSE(gfx.flags) ? 7 : 0; // resolve the region - UINT32 region_length; - const UINT8 *region_base; - UINT8 region_width; + uint32_t region_length; + const uint8_t *region_base; + uint8_t region_width; endianness_t region_endianness; if (gfx.memory_region != nullptr) @@ -151,7 +151,7 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo) memory_share *share = basedevice.memshare(gfx.memory_region); assert(share != nullptr); region_length = 8 * share->bytes(); - region_base = reinterpret_cast<UINT8 *>(share->ptr()); + region_base = reinterpret_cast<uint8_t *>(share->ptr()); region_width = share->bytewidth(); region_endianness = share->endianness(); } @@ -205,8 +205,8 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo) // copy the X and Y offsets into our temporary arrays extxoffs.resize(glcopy.width * xscale); extyoffs.resize(glcopy.height * yscale); - memcpy(&extxoffs[0], (glcopy.extxoffs != nullptr) ? glcopy.extxoffs : glcopy.xoffset, glcopy.width * sizeof(UINT32)); - memcpy(&extyoffs[0], (glcopy.extyoffs != nullptr) ? glcopy.extyoffs : glcopy.yoffset, glcopy.height * sizeof(UINT32)); + memcpy(&extxoffs[0], (glcopy.extxoffs != nullptr) ? glcopy.extxoffs : glcopy.xoffset, glcopy.width * sizeof(uint32_t)); + memcpy(&extyoffs[0], (glcopy.extyoffs != nullptr) ? glcopy.extyoffs : glcopy.yoffset, glcopy.height * sizeof(uint32_t)); // always use the extended offsets here glcopy.extxoffs = &extxoffs[0]; @@ -229,7 +229,7 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo) // loop over all the planes, converting fractions for (int j = 0; j < glcopy.planes; j++) { - UINT32 value1 = glcopy.planeoffset[j]; + uint32_t value1 = glcopy.planeoffset[j]; if (IS_FRAC(value1)) { assert(region_length != 0); @@ -240,7 +240,7 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo) // loop over all the X/Y offsets, converting fractions for (int j = 0; j < glcopy.width; j++) { - UINT32 value2 = extxoffs[j]; + uint32_t value2 = extxoffs[j]; if (IS_FRAC(value2)) { assert(region_length != 0); @@ -250,7 +250,7 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo) for (int j = 0; j < glcopy.height; j++) { - UINT32 value3 = extyoffs[j]; + uint32_t value3 = extyoffs[j]; if (IS_FRAC(value3)) { assert(region_length != 0); @@ -328,7 +328,7 @@ void device_gfx_interface::interface_validity_check(validity_checker &valid) con else gfxregion = device().owner()->subtag(region); - UINT32 region_length = valid.region_length(gfxregion.c_str()); + uint32_t region_length = valid.region_length(gfxregion.c_str()); if (region_length == 0) osd_printf_error("gfx[%d] references nonexistent region '%s'\n", gfxnum, gfxregion.c_str()); |