From e27f33062994a1b0155b44b9d471e48e93b09f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 7 Mar 2019 17:50:02 +0100
Subject: [core] add texture bindings to draw call instead of Context member fn

---
 src/mbgl/renderer/layers/render_background_layer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mbgl/renderer/layers/render_background_layer.cpp')

diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp
index 61c8fa208e..ae89a08cac 100644
--- a/src/mbgl/renderer/layers/render_background_layer.cpp
+++ b/src/mbgl/renderer/layers/render_background_layer.cpp
@@ -50,7 +50,7 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) {
     const Properties<>::PossiblyEvaluated properties;
     const BackgroundProgram::Binders paintAttributeData(properties, 0);
 
-    auto draw = [&](auto& program, auto&& uniformValues, auto&& textureBindings) {
+    auto draw = [&](auto& program, auto&& uniformValues, const auto& textureBindings) {
         const auto allUniformValues = program.computeAllUniformValues(
             std::move(uniformValues),
             paintAttributeData,
@@ -76,7 +76,7 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) {
             parameters.staticData.tileTriangleSegments,
             allUniformValues,
             allAttributeBindings,
-            std::move(textureBindings),
+            textureBindings,
             getID()
         );
     };
@@ -88,8 +88,6 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) {
         if (!imagePosA || !imagePosB)
             return;
 
-        parameters.imageManager.bind(parameters.context, 0);
-
         for (const auto& tileID : util::tileCover(parameters.state, parameters.state.getIntegerZoom())) {
             draw(
                 parameters.programs.getBackgroundLayerPrograms().backgroundPattern,
@@ -103,7 +101,9 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) {
                     tileID,
                     parameters.state
                 ),
-                BackgroundPatternProgram::TextureBindings{}
+                BackgroundPatternProgram::TextureBindings{
+                    textures::u_image::Value{ parameters.imageManager.textureBinding(parameters.context) },
+                }
             );
         }
     } else {
-- 
cgit v1.2.1