summaryrefslogtreecommitdiffstats
path: root/src/emu/digfx.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-07-20 12:31:21 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2019-07-20 12:31:21 +1000
commitd2926fa02cef5bf728eac74c9e5586aced02a80b (patch)
tree820d62305954ff68c7c8bb87c8a08d1b7ce4b2c3 /src/emu/digfx.cpp
parent24c462dbdb4ed2992af2f8767bf9c56979e7f1be (diff)
parent68139508715a0375e657add4197582271ef446ec (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/emu/digfx.h
Diffstat (limited to 'src/emu/digfx.cpp')
-rw-r--r--src/emu/digfx.cpp35
1 files changed, 9 insertions, 26 deletions
diff --git a/src/emu/digfx.cpp b/src/emu/digfx.cpp
index acc1c5f1176..0055421b80c 100644
--- a/src/emu/digfx.cpp
+++ b/src/emu/digfx.cpp
@@ -249,33 +249,16 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo)
// otherwise, just use the line modulo
else
{
- if (glcopy.planeoffset[1] != GFX_RAW) // 8bpp RAW case
+ int base = gfx.start;
+ int end = region_length/8;
+ int linemod = glcopy.yoffset[0];
+ while (glcopy.total > 0)
{
- int base = gfx.start;
- int end = region_length/8;
- int linemod = glcopy.yoffset[0];
- while (glcopy.total > 0)
- {
- int elementbase = base + (glcopy.total - 1) * glcopy.charincrement / 8;
- int lastpixelbase = elementbase + glcopy.height * linemod / 8 - 1;
- if (lastpixelbase < end)
- break;
- glcopy.total--;
- }
- }
- else // 16bpp RAW case
- {
- int base = gfx.start;
- int end = region_length/16;
- int linemod = glcopy.yoffset[0];
- while (glcopy.total > 0)
- {
- int elementbase = base + (glcopy.total - 1) * glcopy.charincrement / 16;
- int lastpixelbase = elementbase + glcopy.height * linemod / 16 - 1;
- if (lastpixelbase < end)
- break;
- glcopy.total--;
- }
+ int elementbase = base + (glcopy.total - 1) * glcopy.charincrement / 8;
+ int lastpixelbase = elementbase + glcopy.height * linemod / 8 - 1;
+ if (lastpixelbase < end)
+ break;
+ glcopy.total--;
}
}