diff options
Diffstat (limited to 'src/emu/screen.h')
-rw-r--r-- | src/emu/screen.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/screen.h b/src/emu/screen.h index 6c3da03a0b9..956a899b331 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -179,7 +179,7 @@ public: static void static_set_screen_update(device_t &device, screen_update_ind16_delegate callback); static void static_set_screen_update(device_t &device, screen_update_rgb32_delegate callback); static void static_set_screen_vblank(device_t &device, screen_vblank_delegate callback); - static void static_set_palette(device_t &device, const char *palette, int base); + static void static_set_palette(device_t &device, const char *tag); static void static_set_video_attributes(device_t &device, UINT32 flags); // information getters @@ -261,8 +261,7 @@ private: screen_update_ind16_delegate m_screen_update_ind16; // screen update callback (16-bit palette) screen_update_rgb32_delegate m_screen_update_rgb32; // screen update callback (32-bit RGB) screen_vblank_delegate m_screen_vblank; // screen vblank callback - const char * m_palette_tag; // tag to our palette - int m_palette_base; // base of our palette + optional_device<palette_device> m_palette; // our palette UINT32 m_video_attributes; // flags describing the video system // internal state @@ -274,7 +273,6 @@ private: rectangle m_visarea; // current visible area (HBLANK end/start, VBLANK end/start) // textures and bitmaps - palette_device * m_palette; // our palette texture_format m_texformat; // texture format render_texture * m_texture[2]; // 2x textures for the screen bitmap screen_bitmap m_bitmap[2]; // 2x bitmaps for rendering @@ -383,7 +381,9 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre #define MCFG_SCREEN_VBLANK_DEVICE(_device, _class, _method) \ screen_device::static_set_screen_vblank(*device, screen_vblank_delegate(&_class::_method, #_class "::" #_method, _device, (_class *)0)); #define MCFG_SCREEN_PALETTE(_palette_tag) \ - screen_device::static_set_palette(*device, _palette_tag, 0); + screen_device::static_set_palette(*device, "^" _palette_tag); +#define MCFG_SCREEN_NO_PALETTE \ + screen_device::static_set_palette(*device, FINDER_DUMMY_TAG); #define MCFG_SCREEN_VIDEO_ATTRIBUTES(_flags) \ screen_device::static_set_video_attributes(*device, _flags); |