diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/emu/screen.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/emu/screen.cpp')
-rw-r--r-- | src/emu/screen.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index fc706f5af48..77efffc970b 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -119,22 +119,7 @@ screen_device::svg_renderer::svg_renderer(memory_region *region) m_sx = m_sy = 0; m_scale = 1.0; -#if 0 - double ar = m_image->width / m_image->height; - int w,h; - if (ar < (16.0/9.0)) - { - h = 1080; - w = (h * ar) + 0.5; - } - else - { - w = 1920; - h = (w / ar) + 0.5; - } - - printf("\n\nMCFG_SCREEN_SIZE(%d, %d)\nMCFG_SCREEN_VISIBLE_AREA(0, %d-1, 0, %d-1)\n", w, h, w, h); -#endif + osd_printf_verbose("Parsed SVG '%s', aspect ratio %f\n", region->name(), (m_image->height == 0.0f) ? 0 : m_image->width / m_image->height); } screen_device::svg_renderer::~svg_renderer() @@ -730,6 +715,10 @@ void screen_device::device_resolve_objects() void screen_device::device_start() { + // if we have a palette and it's not started, wait for it + if (m_palette && !m_palette->device().started()) + throw device_missing_dependencies(); + if (m_type == SCREEN_TYPE_SVG) { memory_region *reg = owner()->memregion(m_svg_region); @@ -749,10 +738,6 @@ void screen_device::device_start() } } - // if we have a palette and it's not started, wait for it - if (m_palette && !m_palette->device().started()) - throw device_missing_dependencies(); - // configure bitmap formats and allocate screen bitmaps // svg is RGB32 too, and doesn't have any update method texture_format texformat = !m_screen_update_ind16.isnull() ? TEXFORMAT_PALETTE16 : TEXFORMAT_RGB32; |