summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/layers
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/renderer/layers')
-rw-r--r--src/mbgl/renderer/layers/render_background_layer.cpp11
-rw-r--r--src/mbgl/renderer/layers/render_fill_layer.cpp56
-rw-r--r--src/mbgl/renderer/layers/render_line_layer.cpp39
3 files changed, 49 insertions, 57 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp
index 96a4c44f08..fc916e1d1b 100644
--- a/src/mbgl/renderer/layers/render_background_layer.cpp
+++ b/src/mbgl/renderer/layers/render_background_layer.cpp
@@ -68,12 +68,11 @@ void RenderBackgroundLayer::render(PaintParameters& parameters) {
const BackgroundProgram::Binders paintAttributeData(properties, 0);
auto draw = [&](auto& program, auto&& uniformValues, const auto& textureBindings, const uint32_t id) {
- const auto allUniformValues = program.computeAllUniformValues(
- std::move(uniformValues),
- paintAttributeData,
- properties,
- parameters.state.getZoom()
- );
+ const auto allUniformValues =
+ program.computeAllUniformValues(std::forward<decltype(uniformValues)>(uniformValues),
+ paintAttributeData,
+ properties,
+ parameters.state.getZoom());
const auto allAttributeBindings = program.computeAllAttributeBindings(
*parameters.staticData.tileVertexBuffer,
paintAttributeData,
diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp
index 31b847b6a7..2fb982143e 100644
--- a/src/mbgl/renderer/layers/render_fill_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_layer.cpp
@@ -113,21 +113,19 @@ void RenderFillLayer::render(PaintParameters& parameters) {
checkRenderability(parameters, programInstance.activeBindingCount(allAttributeBindings));
- programInstance.draw(
- parameters.context,
- *parameters.renderPass,
- drawMode,
- depthMode,
- parameters.stencilModeForClipping(tile.id),
- parameters.colorModeForRenderPass(),
- gfx::CullFaceMode::disabled(),
- indexBuffer,
- segments,
- allUniformValues,
- allAttributeBindings,
- std::move(textureBindings),
- getID()
- );
+ programInstance.draw(parameters.context,
+ *parameters.renderPass,
+ drawMode,
+ depthMode,
+ parameters.stencilModeForClipping(tile.id),
+ parameters.colorModeForRenderPass(),
+ gfx::CullFaceMode::disabled(),
+ indexBuffer,
+ segments,
+ allUniformValues,
+ allAttributeBindings,
+ std::forward<decltype(textureBindings)>(textureBindings),
+ getID());
};
auto fillRenderPass = (evaluated.get<FillColor>().constantOr(Color()).a >= 1.0f
@@ -208,21 +206,19 @@ void RenderFillLayer::render(PaintParameters& parameters) {
checkRenderability(parameters, programInstance.activeBindingCount(allAttributeBindings));
- programInstance.draw(
- parameters.context,
- *parameters.renderPass,
- drawMode,
- depthMode,
- parameters.stencilModeForClipping(tile.id),
- parameters.colorModeForRenderPass(),
- gfx::CullFaceMode::disabled(),
- indexBuffer,
- segments,
- allUniformValues,
- allAttributeBindings,
- std::move(textureBindings),
- getID()
- );
+ programInstance.draw(parameters.context,
+ *parameters.renderPass,
+ drawMode,
+ depthMode,
+ parameters.stencilModeForClipping(tile.id),
+ parameters.colorModeForRenderPass(),
+ gfx::CullFaceMode::disabled(),
+ indexBuffer,
+ segments,
+ allUniformValues,
+ allAttributeBindings,
+ std::forward<decltype(textureBindings)>(textureBindings),
+ getID());
};
if (bucket.triangleIndexBuffer) {
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()) {
View Lorry Controller Status