tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Fix bugprone-move-forwarding-reference errors

Browse Source 
As reported by clang-tidy-8.
This commit is contained in:
Thiago Marcos P. Santos
2020-03-27 18:30:35 +02:00
parent b4e9c0bd11
commit 5bb7ebd7de
4 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mbgl/annotation/shape_annotation_impl.cpp
View File

@@ -23,9 +23,8 @@ void ShapeAnnotationImpl::updateTileData(const CanonicalTileID& tileID, Annotati
if (!shapeTiler) {
mapbox::feature::feature_collection<double> features;
features.emplace_back(ShapeAnnotationGeometry::visit(geometry(), [] (auto&& geom) {
return Feature { std::move(geom) };
}));
features.emplace_back(ShapeAnnotationGeometry::visit(
geometry(), [](auto&& geom) { return Feature{std::forward<decltype(geom)>(geom)}; }));
mapbox::geojsonvt::Options options;
// The annotation source is currently hard coded to maxzoom 16, so we're topping out at z16
// here as well.

11
src/mbgl/renderer/layers/render_background_layer.cpp
View File

@@ -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,

56
src/mbgl/renderer/layers/render_fill_layer.cpp
View File

@@ -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) {

39
src/mbgl/renderer/layers/render_line_layer.cpp
View File

@@ -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()) {