From 17db460345aeab21000cf7c18c9dea8d1543d835 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 8 Jun 2017 14:30:47 -0700
Subject: [core] Parallelism in {start,finish}Render parameters

---
 src/mbgl/renderer/render_tile.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/mbgl/renderer/render_tile.cpp')

diff --git a/src/mbgl/renderer/render_tile.cpp b/src/mbgl/renderer/render_tile.cpp
index ce59186e61..3f6b270a95 100644
--- a/src/mbgl/renderer/render_tile.cpp
+++ b/src/mbgl/renderer/render_tile.cpp
@@ -1,4 +1,5 @@
 #include <mbgl/renderer/render_tile.hpp>
+#include <mbgl/renderer/painter.hpp>
 #include <mbgl/map/transform_state.hpp>
 
 namespace mbgl {
@@ -44,15 +45,13 @@ mat4 RenderTile::translatedClipMatrix(const std::array<float, 2>& translation,
     return translateVtxMatrix(nearClippedMatrix, translation, anchor, state);
 }
 
-void RenderTile::calculateMatrices(const mat4& projMatrix,
-                                   const mat4& projClipMatrix,
-                                   const TransformState& transform) {
+void RenderTile::startRender(Painter& painter) {
     // Calculate two matrices for this tile: matrix is the standard tile matrix; nearClippedMatrix
     // clips the near plane to 100 to save depth buffer precision
-    transform.matrixFor(matrix, id);
-    transform.matrixFor(nearClippedMatrix, id);
-    matrix::multiply(matrix, projMatrix, matrix);
-    matrix::multiply(nearClippedMatrix, projClipMatrix, nearClippedMatrix);
+    painter.state.matrixFor(matrix, id);
+    painter.state.matrixFor(nearClippedMatrix, id);
+    matrix::multiply(matrix, painter.projMatrix, matrix);
+    matrix::multiply(nearClippedMatrix, painter.nearClippedProjMatrix, nearClippedMatrix);
 }
 
 } // namespace mbgl
-- 
cgit v1.2.1