summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2019-10-25 18:16:49 +1100
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2019-10-25 18:16:49 +1100
commitb0ffbe067cab35f9dd1939be3ebececd5e8b23fe (patch)
treeefe63304a437f0e873eab20d7ae2ee240680f29c /src/emu
parent17d95ecab5740b72528e93f7f67eca96f4b6543c (diff)
(nw) keep a persistent temporary palette buffer in bgfx chain manager, back out some unintentional screen changes
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/screen.cpp7
-rw-r--r--src/emu/screen.h20
-rw-r--r--src/emu/video.h1
3 files changed, 10 insertions, 18 deletions
diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp
index 7a342662c56..a946fb22bd2 100644
--- a/src/emu/screen.cpp
+++ b/src/emu/screen.cpp
@@ -531,12 +531,7 @@ void screen_device::svg_renderer::rebuild_cache()
//-------------------------------------------------
screen_device::screen_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : screen_device(mconfig, SCREEN, tag, owner, clock)
-{
-}
-
-screen_device::screen_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
- : device_t(mconfig, type, tag, owner, clock)
+ : device_t(mconfig, SCREEN, tag, owner, clock)
, m_type(SCREEN_TYPE_RASTER)
, m_orientation(ROT0)
, m_phys_aspect(0U, 0U)
diff --git a/src/emu/screen.h b/src/emu/screen.h
index cf6201b4acf..426f3be2e08 100644
--- a/src/emu/screen.h
+++ b/src/emu/screen.h
@@ -186,7 +186,7 @@ public:
set_type(type);
set_color(color);
}
- virtual ~screen_device();
+ ~screen_device();
// configuration readers
screen_type_enum screen_type() const { return m_type; }
@@ -228,7 +228,7 @@ public:
/// \param [in] vbstart Index of first line in vertical blanking
/// period after visible lines.
/// \return Reference to device for method chaining.
- virtual screen_device &set_raw(u32 pixclock, u16 htotal, u16 hbend, u16 hbstart, u16 vtotal, u16 vbend, u16 vbstart)
+ screen_device &set_raw(u32 pixclock, u16 htotal, u16 hbend, u16 hbstart, u16 vtotal, u16 vbend, u16 vbstart)
{
assert(pixclock != 0);
m_clock = pixclock;
@@ -393,7 +393,7 @@ public:
// beam positioning and state
int vpos() const;
- virtual int hpos() const;
+ int hpos() const;
DECLARE_READ_LINE_MEMBER(vblank) const { return (machine().time() < m_vblank_end_time) ? 1 : 0; }
DECLARE_READ_LINE_MEMBER(hblank) const { int const curpos = hpos(); return (curpos < m_visarea.left() || curpos > m_visarea.right()) ? 1 : 0; }
@@ -407,14 +407,14 @@ public:
u64 frame_number() const { return m_frame_number; }
// pixel-level access
- virtual u32 pixel(s32 x, s32 y);
- virtual void pixels(u32* buffer);
+ u32 pixel(s32 x, s32 y);
+ void pixels(u32* buffer);
// updating
int partial_updates() const { return m_partial_updates_this_frame; }
- virtual bool update_partial(int scanline);
- virtual void update_now();
- virtual void reset_partial_updates();
+ bool update_partial(int scanline);
+ void update_now();
+ void reset_partial_updates();
// additional helpers
void register_vblank_callback(vblank_state_delegate vblank_callback);
@@ -428,9 +428,7 @@ public:
static constexpr int DEFAULT_FRAME_RATE = 60;
static const attotime DEFAULT_FRAME_PERIOD;
-protected:
- screen_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
-
+private:
class svg_renderer;
// timer IDs
diff --git a/src/emu/video.h b/src/emu/video.h
index 6015eecf146..b8b1c408773 100644
--- a/src/emu/video.h
+++ b/src/emu/video.h
@@ -38,7 +38,6 @@ constexpr int MAX_FRAMESKIP = FRAMESKIP_LEVELS - 2;
class video_manager
{
friend class screen_device;
- friend class variable_width_screen_device;
public:
// movie format options