summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-04-03 11:18:57 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-04-03 13:51:33 -0700
commit41c4d50f8abd083c6b1cee224162ce7efa9003dc (patch)
treee6a20f69d29dfafabe9bcfd9f85e6b6f708e92c2
parentcca7f6978a7b4a911732c47c43a3069da108a2a6 (diff)
downloadqtlocation-mapboxgl-41c4d50f8abd083c6b1cee224162ce7efa9003dc.tar.gz
Remove unused
-rw-r--r--src/mbgl/map/source.cpp7
-rw-r--r--src/mbgl/map/source.hpp1
-rw-r--r--src/mbgl/renderer/painter.cpp9
-rw-r--r--src/mbgl/renderer/painter.hpp2
4 files changed, 4 insertions, 15 deletions
diff --git a/src/mbgl/map/source.cpp b/src/mbgl/map/source.cpp
index 0cf74147e4..dbe88e654d 100644
--- a/src/mbgl/map/source.cpp
+++ b/src/mbgl/map/source.cpp
@@ -107,13 +107,6 @@ void Source::render(Painter &painter, const StyleLayer &layer_desc) {
}
}
-void Source::render(Painter &painter, const StyleLayer &layer_desc, const Tile::ID &id, const mat4 &matrix) {
- auto it = tiles.find(id);
- if (it != tiles.end() && it->second->data && it->second->data->state == TileData::State::parsed) {
- painter.renderTileLayer(*it->second, layer_desc, matrix);
- }
-}
-
void Source::finishRender(Painter &painter) {
for (const auto& pair : tiles) {
Tile &tile = *pair.second;
diff --git a/src/mbgl/map/source.hpp b/src/mbgl/map/source.hpp
index 4a04769bcf..5c38636a24 100644
--- a/src/mbgl/map/source.hpp
+++ b/src/mbgl/map/source.hpp
@@ -43,7 +43,6 @@ public:
void drawClippingMasks(Painter &painter);
size_t getTileCount() const;
void render(Painter &painter, const StyleLayer &layer_desc);
- void render(Painter &painter, const StyleLayer &layer_desc, const Tile::ID &id, const mat4 &matrix);
void finishRender(Painter &painter);
std::forward_list<Tile::ID> getIDs() const;
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index fc6df45a97..f923cc8722 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -284,7 +284,7 @@ void Painter::render(const Style& style, const std::set<util::ptr<StyleSource>>&
}
}
-void Painter::renderLayer(const StyleLayer &layer_desc, const Tile::ID* id, const mat4* matrix) {
+void Painter::renderLayer(const StyleLayer &layer_desc) {
if (layer_desc.bucket->visibility == VisibilityType::None) return;
if (layer_desc.type == StyleLayerType::Background) {
// This layer defines a background color/image.
@@ -349,11 +349,8 @@ void Painter::renderLayer(const StyleLayer &layer_desc, const Tile::ID* id, cons
Log::Info(Event::Render, "%*s- %s (%s)", indent * 4, "", layer_desc.id.c_str(),
StyleLayerTypeClass(layer_desc.type).c_str());
}
- if (!id) {
- style_source.source->render(*this, layer_desc);
- } else {
- style_source.source->render(*this, layer_desc, *id, *matrix);
- }
+
+ style_source.source->render(*this, layer_desc);
}
}
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index 45133be899..315059073d 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -80,7 +80,7 @@ public:
TransformState state,
TimePoint time);
- void renderLayer(const StyleLayer &layer_desc, const Tile::ID* id = nullptr, const mat4* matrix = nullptr);
+ void renderLayer(const StyleLayer&);
// Renders a particular layer from a tile.
void renderTileLayer(const Tile& tile, const StyleLayer &layer_desc, const mat4 &matrix);