Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-29 03:20:50 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

render: improve behaviour in general for systems with two screens (sorry about occasional extra warning messages, it's unavoidable)

Browse Source
This commit is contained in:
Vas Crabb 2018-07-20 02:38:09 +10:00
parent fb0e547884
commit f432c4475a
6 changed files with 119 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/emu/layout/dualhovu.lay
View File

@ -1,29 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<mamelayout version="2"> <mamelayout version="2">
<view name="Screen 0 Standard (4:3)">
<screen index="0">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 1 Standard (4:3)">
<screen index="1">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 0 Pixel Aspect (~scr0nativexaspect~:~scr0nativeyaspect~)">
<screen index="0">
<bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" />
</screen>
</view>
<view name="Screen 1 Pixel Aspect (~scr1nativexaspect~:~scr1nativeyaspect~)">
<screen index="1">
<bounds left="0" top="0" right="~scr1width~" bottom="~scr1height~" />
</screen>
</view>
<view name="Dual Over-Under"> <view name="Dual Over-Under">
<screen index="0"> <screen index="0">
<bounds x="0" y="-3.03" width="4" height="3" /> <bounds x="0" y="-3.03" width="4" height="3" />

24
src/emu/layout/dualhsxs.lay
View File

@ -1,29 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<mamelayout version="2"> <mamelayout version="2">
<view name="Screen 0 Standard (4:3)">
<screen index="0">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 1 Standard (4:3)">
<screen index="1">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 0 Pixel Aspect (~scr0nativexaspect~:~scr0nativeyaspect~)">
<screen index="0">
<bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" />
</screen>
</view>
<view name="Screen 1 Pixel Aspect (~scr1nativexaspect~:~scr1nativeyaspect~)">
<screen index="1">
<bounds left="0" top="0" right="~scr1width~" bottom="~scr1height~" />
</screen>
</view>
<view name="Dual Side-by-Side"> <view name="Dual Side-by-Side">
<screen index="0"> <screen index="0">
<bounds x="0" y="0" width="4" height="3" /> <bounds x="0" y="0" width="4" height="3" />

24
src/emu/layout/dualhuov.lay
View File

@ -1,29 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<mamelayout version="2"> <mamelayout version="2">
<view name="Screen 0 Standard (4:3)">
<screen index="0">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 1 Standard (4:3)">
<screen index="1">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 0 Pixel Aspect (~scr0nativexaspect~:~scr0nativeyaspect~)">
<screen index="0">
<bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" />
</screen>
</view>
<view name="Screen 1 Pixel Aspect (~scr1nativexaspect~:~scr1nativeyaspect~)">
<screen index="1">
<bounds left="0" top="0" right="~scr1width~" bottom="~scr1height~" />
</screen>
</view>
<view name="Dual Under-Over"> <view name="Dual Under-Over">
<screen index="1"> <screen index="1">
<bounds x="0" y="-3.03" width="4" height="3" /> <bounds x="0" y="-3.03" width="4" height="3" />

36
src/emu/layout/triphsxs.lay
View File

@ -1,41 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<mamelayout version="2"> <mamelayout version="2">
<view name="Screen 0 Standard (4:3)">
<screen index="0">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 1 Standard (4:3)">
<screen index="1">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 2 Standard (4:3)">
<screen index="2">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 0 Pixel Aspect (~scr0nativexaspect~:~scr0nativeyaspect~)">
<screen index="0">
<bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" />
</screen>
</view>
<view name="Screen 1 Pixel Aspect (~scr1nativexaspect~:~scr1nativeyaspect~)">
<screen index="1">
<bounds left="0" top="0" right="~scr1width~" bottom="~scr1height~" />
</screen>
</view>
<view name="Screen 2 Pixel Aspect (~scr2nativexaspect~:~scr2nativeyaspect~)">
<screen index="2">
<bounds left="0" top="0" right="~scr2width~" bottom="~scr2height~" />
</screen>
</view>
<view name="Triple Side-by-Side"> <view name="Triple Side-by-Side">
<screen index="0"> <screen index="0">
<bounds x="0" y="0" width="4" height="3" /> <bounds x="0" y="0" width="4" height="3" />

42
src/emu/render.cpp
View File

@ -1112,19 +1112,19 @@ int render_target::configured_view(const char *viewname, int targetindex, int nu
{ {
for (view = view_by_index(viewindex = 0); view != nullptr; view = view_by_index(++viewindex)) for (view = view_by_index(viewindex = 0); view != nullptr; view = view_by_index(++viewindex))
{ {
const render_screen_list &viewscreens = view->screens(); render_screen_list const &viewscreens(view->screens());
if (viewscreens.count() == 0)
break;
if (viewscreens.count() >= scrcount) if (viewscreens.count() >= scrcount)
{ {
bool has_screen = false; bool screen_missing(false);
for (screen_device &screen : iter) for (screen_device &screen : iter)
{
if (!viewscreens.contains(screen)) if (!viewscreens.contains(screen))
{ {
has_screen = true; screen_missing = true;
break; break;
} }
if (!has_screen) }
if (!screen_missing)
break; break;
} }
} }
@ -1709,7 +1709,7 @@ void render_target::load_additional_layout_files(const char *basename, bool have
throw emu_fatalerror("Couldn't parse default layout??"); throw emu_fatalerror("Couldn't parse default layout??");
} }
} }
else if (screens >= 3) // generate default layouts for larger numbers of screens else if (screens >= 2) // generate default layouts for larger numbers of screens
{ {
util::xml::file::ptr const root(util::xml::file::create()); util::xml::file::ptr const root(util::xml::file::create());
if (!root) if (!root)
@ -1763,6 +1763,33 @@ void render_target::load_additional_layout_files(const char *basename, bool have
boundsnode->set_attribute("height", util::xml::normalize_string(util::string_format("~scr%1$uheight~", i).c_str())); boundsnode->set_attribute("height", util::xml::normalize_string(util::string_format("~scr%1$uheight~", i).c_str()));
} }
// generate tiled views if the supplied artwork doesn't provide a view of all screens
bool need_tiles(screens >= 3);
if (!need_tiles)
{
need_tiles = true;
int viewindex(0);
for (layout_view *view = view_by_index(viewindex); need_tiles && view; view = view_by_index(++viewindex))
{
render_screen_list const &viewscreens(view->screens());
if (viewscreens.count() >= screens)
{
bool screen_missing(false);
for (screen_device &screen : iter)
{
if (!viewscreens.contains(screen))
{
screen_missing = true;
break;
}
}
if (!screen_missing)
need_tiles = false;
}
}
}
if (need_tiles)
{
// helper for generating a view since we do this a lot // helper for generating a view since we do this a lot
auto const generate_view = auto const generate_view =
[&layoutnode, screens, stdwidth, stdheight] (char const *title, auto &&bounds_callback) [&layoutnode, screens, stdwidth, stdheight] (char const *title, auto &&bounds_callback)
@ -1853,6 +1880,7 @@ void render_target::load_additional_layout_files(const char *basename, bool have
}); });
} }
} }
}
// try to parse it // try to parse it
if (!load_layout_file(m_manager.machine().root_device(), nullptr, *root)) if (!load_layout_file(m_manager.machine().root_device(), nullptr, *root))

36
src/mame/layout/darius.lay
View File

@ -1,41 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<mamelayout version="2"> <mamelayout version="2">
<view name="Screen 0 Standard (4:3)">
<screen index="0">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 1 Standard (4:3)">
<screen index="1">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 2 Standard (4:3)">
<screen index="2">
<bounds left="0" top="0" right="4" bottom="3" />
</screen>
</view>
<view name="Screen 0 Pixel Aspect (~scr0nativexaspect~:~scr0nativeyaspect~)">
<screen index="0">
<bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" />
</screen>
</view>
<view name="Screen 1 Pixel Aspect (~scr1nativexaspect~:~scr1nativeyaspect~)">
<screen index="1">
<bounds left="0" top="0" right="~scr1width~" bottom="~scr1height~" />
</screen>
</view>
<view name="Screen 2 Pixel Aspect (~scr2nativexaspect~:~scr2nativeyaspect~)">
<screen index="2">
<bounds left="0" top="0" right="~scr2width~" bottom="~scr2height~" />
</screen>
</view>
<view name="Triple Side-by-Side"> <view name="Triple Side-by-Side">
<screen index="0"> <screen index="0">
<bounds x="0" y="0" width="4" height="3" /> <bounds x="0" y="0" width="4" height="3" />