diff options
Diffstat (limited to 'src/mbgl/programs')
| -rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 29 | ||||
| -rw-r--r-- | src/mbgl/programs/programs.cpp | 3 |
2 files changed, 15 insertions, 17 deletions
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index 3b5142633d..9ba9679566 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -172,21 +172,20 @@ public: drawScopeIt = segment.drawScopes.emplace(layerID, context.createDrawScope()).first; } - program->draw( - context, - renderPass, - std::move(drawMode), - std::move(depthMode), - std::move(stencilMode), - std::move(colorMode), - std::move(cullFaceMode), - uniformValues, - drawScopeIt->second, - allAttributeBindings.offset(segment.vertexOffset), - textureBindings, - indexBuffer, - segment.indexOffset, - segment.indexLength); + program->draw(context, + renderPass, + drawMode, + depthMode, + stencilMode, + colorMode, + cullFaceMode, + uniformValues, + drawScopeIt->second, + allAttributeBindings.offset(segment.vertexOffset), + textureBindings, + indexBuffer, + segment.indexOffset, + segment.indexLength); } } }; diff --git a/src/mbgl/programs/programs.cpp b/src/mbgl/programs/programs.cpp index f82e46c9a2..ce5bbd7eec 100644 --- a/src/mbgl/programs/programs.cpp +++ b/src/mbgl/programs/programs.cpp @@ -16,8 +16,7 @@ Programs::Programs(gfx::Context& context_, const ProgramParameters& programParam : debug(context_, programParameters_), clippingMask(context_, programParameters_), context(context_), - programParameters(std::move(programParameters_)) { -} + programParameters(programParameters_) {} Programs::~Programs() = default; |