summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-10-08 02:04:31 +1100
committer Vas Crabb <vas@vastheman.com>2020-10-08 02:04:31 +1100
commitb90fd355150a0f56e368bb33619459b19ec92bee (patch)
tree41ac320a4199b0856a485c9d75458dbc98aa168e /src/mame
parent4b0903bfdbe88d4e220fc2c2f140e7b503060909 (diff)
Various improvements to image file handling:
Moved MS DIB parser out of ICO file reader and made it available for artwork and layout images. Added more efficient I/O and better error checking for JPEG file loading (MAME will no longer exit immediately on a bad JPEG file). Made caller responsible for opening files for loading images, to avoid decompressing images used in ZIP/7z artwork multiple times. Added support for JPEG and Windows DIB to picture_image_device. Added support for SVG image files in external artwork. Added support for using I/O port value for animation state and masking animation state values. Made bounds elements more flexible in layouts. Reworked headers to reduce dependencies. Updated layout file format documentation.
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/drivers/alg.cpp1
-rw-r--r--src/mame/drivers/by17.cpp5
-rw-r--r--src/mame/drivers/by35.cpp5
-rw-r--r--src/mame/drivers/cliffhgr.cpp1
-rw-r--r--src/mame/drivers/decwritr.cpp2
-rw-r--r--src/mame/drivers/dlair.cpp1
-rw-r--r--src/mame/drivers/istellar.cpp1
-rw-r--r--src/mame/drivers/lgp.cpp1
-rw-r--r--src/mame/layout/unkeinv.lay52
-rw-r--r--src/mame/video/midtunit.cpp2
-rw-r--r--src/mame/video/ssv.cpp1
-rw-r--r--src/mame/video/st0020.cpp4
-rw-r--r--src/mame/video/tx1.cpp4
13 files changed, 28 insertions, 52 deletions
diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp
index 73189abc79e..9e42a1ce7e5 100644
--- a/src/mame/drivers/alg.cpp
+++ b/src/mame/drivers/alg.cpp
@@ -30,7 +30,6 @@
#include "machine/ldp1450.h"
#include "machine/nvram.h"
#include "machine/amigafdc.h"
-#include "render.h"
#include "speaker.h"
diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp
index b8832806c8d..33074d0e79b 100644
--- a/src/mame/drivers/by17.cpp
+++ b/src/mame/drivers/by17.cpp
@@ -26,7 +26,6 @@ ToDo:
#include "by17.lh"
#include "by17_pwerplay.lh"
#include "by17_matahari.lh"
-#include "render.h"
class by17_state : public genpin_class
{
@@ -980,10 +979,6 @@ void by17_state::machine_reset()
{
genpin_class::machine_reset();
- render_target *target = machine().render().first_target();
-
- target->set_view(0);
-
m_u10a = 0;
m_u10b = 0;
m_u11a = 0;
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index e4f3aab38a6..70d15834ce1 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -73,7 +73,6 @@ ToDo:
#include "machine/6821pia.h"
#include "machine/timer.h"
#include "audio/bally.h"
-#include "render.h"
#include "speaker.h"
//#define VERBOSE 1
@@ -1441,10 +1440,6 @@ void by35_state::machine_reset()
{
genpin_class::machine_reset();
- render_target *target = machine().render().first_target();
-
- target->set_view(0);
-
m_u10a = 0;
m_u10b = 0;
m_u11a = 0;
diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp
index 3761c0548b7..339866ab13c 100644
--- a/src/mame/drivers/cliffhgr.cpp
+++ b/src/mame/drivers/cliffhgr.cpp
@@ -83,7 +83,6 @@ Side 2 = 0x8F7DDD (or 0x880000 | ( 0x77 << 12 ) | 0x0DDD)
#include "video/tms9928a.h"
#include "machine/nvram.h"
-#include "render.h"
#include "speaker.h"
diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp
index b5b32b2ee71..84133c2e05c 100644
--- a/src/mame/drivers/decwritr.cpp
+++ b/src/mame/drivers/decwritr.cpp
@@ -19,7 +19,7 @@
#include "machine/i8251.h"
#include "machine/input_merger.h"
#include "sound/beep.h"
-#include "render.h"
+#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp
index b914c58b35c..496ad516322 100644
--- a/src/mame/drivers/dlair.cpp
+++ b/src/mame/drivers/dlair.cpp
@@ -46,7 +46,6 @@
#include "sound/ay8910.h"
#include "sound/spkrdev.h"
#include "emupal.h"
-#include "render.h"
#include "speaker.h"
#include "dlair.lh"
diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp
index 687be6f0e79..1f546d3be55 100644
--- a/src/mame/drivers/istellar.cpp
+++ b/src/mame/drivers/istellar.cpp
@@ -26,7 +26,6 @@ Todo:
#include "machine/gen_latch.h"
#include "machine/ldv1000.h"
#include "emupal.h"
-#include "render.h"
#include "speaker.h"
diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp
index 67bc14514f8..9b76c5469de 100644
--- a/src/mame/drivers/lgp.cpp
+++ b/src/mame/drivers/lgp.cpp
@@ -69,7 +69,6 @@ Dumping Notes:
#include "cpu/z80/z80.h"
#include "machine/ldv1000.h"
#include "emupal.h"
-#include "render.h"
#include "speaker.h"
diff --git a/src/mame/layout/unkeinv.lay b/src/mame/layout/unkeinv.lay
index 12b42eef798..b5fde8e2ac8 100644
--- a/src/mame/layout/unkeinv.lay
+++ b/src/mame/layout/unkeinv.lay
@@ -6,24 +6,6 @@ license:CC0
<!-- define elements -->
- <element name="black"><rect><color red="0" green="0" blue="0" /></rect></element>
-
- <element name="wandl">
- <rect>
- <bounds x="0" y="0" width="18" height="1" />
- <color red="0" green="0" blue="0" />
- </rect>
- <disk>
- <bounds state="0" x="0" y="0" width="1" height="1" />
- <bounds state="11" x="16.5" y="0" width="1" height="1" />
- <color red="1.0" green="0.2" blue="0.23" />
- </disk>
- </element>
- <element name="wandm" defstate="0">
- <rect state="0"><color red="0.1" green="0.1" blue="0.1" /></rect>
- <rect state="1"><color red="1.0" green="1.0" blue="1.0" /></rect>
- </element>
-
<element name="ledy" defstate="0">
<disk state="0"><color red="0.07" green="0.06" blue="0.02" /></disk>
<disk state="1"><color red="1.0" green="0.95" blue="0.2" /></disk>
@@ -32,6 +14,11 @@ license:CC0
<disk state="0"><color red="0.023" green="0.1" blue="0.02" /></disk>
<disk state="1"><color red="0.23" green="1.0" blue="0.2" /></disk>
</element>
+ <element name="ledr" defstate="0">
+ <disk state="0"><color red="0.1" green="0.02" blue="0.023" /></disk>
+ <disk state="1"><color red="1.0" green="0.2" blue="0.23" /></disk>
+ </element>
+
<!-- build screen -->
@@ -41,21 +28,24 @@ license:CC0
<!-- wand -->
- <repeat count="9">
+ <repeat count="4">
<param name="y" start="1" increment="3" />
- <element ref="black" inputtag="IN.1" inputmask="0x00" inputraw="yes"><bounds x="0" y="~y~" width="18" height="1" /></element>
- <element ref="wandl" inputtag="IN.1" inputmask="0x0f" inputraw="yes"><bounds x="0" y="~y~" width="18" height="1" /></element>
+ <param name="n" start="0" increment="1" />
+ <element ref="ledr" name="~n~.7">
+ <animate inputtag="IN.1" mask="0x0f" />
+ <bounds state="0" x="0" y="~y~" width="1" height="1" />
+ <bounds state="11" x="16.5" y="~y~" width="1" height="1" />
+ </element>
+ </repeat>
+ <repeat count="5">
+ <param name="y" start="13" increment="3" />
+ <param name="n" start="0" increment="1" />
+ <element ref="ledr" name="~n~.6">
+ <animate inputtag="IN.1" mask="0x0f" />
+ <bounds state="0" x="0" y="~y~" width="1" height="1" />
+ <bounds state="11" x="16.5" y="~y~" width="1" height="1" />
+ </element>
</repeat>
-
- <element name="0.7" ref="wandm" blend="multiply"><bounds x="-0.5" y="0.5" width="19" height="2" /></element>
- <element name="1.7" ref="wandm" blend="multiply"><bounds x="-0.5" y="3.5" width="19" height="2" /></element>
- <element name="2.7" ref="wandm" blend="multiply"><bounds x="-0.5" y="6.5" width="19" height="2" /></element>
- <element name="3.7" ref="wandm" blend="multiply"><bounds x="-0.5" y="9.5" width="19" height="2" /></element>
- <element name="0.6" ref="wandm" blend="multiply"><bounds x="-0.5" y="12.5" width="19" height="2" /></element>
- <element name="1.6" ref="wandm" blend="multiply"><bounds x="-0.5" y="15.5" width="19" height="2" /></element>
- <element name="2.6" ref="wandm" blend="multiply"><bounds x="-0.5" y="18.5" width="19" height="2" /></element>
- <element name="3.6" ref="wandm" blend="multiply"><bounds x="-0.5" y="21.5" width="19" height="2" /></element>
- <element name="4.6" ref="wandm" blend="multiply"><bounds x="-0.5" y="24.5" width="19" height="2" /></element>
<!-- invaders -->
diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp
index 94594884e38..4a74af2b188 100644
--- a/src/mame/video/midtunit.cpp
+++ b/src/mame/video/midtunit.cpp
@@ -1018,7 +1018,7 @@ void midtunit_video_device::log_bitmap(int command, int bpp, bool Skip)
}
}
- png_write_bitmap(file, nullptr, m_log_bitmap, 0, nullptr);
+ util::png_write_bitmap(file, nullptr, m_log_bitmap, 0, nullptr);
if (m_log_json)
{
diff --git a/src/mame/video/ssv.cpp b/src/mame/video/ssv.cpp
index 47f9f031654..c8629284845 100644
--- a/src/mame/video/ssv.cpp
+++ b/src/mame/video/ssv.cpp
@@ -135,7 +135,6 @@
#include "emu.h"
#include "includes/ssv.h"
-#include "render.h"
void ssv_state::drawgfx_line(bitmap_ind16 &bitmap, const rectangle &cliprect, int gfx, uint32_t code, uint32_t color, int flipx, int flipy, int base_sx, int base_sy, int shadow, int realline, int line)
diff --git a/src/mame/video/st0020.cpp b/src/mame/video/st0020.cpp
index 6702174635a..f378dbbc302 100644
--- a/src/mame/video/st0020.cpp
+++ b/src/mame/video/st0020.cpp
@@ -16,7 +16,9 @@
#include "emu.h"
#include "st0020.h"
-#include "render.h"
+
+#include "screen.h"
+
DEFINE_DEVICE_TYPE(ST0020_SPRITES, st0020_device, "st0020", "Seta ST0020 Sprites")
diff --git a/src/mame/video/tx1.cpp b/src/mame/video/tx1.cpp
index 306da618218..08b74e80462 100644
--- a/src/mame/video/tx1.cpp
+++ b/src/mame/video/tx1.cpp
@@ -7,10 +7,10 @@
****************************************************************************/
#include "emu.h"
-#include "render.h"
+#include "includes/tx1.h"
+
#include "video/resnet.h"
#include "cpu/i86/i86.h"
-#include "includes/tx1.h"
#define OBJ_FRAC 16