diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-27 18:30:35 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-04-17 13:36:50 +0300 |
commit | dffe00feeade4d65d10deecdc196add14b791c11 (patch) | |
tree | c0b834bf8e6f44e37b5d01af87c044bdf91c7079 /src/mbgl/programs | |
parent | 2eebd7170aa72168df1d963422d256411fc4f5ef (diff) | |
download | qtlocation-mapboxgl-dffe00feeade4d65d10deecdc196add14b791c11.tar.gz |
[core] Fix readability-avoid-const-params-in-decls errors in header files
As reported by clang-tidy-8.
Diffstat (limited to 'src/mbgl/programs')
-rw-r--r-- | src/mbgl/programs/fill_extrusion_program.hpp | 12 | ||||
-rw-r--r-- | src/mbgl/programs/fill_program.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/programs/line_program.hpp | 37 | ||||
-rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 34 |
4 files changed, 41 insertions, 44 deletions
diff --git a/src/mbgl/programs/fill_extrusion_program.hpp b/src/mbgl/programs/fill_extrusion_program.hpp index 961f604734..f92bd7c968 100644 --- a/src/mbgl/programs/fill_extrusion_program.hpp +++ b/src/mbgl/programs/fill_extrusion_program.hpp @@ -85,8 +85,8 @@ public: }; } - static LayoutUniformValues - layoutUniformValues(mat4, const TransformState&, const float opacity, const EvaluatedLight&, const float verticalGradient); + static LayoutUniformValues layoutUniformValues( + mat4, const TransformState&, float opacity, const EvaluatedLight&, float verticalGradient); }; class FillExtrusionPatternProgram : public Program< @@ -106,11 +106,11 @@ public: const CrossfadeParameters&, const UnwrappedTileID&, const TransformState&, - const float opacity, - const float heightFactor, - const float pixelRatio, + float opacity, + float heightFactor, + float pixelRatio, const EvaluatedLight&, - const float verticalGradient); + float verticalGradient); }; using FillExtrusionLayoutVertex = FillExtrusionProgram::LayoutVertex; diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp index 99314c51b0..da39fe40b7 100644 --- a/src/mbgl/programs/fill_program.hpp +++ b/src/mbgl/programs/fill_program.hpp @@ -72,7 +72,7 @@ public: const CrossfadeParameters& crossfade, const UnwrappedTileID&, const TransformState&, - const float pixelRatio); + float pixelRatio); }; class FillOutlineProgram : public Program< diff --git a/src/mbgl/programs/line_program.hpp b/src/mbgl/programs/line_program.hpp index fe58db4173..145ac9d6cf 100644 --- a/src/mbgl/programs/line_program.hpp +++ b/src/mbgl/programs/line_program.hpp @@ -88,12 +88,11 @@ public: */ static const int8_t extrudeScale = 63; - static LayoutUniformValues - layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&, - const RenderTile&, - const TransformState&, - const std::array<float, 2>& pixelsToGLUnits, - const float pixelRatio); + static LayoutUniformValues layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&, + const RenderTile&, + const TransformState&, + const std::array<float, 2>& pixelsToGLUnits, + float pixelRatio); }; class LinePatternProgram : public Program< @@ -115,14 +114,13 @@ class LinePatternProgram : public Program< public: using Program::Program; - static LayoutUniformValues - layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&, - const RenderTile&, - const TransformState&, - const std::array<float, 2>& pixelsToGLUnits, - const float pixelRatio, - Size atlasSize, - const CrossfadeParameters& crossfade); + static LayoutUniformValues layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&, + const RenderTile&, + const TransformState&, + const std::array<float, 2>& pixelsToGLUnits, + float pixelRatio, + Size atlasSize, + const CrossfadeParameters& crossfade); }; class LineSDFProgram : public Program< @@ -175,12 +173,11 @@ class LineGradientProgram : public Program< public: using Program::Program; - static LayoutUniformValues - layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&, - const RenderTile&, - const TransformState&, - const std::array<float, 2>& pixelsToGLUnits, - const float pixelRatio); + static LayoutUniformValues layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&, + const RenderTile&, + const TransformState&, + const std::array<float, 2>& pixelsToGLUnits, + float pixelRatio); }; using LineLayoutVertex = LineProgram::LayoutVertex; diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 6a76aeefec..0a49e5c7ac 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -73,9 +73,9 @@ public: uniforms::size>; using UniformValues = gfx::UniformValues<UniformList>; - static std::unique_ptr<SymbolSizeBinder> create(const float tileZoom, + static std::unique_ptr<SymbolSizeBinder> create(float tileZoom, const style::PropertyValue<float>& sizeProperty, - const float defaultValue); + float defaultValue); virtual Range<float> getVertexSizeData(const GeometryTileFeature& feature) = 0; virtual ZoomEvaluatedSize evaluateForZoom(float currentZoom) const = 0; @@ -406,15 +406,15 @@ class SymbolIconProgram : public SymbolProgram< public: using SymbolProgram::SymbolProgram; - static LayoutUniformValues layoutUniformValues(const bool isText, - const bool hasVariablePacement, + static LayoutUniformValues layoutUniformValues(bool isText, + bool hasVariablePacement, const style::SymbolPropertyValues&, const Size& texsize, const std::array<float, 2>& pixelsToGLUnits, - const bool alongLine, + bool alongLine, const RenderTile&, const TransformState&, - const float symbolFadeChange); + float symbolFadeChange); }; enum class SymbolSDFPart { @@ -457,17 +457,17 @@ public: using BaseProgram::BaseProgram; - static LayoutUniformValues layoutUniformValues(const bool isText, - const bool hasVariablePacement, + static LayoutUniformValues layoutUniformValues(bool isText, + bool hasVariablePacement, const style::SymbolPropertyValues&, const Size& texsize, const std::array<float, 2>& pixelsToGLUnits, - const float pixelRatio, - const bool alongLine, + float pixelRatio, + bool alongLine, const RenderTile&, const TransformState&, - const float SymbolFadeChange, - const SymbolSDFPart); + float SymbolFadeChange, + SymbolSDFPart); }; using SymbolTextAndIconProgramUniforms = TypeList<uniforms::texsize_icon>; @@ -491,17 +491,17 @@ public: using BaseProgram::BaseProgram; - static LayoutUniformValues layoutUniformValues(const bool hasVariablePacement, + static LayoutUniformValues layoutUniformValues(bool hasVariablePacement, const style::SymbolPropertyValues&, const Size& texsize, const Size& texsize_icon, const std::array<float, 2>& pixelsToGLUnits, - const float pixelRatio, - const bool alongLine, + float pixelRatio, + bool alongLine, const RenderTile&, const TransformState&, - const float SymbolFadeChange, - const SymbolSDFPart); + float SymbolFadeChange, + SymbolSDFPart); }; class SymbolSDFIconProgram : public SymbolSDFProgram<SymbolSDFIconProgram, style::IconPaintProperties> { |