[core] Eliminate Bucket::render

2 files changed, 5 insertions, 9 deletions

diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp
index 475b852412..f654b83884 100644
--- a/src/mbgl/renderer/sources/render_image_source.cpp
+++ b/src/mbgl/renderer/sources/render_image_source.cpp
@@ -184,10 +184,10 @@ void RenderImageSource::update(Immutable<style::Source::Impl> baseImpl_,
 
 void RenderImageSource::render(Painter& painter,
                                PaintParameters& parameters,
-                               const RenderLayer& layer) {
+                               const RenderRasterLayer& layer) {
     if (isEnabled() && isLoaded() && !bucket->needsUpload()) {
         for (auto matrix : matrices) {
-            bucket->render(painter, parameters, layer, matrix);
+            painter.renderRaster(parameters, *bucket, layer, matrix, true);
         }
     }
 }
diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp
index 6389251709..6deffca046 100644
--- a/src/mbgl/renderer/sources/render_image_source.hpp
+++ b/src/mbgl/renderer/sources/render_image_source.hpp
@@ -5,14 +5,10 @@
 #include <mbgl/style/sources/image_source_impl.hpp>
 
 namespace mbgl {
-class RenderLayer;
+
+class RenderRasterLayer;
 class PaintParameters;
 class RasterBucket;
-class LatLng;
-
-namespace gl {
-class Context;
-} // namespace gl
 
 class RenderImageSource : public RenderSource {
 public:
@@ -22,7 +18,7 @@ public:
     bool isLoaded() const final;
 
     void startRender(Painter&) final;
-    void render(Painter&, PaintParameters&, const RenderLayer&);
+    void render(Painter&, PaintParameters&, const RenderRasterLayer&);
     void finishRender(Painter&) final;
 
     void update(Immutable<style::Source::Impl>,