diff options
| -rw-r--r-- | src/mbgl/gl/program.hpp | 8 | ||||
| -rw-r--r-- | src/mbgl/programs/program.hpp | 20 | ||||
| -rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 20 |
3 files changed, 24 insertions, 24 deletions
diff --git a/src/mbgl/gl/program.hpp b/src/mbgl/gl/program.hpp index 6a4693b033..623a7149c5 100644 --- a/src/mbgl/gl/program.hpp +++ b/src/mbgl/gl/program.hpp @@ -119,10 +119,10 @@ public: template <class DrawMode> void draw(gfx::Context& genericContext, DrawMode drawMode, - gfx::DepthMode depthMode, - gfx::StencilMode stencilMode, - gfx::ColorMode colorMode, - gfx::CullFaceMode cullFaceMode, + const gfx::DepthMode& depthMode, + const gfx::StencilMode& stencilMode, + const gfx::ColorMode& colorMode, + const gfx::CullFaceMode& cullFaceMode, const gfx::UniformValues<UniformList>& uniformValues, gfx::DrawScope& drawScope, const gfx::AttributeBindings<AttributeList>& attributeBindings, diff --git a/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp index 4d6a79f729..836c5a60fd 100644 --- a/src/mbgl/programs/program.hpp +++ b/src/mbgl/programs/program.hpp @@ -75,11 +75,11 @@ public: template <class DrawMode> void draw(gfx::Context& context, - DrawMode drawMode, - gfx::DepthMode depthMode, - gfx::StencilMode stencilMode, - gfx::ColorMode colorMode, - gfx::CullFaceMode cullFaceMode, + const DrawMode& drawMode, + const gfx::DepthMode& depthMode, + const gfx::StencilMode& stencilMode, + const gfx::ColorMode& colorMode, + const gfx::CullFaceMode& cullFaceMode, const gfx::IndexBuffer& indexBuffer, const SegmentVector<AttributeList>& segments, const UniformValues& uniformValues, @@ -95,11 +95,11 @@ public: program.draw( context, - std::move(drawMode), - std::move(depthMode), - std::move(stencilMode), - std::move(colorMode), - std::move(cullFaceMode), + drawMode, + depthMode, + stencilMode, + colorMode, + cullFaceMode, uniformValues, drawScopeIt->second, allAttributeBindings.offset(segment.vertexOffset), diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 18cdff3c9f..305adf727f 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -309,11 +309,11 @@ public: template <class DrawMode> void draw(gfx::Context& context, - DrawMode drawMode, - gfx::DepthMode depthMode, - gfx::StencilMode stencilMode, - gfx::ColorMode colorMode, - gfx::CullFaceMode cullFaceMode, + const DrawMode& drawMode, + const gfx::DepthMode& depthMode, + const gfx::StencilMode& stencilMode, + const gfx::ColorMode& colorMode, + const gfx::CullFaceMode& cullFaceMode, const gfx::IndexBuffer& indexBuffer, const SegmentVector<AttributeList>& segments, const UniformValues& uniformValues, @@ -329,11 +329,11 @@ public: program.draw( context, - std::move(drawMode), - std::move(depthMode), - std::move(stencilMode), - std::move(colorMode), - std::move(cullFaceMode), + drawMode, + depthMode, + stencilMode, + colorMode, + cullFaceMode, uniformValues, drawScopeIt->second, allAttributeBindings.offset(segment.vertexOffset), |