diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/emu/screen.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/emu/screen.cpp')
-rw-r--r-- | src/emu/screen.cpp | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index 77efffc970b..fc706f5af48 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -119,7 +119,22 @@ screen_device::svg_renderer::svg_renderer(memory_region *region) m_sx = m_sy = 0; m_scale = 1.0; - osd_printf_verbose("Parsed SVG '%s', aspect ratio %f\n", region->name(), (m_image->height == 0.0f) ? 0 : m_image->width / m_image->height); +#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 } screen_device::svg_renderer::~svg_renderer() @@ -715,10 +730,6 @@ 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); @@ -738,6 +749,10 @@ 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; |