Revert "coalesce texture uploads at the beginning of a frame"

This reverts commit 8c2c7f769f.

See #454

Conflicts:
	src/geometry/glyph_atlas.cpp
	src/geometry/sprite_atlas.cpp
This commit is contained in:
John Firebaugh
2014-09-02 15:18:52 -07:00
parent bb9a466adb
commit c1280f0b38
5 changed files with 16 additions and 56 deletions

View File

@@ -545,10 +545,6 @@ void Map::render() {
#if defined(DEBUG)
std::vector<std::string> debug;
#endif
glyphAtlas->upload();
spriteAtlas->upload();
painter.clear();
painter.resize();