summaryrefslogtreecommitdiffstats
path: root/src/devices/video/snes_ppu.h
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2017-05-07 23:18:47 +1000
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2017-05-14 21:44:11 +1000
commit0f0d39ef81562c75e79176dd3bebb1e491ca39d5 (patch)
tree201cee7fdf55ee800f83859a92efd2cfe66cf2b3 /src/devices/video/snes_ppu.h
parente6c4be2b4d71c7a6c95be0bae111eb416ff0f9e7 (diff)
Move static data out of devices into the device types. This is a significant change, so please pay attention.
The core changes are: * Short name, full name and source file are no longer members of device_t, they are part of the device type * MACHINE_COFIG_START no longer needs a driver class * MACHINE_CONFIG_DERIVED_CLASS is no longer necessary * Specify the state class you want in the GAME/COMP/CONS line * The compiler will work out the base class where the driver init member is declared * There is one static device type object per driver rather than one per machine configuration Use DECLARE_DEVICE_TYPE or DECLARE_DEVICE_TYPE_NS to declare device type. * DECLARE_DEVICE_TYPE forward-declares teh device type and class, and declares extern object finders. * DECLARE_DEVICE_TYPE_NS is for devices classes in namespaces - it doesn't forward-declare the device type. Use DEFINE_DEVICE_TYPE or DEFINE_DEVICE_TYPE_NS to define device types. * These macros declare storage for the static data, and instantiate the device type and device finder templates. The rest of the changes are mostly just moving stuff out of headers that shouldn't be there, renaming stuff for consistency, and scoping stuff down where appropriate. Things I've actually messed with substantially: * More descriptive names for a lot of devices * Untangled the fantasy sound from the driver state, which necessitates breaking up sound/flip writes * Changed DECO BSMT2000 ready callback into a device delegate * Untangled Microprose 3D noise from driver state * Used object finders for CoCo multipak, KC85 D002, and Irem sound subdevices * Started to get TI-99 stuff out of the TI-990 directory and arrange bus devices properly * Started to break out common parts of Samsung ARM SoC devices * Turned some of FM, SID, SCSP DSP, EPIC12 and Voodoo cores into something resmbling C++ * Tried to make Z180 table allocation/setup a bit safer * Converted generic keyboard/terminal to not use WRITE8 - space/offset aren't relevant * Dynamically allocate generic terminal buffer so derived devices (e.g. teleprinter) can specify size * Imporved encapsulation of Z80DART channels * Refactored the SPC7110 bit table generator loop to make it more readable * Added wrappers for SNES PPU operations so members can be made protected * Factored out some boilerplate for YM chips with PSG * toaplan2 gfx * stic/intv resolution * Video System video * Out Run/Y-board sprite alignment * GIC video hookup * Amstrad CPC ROM box members * IQ151 ROM cart region * MSX cart IRQ callback resolution time * SMS passthrough control devices starting subslots I've smoke-tested several drivers, but I've probably missed something. Things I've missed will likely blow up spectacularly with failure to bind errors and the like. Let me know if there's more subtle breakage (could have happened in FM or Voodoo). And can everyone please, please try to keep stuff clean. In particular, please stop polluting the global namespace. Keep things out of headers that don't need to be there, and use things that can be scoped down rather than macros. It feels like an uphill battle trying to get this stuff under control while more of it's added.
Diffstat (limited to 'src/devices/video/snes_ppu.h')
-rw-r--r--src/devices/video/snes_ppu.h110
1 files changed, 66 insertions, 44 deletions
diff --git a/src/devices/video/snes_ppu.h b/src/devices/video/snes_ppu.h
index ab1a30245df..2a3ac575edf 100644
--- a/src/devices/video/snes_ppu.h
+++ b/src/devices/video/snes_ppu.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef MAME_DEVICES_VIDEO_SNES_PPU_H
-#define MAME_DEVICES_VIDEO_SNES_PPU_H
+#ifndef MAME_VIDEO_SNES_PPU_H
+#define MAME_VIDEO_SNES_PPU_H
#pragma once
@@ -34,37 +34,6 @@
#define SNES_LAYER_DEBUG 0
-/* offset-per-tile modes */
-enum
-{
- SNES_OPT_NONE = 0,
- SNES_OPT_MODE2,
- SNES_OPT_MODE4,
- SNES_OPT_MODE6
-};
-
-/* layers */
-enum
-{
- SNES_BG1 = 0,
- SNES_BG2,
- SNES_BG3,
- SNES_BG4,
- SNES_OAM,
- SNES_COLOR
-};
-
-
-struct SNES_SCANLINE
-{
- int enable, clip;
-
- uint16_t buffer[SNES_SCR_WIDTH];
- uint8_t priority[SNES_SCR_WIDTH];
- uint8_t layer[SNES_SCR_WIDTH];
- uint8_t blend_exception[SNES_SCR_WIDTH];
-};
-
// ======================> snes_ppu_device
class snes_ppu_device : public device_t,
@@ -75,7 +44,68 @@ public:
snes_ppu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// inline configuration helpers
- template<class _Object> static devcb_base &static_set_open_bus_callback(device_t &device, _Object object) { return downcast<snes_ppu_device &>(device).m_openbus_cb.set_callback(object); }
+ template <class Object> static devcb_base &static_set_open_bus_callback(device_t &device, Object &&cb) { return downcast<snes_ppu_device &>(device).m_openbus_cb.set_callback(std::forward<Object>(cb)); }
+
+ void refresh_scanline(bitmap_rgb32 &bitmap, uint16_t curline);
+
+ int16_t current_x() const { return m_screen->hpos() / m_htmult; }
+ int16_t current_y() const { return m_screen->vpos(); }
+ void set_latch_hv(int16_t x, int16_t y);
+
+ uint8_t read(address_space &space, uint32_t offset, uint8_t wrio_bit7);
+ void write(address_space &space, uint32_t offset, uint8_t data);
+
+ int vtotal() const { return ((m_stat78 & 0x10) == SNES_NTSC) ? SNES_VTOTAL_NTSC : SNES_VTOTAL_PAL; }
+ uint16_t htmult() const { return m_htmult; }
+ uint8_t interlace() const { return m_interlace; }
+ bool screen_disabled() const { return bool(m_screen_disabled); }
+ uint8_t last_visible_line() const { return m_beam.last_visible_line; }
+ uint16_t current_vert() const { return m_beam.current_vert; }
+ uint8_t saved_oam_address_low() const { return m_oam.saved_address_low; }
+ uint8_t saved_oam_address_high() const { return m_oam.saved_address_high; }
+
+ void clear_time_range_over() { m_stat77 &= 0x3f; }
+ void toggle_field() { m_stat78 ^= 0x80; }
+ void reset_interlace()
+ {
+ m_htmult = 1;
+ m_interlace = 1;
+ m_obj_interlace = 1;
+ }
+ void set_current_vert(uint16_t value) { m_beam.current_vert = value; }
+ void set_first_sprite() { m_oam.first_sprite = m_oam.priority_rotation ? ((m_oam.address >> 1) & 127) : 0; }
+
+protected:
+ /* offset-per-tile modes */
+ enum
+ {
+ SNES_OPT_NONE = 0,
+ SNES_OPT_MODE2,
+ SNES_OPT_MODE4,
+ SNES_OPT_MODE6
+ };
+
+ /* layers */
+ enum
+ {
+ SNES_BG1 = 0,
+ SNES_BG2,
+ SNES_BG3,
+ SNES_BG4,
+ SNES_OAM,
+ SNES_COLOR
+ };
+
+
+ struct SNES_SCANLINE
+ {
+ int enable, clip;
+
+ uint16_t buffer[SNES_SCR_WIDTH];
+ uint8_t priority[SNES_SCR_WIDTH];
+ uint8_t layer[SNES_SCR_WIDTH];
+ uint8_t blend_exception[SNES_SCR_WIDTH];
+ };
uint8_t m_regs[0x40];
@@ -252,17 +282,10 @@ public:
void update_windowmasks(void);
void update_offsets(void);
inline void draw_blend(uint16_t offset, uint16_t *colour, uint8_t prevent_color_math, uint8_t black_pen_clip, int switch_screens);
- void refresh_scanline(bitmap_rgb32 &bitmap, uint16_t curline);
- inline int16_t current_x() { return m_screen->hpos() / m_htmult; }
- inline int16_t current_y() { return m_screen->vpos(); }
- void set_latch_hv(int16_t x, int16_t y);
void dynamic_res_change();
inline uint32_t get_vram_address();
- uint8_t read(address_space &space, uint32_t offset, uint8_t wrio_bit7);
- void write(address_space &space, uint32_t offset, uint8_t data);
-
DECLARE_READ8_MEMBER( oam_read );
DECLARE_WRITE8_MEMBER( oam_write );
DECLARE_READ8_MEMBER( cgram_read );
@@ -273,7 +296,6 @@ public:
std::unique_ptr<uint16_t[]> m_cgram; /* Palette RAM */
std::unique_ptr<uint8_t[]> m_vram; /* Video RAM (TODO: Should be 16-bit, but it's easier this way) */
-protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -289,7 +311,7 @@ private:
// device type definition
-extern const device_type SNES_PPU;
+DECLARE_DEVICE_TYPE(SNES_PPU, snes_ppu_device)
/***************************************************************************
@@ -299,4 +321,4 @@ extern const device_type SNES_PPU;
#define MCFG_SNES_PPU_OPENBUS_CB(_read) \
devcb = &snes_ppu_device::static_set_open_bus_callback(*device, DEVCB_##_read);
-#endif // MAME_DEVICES_VIDEO_SNES_PPU_H
+#endif // MAME_VIDEO_SNES_PPU_H