diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-18 10:41:07 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-19 09:31:07 -0700 |
commit | 3787d3a048b4c9c1d9664e62e7a26dca9c26da6b (patch) | |
tree | 0c7ea33e7e927ff8b785ae627e9920e18130efe5 /src/mbgl/renderer/sources | |
parent | 0d951f39b6ca815780605d973e744e5aab3b1129 (diff) | |
download | qtlocation-mapboxgl-3787d3a048b4c9c1d9664e62e7a26dca9c26da6b.tar.gz |
[core] Inline Painter::renderLine and RenderImageSource::render
Diffstat (limited to 'src/mbgl/renderer/sources')
-rw-r--r-- | src/mbgl/renderer/sources/render_image_source.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_image_source.hpp | 5 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index f654b83884..1cb3d9d1ba 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -182,16 +182,6 @@ void RenderImageSource::update(Immutable<style::Source::Impl> baseImpl_, bucket->segments.emplace_back(0, 0, 4, 6); } -void RenderImageSource::render(Painter& painter, - PaintParameters& parameters, - const RenderRasterLayer& layer) { - if (isEnabled() && isLoaded() && !bucket->needsUpload()) { - for (auto matrix : matrices) { - painter.renderRaster(parameters, *bucket, layer, matrix, true); - } - } -} - void RenderImageSource::dumpDebugLogs() const { Log::Info(Event::General, "RenderImageSource::id: %s", impl().id.c_str()); Log::Info(Event::General, "RenderImageSource::loaded: %s", isLoaded() ? "yes" : "no"); diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp index 6deffca046..14e4696f5a 100644 --- a/src/mbgl/renderer/sources/render_image_source.hpp +++ b/src/mbgl/renderer/sources/render_image_source.hpp @@ -6,8 +6,6 @@ namespace mbgl { -class RenderRasterLayer; -class PaintParameters; class RasterBucket; class RenderImageSource : public RenderSource { @@ -18,7 +16,6 @@ public: bool isLoaded() const final; void startRender(Painter&) final; - void render(Painter&, PaintParameters&, const RenderRasterLayer&); void finishRender(Painter&) final; void update(Immutable<style::Source::Impl>, @@ -44,6 +41,8 @@ public: void dumpDebugLogs() const final; private: + friend class RenderRasterLayer; + const style::ImageSource::Impl& impl() const; std::vector<UnwrappedTileID> tileIds; |