diff options
Diffstat (limited to 'src/mbgl/renderer/layers/render_line_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_line_layer.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index 90bb38b9f9..af5c288704 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -114,12 +114,11 @@ void RenderLineLayer::render(PaintParameters& parameters) { paintPropertyBinders.setPatternParameters(patternPositionA, patternPositionB, crossfade); - const auto allUniformValues = programInstance.computeAllUniformValues( - std::move(uniformValues), - paintPropertyBinders, - evaluated, - parameters.state.getZoom() - ); + const auto allUniformValues = + programInstance.computeAllUniformValues(std::forward<decltype(uniformValues)>(uniformValues), + paintPropertyBinders, + evaluated, + parameters.state.getZoom()); const auto allAttributeBindings = programInstance.computeAllAttributeBindings( *bucket.vertexBuffer, paintPropertyBinders, @@ -128,21 +127,19 @@ void RenderLineLayer::render(PaintParameters& parameters) { checkRenderability(parameters, programInstance.activeBindingCount(allAttributeBindings)); - programInstance.draw( - parameters.context, - *parameters.renderPass, - gfx::Triangles(), - parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), - parameters.stencilModeForClipping(tile.id), - parameters.colorModeForRenderPass(), - gfx::CullFaceMode::disabled(), - *bucket.indexBuffer, - bucket.segments, - allUniformValues, - allAttributeBindings, - std::move(textureBindings), - getID() - ); + programInstance.draw(parameters.context, + *parameters.renderPass, + gfx::Triangles(), + parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), + parameters.stencilModeForClipping(tile.id), + parameters.colorModeForRenderPass(), + gfx::CullFaceMode::disabled(), + *bucket.indexBuffer, + bucket.segments, + allUniformValues, + allAttributeBindings, + std::forward<decltype(textureBindings)>(textureBindings), + getID()); }; if (!evaluated.get<LineDasharray>().from.empty()) { |