Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
> This is an impressive improvement! Out of curiosity, how large does the > texture atlas end up being? All images fit into 16kx16k, but since most GPUs seem to support 8k we have 2 textures. This could be improved by doing what we started once before, but never finished: compactifying the animations by finding common rectangles. This could be done when the atlas is constructed and would reduce memory foodprint a lot. [Element Array] I did experiment with an element array for a bit and it seems to buy some CPU too, but I had trouble keeping this indirection in my head during coding, so I cut it eventually. I agree that it would be better design. [Buffer magic] That sounds interesting, but would require some redesign in the current draw approach. I am very weary working on OpenGL related stuff, so I'll call it good enough for now. If you are interested in experimenting further, that would of course be greatly appreciated! -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/use_image_cache into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
Review: Approve Compiles and runs fine on windows. I would really like to see this land in trunk as soon as possible. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands has been updated. Commit Message changed to: Check return value of RemoveDirectory() and throw error if delete fails For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands has been updated. Commit Message changed to: - Check return value of RemoveDirectory() and throw error if delete fails - Use CreateDirectory() on windows instead of mkdir For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
Review: Approve Yes, great enhancement. No flickering anymore (which came up with the new font renderer): - Fixes bug 1509791 - may this could help also fixing the bug related to some wrong colored shadows? See bug 1519361 A suggestion, if possible. After the image atlas is created a black "Loading images" screen appears. It would be nice if the splash screen (the one where one has to click) could be used as the background for "Loading images". And yes, of course, a progress bar when creating the texture atlas ... :-D -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/split_overlay_manager into lp:widelands
Review: Resubmit This is now ready for inclusion - I worked trunk into this branch again and I still think it is a good improvement and makes the code slightly better. This is the last non-bug fixing branch I want to get in before b19. -- https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/282112 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/split_overlay_manager. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/full_texture_atlas into lp:widelands
SirVer, i didn't know that you put so much time into this. And zooming would be a very nice thing to have, even if it comes in build 20 :-) As i understand, merging just this branch is only the preparation for implementing the whole stuff and wouldn't change anything for now. So i am fine with merging. Is there a decision which implementation (first or second) would be used? If we have a "first load for optimizing widelands" screen, would it be possible to have a slideshow/diashow in there? So we could may use some of the images from https://wl.widelands.org/wiki/Artwork/ with a small textbox containing some descriptions. -- https://code.launchpad.net/~widelands-dev/widelands/full_texture_atlas/+merge/281909 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/full_texture_atlas into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/split_overlay_manager into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/split_overlay_manager
into lp:widelands.
Commit message:
- Split OverlayManager into FieldOverlayManager and EdgeOverlayManager.
- They are both now owned by InteractiveBase instead of Map.
- Removed caching of field-nodes calculation. This is so quick, there is no
benefit in caching.
- Refactorings and API modernization of the OverlayManager.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #536606 in widelands: "Split overlay manager"
https://bugs.launchpad.net/widelands/+bug/536606
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/282112
I needed something to test my new keyboard on - so I used the weekend to
scratch an itch that I was been having for a long time now, namely the horrible
OverlayManager.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/split_overlay_manager into lp:widelands.
=== modified file 'src/editor/CMakeLists.txt'
--- src/editor/CMakeLists.txt 2015-11-01 10:11:56 +
+++ src/editor/CMakeLists.txt 2016-01-10 11:38:25 +
@@ -105,5 +105,5 @@
wui
wui_common
wui_mapview_pixelfunctions
-wui_overlay_manager
+wui_field_overlay_manager
)
=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc 2016-01-08 21:00:39 +
+++ src/editor/editorinteractive.cc 2016-01-10 11:38:25 +
@@ -48,9 +48,9 @@
#include "ui_basic/messagebox.h"
#include "ui_basic/progresswindow.h"
#include "wlapplication.h"
+#include "wui/field_overlay_manager.h"
#include "wui/game_tips.h"
#include "wui/interactive_base.h"
-#include "wui/overlay_manager.h"
namespace {
@@ -148,21 +148,20 @@
if (Widelands::Coords const sp = map.get_starting_pos(p)) {
const Image* pic = g_gr->images().get(fname);
assert(pic);
- map.overlay_manager().register_overlay
+ mutable_field_overlay_manager()->register_overlay
(sp, pic, 8, Point(pic->width() / 2, STARTING_POS_HOTSPOT_Y));
}
}
// Resources: we do not calculate default resources, therefore we do not
// expect to meet them here.
- OverlayManager& overlay_manager = map.overlay_manager();
Widelands::Extent const extent = map.extent();
iterate_Map_FCoords(map, extent, fc) {
if (uint8_t const amount = fc.field->get_resources_amount()) {
const std::string& immname =
egbase().world().get_resource(fc.field->get_resources())->get_editor_pic(amount);
if (immname.size())
-overlay_manager.register_overlay(fc, g_gr->images().get(immname), 4);
+mutable_field_overlay_manager()->register_overlay(fc, g_gr->images().get(immname), 4);
}
}
}
@@ -220,7 +219,7 @@
} catch (LuaScriptNotExistingError &) {
// do nothing.
}
- egbase().map().overlay_manager().show_buildhelp(true);
+ show_buildhelp(true);
}
@@ -297,11 +296,6 @@
map_clicked(true);
}
-void EditorInteractive::toggle_buildhelp() {
- egbase().map().overlay_manager().toggle_buildhelp();
-}
-
-
void EditorInteractive::tool_menu_btn() {
if (m_toolmenu.window)
delete m_toolmenu.window;
@@ -507,7 +501,7 @@
Widelands::Map & map = egbase().map();
// A new tool has been selected. Remove all registered overlay callback
// functions.
- map.overlay_manager().remove_overlay_callback_function();
+ mutable_field_overlay_manager()->register_overlay_callback_function(nullptr);
map.recalc_whole_map(egbase().world());
}
tools.current_pointer =
=== modified file 'src/editor/editorinteractive.h'
--- src/editor/editorinteractive.h 2015-11-08 17:31:06 +
+++ src/editor/editorinteractive.h 2016-01-10 11:38:25 +
@@ -122,7 +122,6 @@
void set_need_save(bool const t) {m_need_save = t;}
private:
- void toggle_buildhelp();
void tool_menu_btn();
void toolsize_menu_btn();
void toggle_mainmenu();
=== modified file 'src/editor/tools/editor_decrease_resources_tool.cc'
--- src/editor/tools/editor_decrease_resources_tool.cc 2016-01-08 21:00:39 +
+++ src/editor/tools/editor_decrease_resources_tool.cc 2016-01-10 11:38:25 +
@@ -28,19 +28,17 @@
#include "logic/map_objects/world/world.h"
#include "logic/mapregion.h"
#include "logic/widelands_geometry.h"
-#include "wui/overlay_manager.h"
/**
* Decrease the resources of the current field by one if
* there is not already another resource there.
*/
-int32_t
-EditorDecreaseResourcesTool::handle_click_impl(const Widelands::World& world,
- Widelands::NodeAndTriangle<> const center,
- EditorInteractive& /* parent */,
- EditorActionArgs* args,
- Widelands::Map* map) {
+int32_t EditorDecreaseResourcesTool::handle_click_impl(const Widelands::World& world,
+ Widelands::NodeAndTriangle<> const center,
+
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/fix_windows_delete_dir
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114
Testing the use_texture_cache branch revealed that deleting directories on
windows does not always succeeds:
If the cache dir was deleted due to recalculating it was removed but not
recreated.
Checking the return value seems to solve the problem.
Includes a small codecheck and python 3 fix.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands.
=== modified file 'src/io/filesystem/disk_filesystem.cc'
--- src/io/filesystem/disk_filesystem.cc 2015-01-22 18:14:06 +
+++ src/io/filesystem/disk_filesystem.cc 2016-01-10 12:27:11 +
@@ -278,7 +278,10 @@
#ifndef _WIN32
rmdir(fspath.c_str());
#else
- RemoveDirectory(fspath.c_str());
+ if (!RemoveDirectory(fspath.c_str())) {
+ throw wexception
+("%s could not be deleted.",
+fspath.c_str());
#endif
}
=== modified file 'src/logic/map_objects/map_object.h'
--- src/logic/map_objects/map_object.h 2016-01-09 17:18:20 +
+++ src/logic/map_objects/map_object.h 2016-01-10 12:27:11 +
@@ -250,8 +250,8 @@
/**
* Is called right before the object will be removed from
* the game. No conncetion is handled in this class.
- *
- * param serial : the object serial (cannot use param comment as this is a callback)
+ *
+ * param serial : the object serial (cannot use param comment as this is a callback)
*/
boost::signals2::signal removed;
=== modified file 'utils/build_deps.py'
--- utils/build_deps.py 2014-11-03 06:55:18 +
+++ utils/build_deps.py 2016-01-10 12:27:11 +
@@ -52,7 +52,7 @@
message = '%s%s%s%s' % (
ANSI_COLORS["yellow"], ANSI_COLORS["bold"],
message, ANSI_COLORS["reset"])
-print "%s:%s: %s" % (filename, line_index, message)
+print("%s:%s: %s" % (filename, line_index, message))
__INCLUDE = re.compile(r'#include "([^"]+)"')
def extract_includes(srcdir, source):
@@ -201,7 +201,7 @@
for lib in targets.values():
for src in lib.srcs:
if src in owners_of_src:
-print "%s:1 is owned by more than one target." % src
+print("%s:1 is owned by more than one target." % src)
owners_of_src[src] = lib
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands
Also, please set a commit message. -- https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
Thanks for adding the file :-) I just compile and want to test. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/use_image_cache into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands
Review: Resubmit Ok, one more change. I'll wait for the travis bot to make sure i did not break anything on *nix and will merge then. -- https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/full_texture_atlas into lp:widelands
> As i understand, merging just this branch is only the preparation for > implementing the whole stuff and wouldn't change anything for now. So i am > fine with merging. The full implementation is https://code.launchpad.net/~widelands-dev/widelands/use_image_cache. It implements solution 1. For now it only shows a static text and it freezes Widelands while loading, adding a slideshow or progress report is feasible, but more work. I have a lot of testing feedback for this, but no code review comments. Could I get a lgtm for the code before merging? -- https://code.launchpad.net/~widelands-dev/widelands/full_texture_atlas/+merge/281909 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/full_texture_atlas into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/new-binary/+merge/282116 The PPA broke a couple of days back when a new binary was added. Since this wasn't covered among the files used in the packages produced, the packager became confused as to what to do with it. See either of the recent build logs on https://code.launchpad.net/~widelands-dev/+recipe/widelands-daily for examples. I've now added this to the list of files to be installed with the 'widelands' package, along with wl_map_info and wl_render_richtext which we did when they appeared. I don't know whether this is what we want or whether we should simply remove the files because they don't make much sense outside of debug contexts. Tested with this change in https://code.launchpad.net/~hjd/+recipe/widelands-test, see the most recent build log for evidence it works. Should make the PPAs produce builds again. If someone reviews this, feel free to merge it into the debian-branch as well. I can do it myself, but it might take some time before I can get round to it. While talking about build failures, I've seen odd failures on Ubuntu with recent clang-versions (3.6 and 3.7). Have any clang-people seen similar things on other platforms. Sorry I don't have logs available at the moment, but I just wanted to check whether someone are able to successfully build Widelands with those versions. If that is the case I may have to investigate the clang packages in Ubuntu/Debian. -- Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian. === modified file 'debian/widelands.install' --- debian/widelands.install 2014-10-22 19:12:03 + +++ debian/widelands.install 2016-01-10 13:49:01 + @@ -1,4 +1,5 @@ usr/widelands usr/games +usr/wl_make_texture_atlas usr/games usr/wl_map_info usr/games usr/wl_render_richtext usr/games usr/share/applications ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian
The binary is gone again in https://code.launchpad.net/~widelands-dev/widelands/use_image_cache. It is hardly worth adding it in right now. wl_map_info is used on the server, it relies on it being in the PPA. It might also be useful for others, dunno. The other is purely debug, but does it hurt to install it? hjd, can these debian files not be in trunk? It seems more likely that they do not break if they are in trunk than being added on in the debian branch? We also have maintenance files for windows and mac in trunk, so I see no issue having debian there too. -- https://code.launchpad.net/~hjd/widelands/new-binary/+merge/282116 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
Review: Needs Fixing Currently the images in campaigns are not cached. Starting any campaign mission fails. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
Review: Resubmit Images in campaigns are fixed now. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_windows_delete_dir into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
Travis build 236 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/101412030. -- https://code.launchpad.net/~widelands-dev/widelands/fix_windows_delete_dir/+merge/282114 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_windows_delete_dir. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
Travis build 235 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/101396647. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~hjd/widelands/new-binary mirrored to https://github.com/widelands/widelands/tree/_hjd_widelands_new_binary You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~hjd/widelands/new-binary/+merge/282116 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8828399] i386 build of widelands 1:18-ppa0-bzr7698-201601101817~ubuntu16.04.1 in ubuntu xenial RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7698-201601101817~ubuntu16.04.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 18 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828399/+files/buildlog_ubuntu-xenial-i386.widelands_1%3A18-ppa0-bzr7698-201601101817~ubuntu16.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-16 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7698-201601101817~ubuntu16.04.1 in ubuntu xenial RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828399 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8828398] amd64 build of widelands 1:18-ppa0-bzr7698-201601101817~ubuntu16.04.1 in ubuntu xenial RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7698-201601101817~ubuntu16.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 20 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828398/+files/buildlog_ubuntu-xenial-amd64.widelands_1%3A18-ppa0-bzr7698-201601101817~ubuntu16.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-14 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7698-201601101817~ubuntu16.04.1 in ubuntu xenial RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828398 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis_clang into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/travis_clang into lp:widelands. Commit message: - Move travis build script into a bash file. Just simpler to read and modify than YML. - Adds travis config for building with clang 3.4, 3.5, 3.6 and 3.7 in Debug and Release. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/travis_clang/+merge/282123 Travis configuration to also build on Clang, not only gcc. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis_clang into lp:widelands. === added file '.travis.sh' --- .travis.sh 1970-01-01 00:00:00 + +++ .travis.sh 2016-01-10 19:03:21 + @@ -0,0 +1,49 @@ +set -ex + +# NOCOM(#sirver): remove +echo "CXX: $CXX" +echo "CLANG_VERSION: $CLANG_VERSION" +echo "GCC_VERSION: $GCC_VERSION" + +# Some of these commands fail transiently. We keep retrying them until they +# succeed. +if [ "$CXX" = "g++" ]; then + until sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; do sleep 10; done +fi +if [ "$CXX" = "clang++" ]; then + until sudo add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-$CLANG_VERSION main"; do sleep 10; done; + wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - +fi +until sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y; do sleep 10; done +until sudo apt-get update -qq; do sleep 10; done + +if [ "$CXX" = "g++" ]; then + sudo apt-get install -qq g++-$GCC_VERSION; + export CXX="g++-$GCC_VERSION" CC="gcc-$GCC_VERSION"; +fi +if [ "$CXX" = "clang++" ]; then + sudo apt-get install -qq clang-$CLANG_VERSION; + export CXX="clang++-$CLANG_VERSION" CC="clang-$CLANG_VERSION"; +fi + +until sudo apt-get install -qq \ + cmake \ + libboost-all-dev \ + libglew-dev \ + libicu-dev \ + libpng-dev \ + libxml2-dev \ + libyajl-dev \ + zlib1g-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libsdl2-mixer-dev \ + libsdl2-net-dev \ + libsdl2-ttf-dev \ +; do sleep 10; done + +# Start the actual build. +mkdir build +cd build +cmake .. -DCMAKE_BUILD_TYPE:STRING="$BUILD_TYPE" +make -j1 === modified file '.travis.yml' --- .travis.yml 2015-12-28 16:06:10 + +++ .travis.yml 2016-01-10 19:03:21 + @@ -1,47 +1,39 @@ language: cpp +script: bash -e .travis.sh sudo: required dist: trusty -# TODO(sirver): figure out how to install a modern clang matrix: include: - - compiler: gcc -env: GCC_VERSION="4.7" BUILD_TYPE="Debug" - - compiler: gcc -env: GCC_VERSION="4.8" BUILD_TYPE="Debug" - - compiler: gcc -env: GCC_VERSION="4.9" BUILD_TYPE="Debug" - - compiler: gcc -env: GCC_VERSION="5" BUILD_TYPE="Debug" - - compiler: gcc -env: GCC_VERSION="4.7" BUILD_TYPE="Release" - - compiler: gcc -env: GCC_VERSION="4.8" BUILD_TYPE="Release" - - compiler: gcc -env: GCC_VERSION="4.9" BUILD_TYPE="Release" - - compiler: gcc -env: GCC_VERSION="5" BUILD_TYPE="Release" - -install: - # Some of these commands fail transiently. We keep retrying them until they succeed. - - until sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y; do sleep 10; done - - until sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; do sleep 10; done - - until sudo apt-get update -qq; do sleep 10; done - - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-$GCC_VERSION; fi - - until sudo apt-get install -qq cmake libboost-all-dev libglew-dev libicu-dev libpng-dev libxml2-dev libyajl-dev zlib1g-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev ; do sleep 10; done - - if [ "$CXX" = "g++" ]; then export CXX="g++-$GCC_VERSION" CC="gcc-$GCC_VERSION"; fi - -script: - - mkdir build - - cd build - - cmake .. -DCMAKE_BUILD_TYPE:STRING="$BUILD_TYPE" - - make -j1 - -# TODO(sirver): This will be useful in the future. -# notifications: -# email: -# recipients: -# - o...@example.com -# - ot...@example.com -# on_success: [always|never|change] # default: change -# on_failure: [always|never|change] # default: always + - compiler: clang + env: CLANG_VERSION="3.4" BUILD_TYPE="Debug" + - compiler: clang + env: CLANG_VERSION="3.5" BUILD_TYPE="Debug" + - compiler: clang + env: CLANG_VERSION="3.6" BUILD_TYPE="Debug" + - compiler: clang + env: CLANG_VERSION="3.7" BUILD_TYPE="Debug" + - compiler: clang + env: CLANG_VERSION="3.4" BUILD_TYPE="Release" + - compiler: clang + env: CLANG_VERSION="3.5" BUILD_TYPE="Release" + - compiler: clang + env: CLANG_VERSION="3.6" BUILD_TYPE="Release" + - compiler: clang + env: CLANG_VERSION="3.7" BUILD_TYPE="Release" + - compiler: gcc + env: GCC_VERSION="4.7" BUILD_TYPE="Debug" + - compiler: gcc + env: GCC_VERSION="4.8" BUILD_TYPE="Debug" + - compiler: gcc + env: GCC_VERSION="4.9" BUILD_TYPE="Debug" + - compiler: gcc + env: GCC_VERSION="5"
[Widelands-dev] Bunnybot says...
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/travis_clang mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_travis_clang You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~widelands-dev/widelands/travis_clang/+merge/282123 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis_clang into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] Bunnybot says...
Travis build 238 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/101429603. -- https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/282112 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/split_overlay_manager. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8828403] i386 build of widelands 1:18-ppa0-bzr7698-201601101816~ubuntu15.10.1 in ubuntu wily RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7698-201601101816~ubuntu15.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 21 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828403/+files/buildlog_ubuntu-wily-i386.widelands_1%3A18-ppa0-bzr7698-201601101816~ubuntu15.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-58 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr7698-201601101816~ubuntu15.10.1 in ubuntu wily RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828403 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
Review: Needs Fixing I wanted to test this branch on my laptop right now, and I have to say it's a bit of a nightmare, all of which can be roughly summarized as "this is probably not a good idea when VRAM is small". Let me list a number of problems in no particular order: 1) Our driver correctly announces support for textures up to 16384 in size, but when you actually allocate such a texture, it is 1GB large, which is going to fail when VRAM is not that big. So that possibility is something that the code should account for. 2) It seems there are plenty of fun bugs in our driver when textures become gigantic, so on the plus side, this is a great test case for making our driver more robust... 3) When I force max_size to 4096, I no longer hit critical driver bugs (only ones leading to rendering errors, oh well). There is still a problem though because the atlas textures add up to something like 110 million texels, which means that the textures are going to take more than 400MB (okay, maybe slightly under since there are also mask textures), which means that on integrated GPUs, you get texture thrashing. (Mine has a 512MB VRAM reservation, and whether it starts thrashing or not seems to depend on what compiz is currently doing - if I only had a single monitor running Widelands fullscreen it would probably okay, but as is performance is occasionally killed completely.) Even without texture atlases, an integrated GPU is going to swap textures occasionally, but it's going to happen much less because the working set is smaller. With texture atlases, your working set is going to be everything almost all of the time. This sucks. Summary: (1) Trying to reduce the atlas size is more important than you thought. (2) Probably the best quick fix option you have is to check VRAM size (e.g. using GLX_MESA_query_renderer) and add some heuristic to disable texture atlases below a certain VRAM size. It should be possible to override the heuristic via the command line. It's kind of sad that you then have a performance optimization that doesn't help the hardware that needs it most... (3) A longer term fix could be some kind of texture streaming. I actually don't know the best way to do this. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/split_overlay_manager into lp:widelands
I compiled and tested it briefly - no issues... -- https://code.launchpad.net/~widelands-dev/widelands/split_overlay_manager/+merge/282112 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/split_overlay_manager. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
Nicolai, could you outline what VRAM means in this case? I did not understand a lot of your last post, it is full of things that I have no understanding of. So far the only feedback I got is that this change improves the performance - I tested it on old macs too which has only integrated graphics. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8828384] amd64 build of widelands 1:18-ppa0-bzr7698-201601101816~ubuntu14.04.1 in ubuntu trusty RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7698-201601101816~ubuntu14.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 15 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828384/+files/buildlog_ubuntu-trusty-amd64.widelands_1%3A18-ppa0-bzr7698-201601101816~ubuntu14.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-01 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7698-201601101816~ubuntu14.04.1 in ubuntu trusty RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828384 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8828402] amd64 build of widelands 1:18-ppa0-bzr7698-201601101816~ubuntu15.10.1 in ubuntu wily RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7698-201601101816~ubuntu15.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 19 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828402/+files/buildlog_ubuntu-wily-amd64.widelands_1%3A18-ppa0-bzr7698-201601101816~ubuntu15.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-29 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7698-201601101816~ubuntu15.10.1 in ubuntu wily RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828402 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #8828400] amd64 build of widelands 1:18-ppa0-bzr7698-201601101816~ubuntu15.04.1 in ubuntu vivid RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:18-ppa0-bzr7698-201601101816~ubuntu15.04.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 20 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828400/+files/buildlog_ubuntu-vivid-amd64.widelands_1%3A18-ppa0-bzr7698-201601101816~ubuntu15.04.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-31 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:18-ppa0-bzr7698-201601101816~ubuntu15.04.1 in ubuntu vivid RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/8828400 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
If there is such problem it must be discussed thoroughly. I just tested it on my linux box, with integrated intel HD 4000 and 8 GB RAM (this probably matters much) and no visible problems and it seems to be running nicely. I googled a bit how to find out VRAM or whatever it is and found two commands (for linux): $ dmesg | grep Memory .. [6.992863] [drm] Memory usable by graphics device = 2048M $ LC_ALL=C lspci -v | grep -EA10 "3D|VGA" | grep 'prefetchable' Memory at f780 (64-bit, non-prefetchable) [size=4M] Memory at e000 (64-bit, prefetchable) [size=256M] It seems the first one shows maximum (2GB) and second one actual usage (256MB) - but I am not sure of interpretation... But as I said - it runs OK here. Perhaps if more peoples tested it... -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/use_image_cache into lp:widelands
VRAM is Video RAM, which in the case of integrated graphics is a part of the physical RAM which is reserved for the GPU. Run `free` to get an idea of how large it is approximately: the total memory shown will be less than the physical amount of RAM, reflecting how much is available to the CPU. In addition, there's the GTT or GART, which is a virtual memory aperture through which the GPU can access system RAM. If not all data fits into VRAM, the GPU can still render from the GTT, but it tends to be slower. The 2048M shown in the dmesg log are probably VRAM + GTT. It's possible that since Widelands doesn't use that much bandwidth, rendering from GTT (typically 1-2GB) would be fine. Please do provide an option to disable the texture atlas, and I'll see what can be done about our driver. -- https://code.launchpad.net/~widelands-dev/widelands/use_image_cache/+merge/282106 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/full_texture_atlas. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
