summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Luca Elia <lucaelia@mamedev.org>2017-04-02 19:16:27 +0200
committer Luca Elia <lucaelia@mamedev.org>2017-04-02 19:16:27 +0200
commite8ced41ec6446e08ab57d2e8427ef53e3eefdab7 (patch)
tree4c187e8e1b7296c7e4bc117ccdd706343bb6192c
parenta29680e32ea82d4fd9337eaa4627c231cb1d5ba0 (diff)
cesblit.cpp: Improve blit coordinates, fixes some missing graphics in e.g. galgame4 [Luca Elia]
-rw-r--r--src/devices/video/cesblit.cpp65
-rw-r--r--src/devices/video/cesblit.h1
2 files changed, 37 insertions, 29 deletions
diff --git a/src/devices/video/cesblit.cpp b/src/devices/video/cesblit.cpp
index 330abce1b66..a79d9a605e9 100644
--- a/src/devices/video/cesblit.cpp
+++ b/src/devices/video/cesblit.cpp
@@ -25,8 +25,8 @@
10 fedc ba-- ---- ----
---- --9- ---- ---- Pen Replacement Mode
---- ---8 ---- ----
- ---- ---- 7--- ---- Layer
- ---- ---- -6-- ---- Buffer
+ ---- ---- 7--- ---- Layer To Draw To
+ ---- ---- -6-- ---- Draw To Not Displayed Buffer
---- ---- --5- ---- Solid Fill
---- ---- ---4 ---- Enable VBlank IRQ (e.g. level 3) (0 clears the IRQ line too)
---- ---- ---- 3--- Enable Blitter Finished IRQ (e.g. level 2) ""
@@ -98,12 +98,27 @@ void cesblit_device::device_start()
{
for (int buffer = 0; buffer < 2; ++buffer)
{
- m_screen->register_screen_bitmap(m_bitmap[layer][buffer]);
+ m_bitmap[layer][buffer].allocate(512, 512);
m_bitmap[layer][buffer].fill(0xff);
}
}
}
+//-------------------------------------------------
+// device_stop - device-specific stop
+//-------------------------------------------------
+
+void cesblit_device::device_stop()
+{
+ for (int layer = 0; layer < 2; ++layer)
+ {
+ for (int buffer = 0; buffer < 2; ++buffer)
+ {
+ m_bitmap[layer][buffer].reset();
+ }
+ }
+}
+
/***************************************************************************
READ/WRITE HANDLERS
***************************************************************************/
@@ -156,7 +171,7 @@ void cesblit_device::do_blit()
int mode = m_regs[0x10/2];
int layer = (mode >> 7) & 1; // layer to draw to
- buffer = ((mode >> 6) & 1) ^ ((buffer >> layer) & 1); // bit 6 selects whether to use the opposite buffer to that displayed
+ buffer = ((mode >> 6) & 1) ^ ((buffer >> layer) & 1); // bit 6 selects whether to use the opposite buffer to that displayed
addr <<= 1;
@@ -168,6 +183,12 @@ void cesblit_device::do_blit()
#endif
#endif
+ sx &= 0x1ff;
+ sw &= 0x1ff; // can be 0: draw nothing (see e.g. fade-in effect in galgame3/diamond derby)
+
+ sy &= 0x1ff;
+ sh &= 0x1ff;
+
int flipx = mode & 1;
int flipy = mode & 2;
@@ -179,9 +200,6 @@ void cesblit_device::do_blit()
if (flipy) { y0 = sh-1; y1 = -1; dy = -1; sy -= sh-1; }
else { y0 = 0; y1 = sh; dy = +1; }
- sx = (sx & 0x7fff) - (sx & 0x8000);
- sy = (sy & 0x7fff) - (sy & 0x8000);
-
int color = (m_color & 0x0f) << 8;
// Draw
@@ -205,20 +223,16 @@ void cesblit_device::do_blit()
{
for (x = x0; x != x1; x += dx)
{
- if ((sx + x >= 0) && (sx + x < 400) && (sy + y >= 0) && (sy + y < 256))
- {
- pen = m_space->read_byte(addr);
+ pen = m_space->read_byte(addr);
- if (pen == src_pen)
- pen = dst_pen;
+ if (pen == src_pen)
+ pen = dst_pen;
+
+ if (pen != 0xff)
+ bitmap.pix16((sy + y) & 0x1ff, (sx + x) & 0x1ff) = pen + color;
- if (pen != 0xff)
- bitmap.pix16(sy + y, sx + x) = pen + color;
- }
++addr;
}
- if ( (dy > 0 && (sy + y >= 256-1)) || (dy < 0 && (sy + y <= 0)) )
- break;
}
}
else
@@ -229,17 +243,13 @@ void cesblit_device::do_blit()
{
for (x = x0; x != x1; x += dx)
{
- if ((sx + x >= 0) && (sx + x < 400) && (sy + y >= 0) && (sy + y < 256))
- {
- pen = m_space->read_byte(addr);
+ pen = m_space->read_byte(addr);
+
+ if (pen != 0xff)
+ bitmap.pix16((sy + y) & 0x1ff, (sx + x) & 0x1ff) = pen + color;
- if (pen != 0xff)
- bitmap.pix16(sy + y, sx + x) = pen + color;
- }
++addr;
}
- if ( (dy > 0 && (sy + y >= 256-1)) || (dy < 0 && (sy + y <= 0)) )
- break;
}
}
break;
@@ -254,11 +264,8 @@ void cesblit_device::do_blit()
{
for (x = x0; x != x1; x += dx)
{
- if ((sx + x >= 0) && (sx + x < 400) && (sy + y >= 0) && (sy + y < 256))
- bitmap.pix16(sy + y, sx + x) = pen;
+ bitmap.pix16((sy + y) & 0x1ff, (sx + x) & 0x1ff) = pen;
}
- if ( (dy > 0 && (sy + y >= 256-1)) || (dy < 0 && (sy + y <= 0)) )
- break;
}
break;
}
diff --git a/src/devices/video/cesblit.h b/src/devices/video/cesblit.h
index e0d243156bc..24aa79f3a70 100644
--- a/src/devices/video/cesblit.h
+++ b/src/devices/video/cesblit.h
@@ -58,6 +58,7 @@ public:
protected:
// device-level overrides
virtual void device_start() override;
+ virtual void device_stop() override;
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_PROGRAM) const override { return (spacenum == AS_PROGRAM) ? &m_space_config: nullptr; }
void do_blit();