Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81721 (nw)

Browse Source
This commit is contained in:
Vas Crabb 2017-09-30 14:19:45 +10:00
parent f8118baec7
commit de0bd3f3f7
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/emu/render.cpp
View File

@ -1745,39 +1745,39 @@ void render_target::load_layout_files(const internal_layout *layoutfile, bool si
}); });
// generate tiled views // generate tiled views
for (unsigned minor = 2; ((screens + minor - 1) / minor) >= minor; ++minor) for (unsigned mindim = 2; ((screens + mindim - 1) / mindim) >= mindim; ++mindim)
{ {
unsigned const major((screens + minor - 1) / minor); unsigned const majdim((screens + mindim - 1) / mindim);
unsigned const remainder(screens % major); unsigned const remainder(screens % majdim);
if (!remainder || (((major + 1) / 2) <= remainder)) if (!remainder || (((majdim + 1) / 2) <= remainder))
{ {
generate_view( generate_view(
util::string_format("%1$u\xC3\x97%2$u Left-to-Right, Top-to-Bottom", major, minor).c_str(), util::string_format("%1$u\xC3\x97%2$u Left-to-Right, Top-to-Bottom", majdim, mindim).c_str(),
[major, stdwidth, stdheight] (util::xml::data_node &boundsnode, unsigned i) [majdim, stdwidth, stdheight] (util::xml::data_node &boundsnode, unsigned i)
{ {
boundsnode.set_attribute_float("x", (i % major) * (stdwidth + 0.03f)); boundsnode.set_attribute_float("x", (i % majdim) * (stdwidth + 0.03f));
boundsnode.set_attribute_float("y", (i / major) * (stdheight + 0.03f)); boundsnode.set_attribute_float("y", (i / majdim) * (stdheight + 0.03f));
}); });
generate_view( generate_view(
util::string_format("%1$u\xC3\x97%2$u Left-to-Right, Top-to-Bottom (Gapless)", major, minor).c_str(), util::string_format("%1$u\xC3\x97%2$u Left-to-Right, Top-to-Bottom (Gapless)", majdim, mindim).c_str(),
[major, stdwidth, stdheight] (util::xml::data_node &boundsnode, unsigned i) [majdim, stdwidth, stdheight] (util::xml::data_node &boundsnode, unsigned i)
{ {
boundsnode.set_attribute_int("x", (i % major) * stdwidth); boundsnode.set_attribute_int("x", (i % majdim) * stdwidth);
boundsnode.set_attribute_int("y", (i / major) * stdheight); boundsnode.set_attribute_int("y", (i / majdim) * stdheight);
}); });
generate_view( generate_view(
util::string_format("%1$u\xC3\x97%2$u Top-to-Bottom, Left-to-Right", minor, major).c_str(), util::string_format("%1$u\xC3\x97%2$u Top-to-Bottom, Left-to-Right", mindim, majdim).c_str(),
[major, stdwidth, stdheight] (util::xml::data_node &boundsnode, unsigned i) [majdim, stdwidth, stdheight] (util::xml::data_node &boundsnode, unsigned i)
{ {
boundsnode.set_attribute_float("x", (i / major) * (stdwidth + 0.03f)); boundsnode.set_attribute_float("x", (i / majdim) * (stdwidth + 0.03f));
boundsnode.set_attribute_float("y", (i % major) * (stdheight + 0.03f)); boundsnode.set_attribute_float("y", (i % majdim) * (stdheight + 0.03f));
}); });
generate_view( generate_view(
util::string_format("%1$u\xC3\x97%2$u Top-to-Bottom, Left-to-Right (Gapless)", minor, major).c_str(), util::string_format("%1$u\xC3\x97%2$u Top-to-Bottom, Left-to-Right (Gapless)", mindim, majdim).c_str(),
[major, stdwidth, stdheight] (util::xml::data_node &boundsnode, unsigned i) [majdim, stdwidth, stdheight] (util::xml::data_node &boundsnode, unsigned i)
{ {
boundsnode.set_attribute_int("x", (i / major) * stdwidth); boundsnode.set_attribute_int("x", (i / majdim) * stdwidth);
boundsnode.set_attribute_int("y", (i % major) * stdheight); boundsnode.set_attribute_int("y", (i % majdim) * stdheight);
}); });
} }
} }