diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-03 11:07:21 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-07 18:51:47 +0100 |
commit | ed72581e0c9a1f42dda2d659a1596de20201ce3e (patch) | |
tree | 7d3208185f4daf2512dc188a5faa352287bd8456 /src | |
parent | 1f8f85fab32f583101cc6cccee8a5463aba6dab7 (diff) | |
download | qtlocation-mapboxgl-ed72581e0c9a1f42dda2d659a1596de20201ce3e.tar.gz |
[core] remove Uniforms::value in favor of direct construction
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/gl/uniform.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_background.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_circle.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_clipping.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_debug.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_fill.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_raster.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/painter_symbol.cpp | 4 |
8 files changed, 14 insertions, 19 deletions
diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp index d233614aa6..645a638024 100644 --- a/src/mbgl/gl/uniform.hpp +++ b/src/mbgl/gl/uniform.hpp @@ -68,11 +68,6 @@ public: return State { { Us::name, shader }... }; } - template <class... Args> - static Values values(Args&&... args) { - return Values { std::forward<Args>(args)... }; - } - static std::function<void ()> binder(State& state, Values&& values_) { return [&state, values = std::move(values_)] () mutable { noop((std::get<typename Us::State>(state) = std::get<typename Us::Value>(values), 0)...); diff --git a/src/mbgl/renderer/painter_background.cpp b/src/mbgl/renderer/painter_background.cpp index 93c0fe982a..431a8ca628 100644 --- a/src/mbgl/renderer/painter_background.cpp +++ b/src/mbgl/renderer/painter_background.cpp @@ -53,13 +53,13 @@ void Painter::renderBackground(PaintParameters& parameters, const BackgroundLaye gl::StencilMode::disabled(), colorModeForRenderPass(), parameters.shaders.fill, - FillColorUniforms::values( + FillColorUniforms::Values { matrixForTile(tileID), properties.backgroundOpacity.value, properties.backgroundColor.value, properties.backgroundColor.value, context.viewport.getCurrentValue().size - ), + }, gl::Unindexed<gl::TriangleStrip>(tileTriangleVertexBuffer) }); } diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp index 9db7272dab..731bb7d0ae 100644 --- a/src/mbgl/renderer/painter_circle.cpp +++ b/src/mbgl/renderer/painter_circle.cpp @@ -29,7 +29,7 @@ void Painter::renderCircle(PaintParameters& parameters, : gl::StencilMode::disabled(), colorModeForRenderPass(), parameters.shaders.circle, - CircleUniforms::values( + CircleUniforms::Values { tile.translatedMatrix(properties.circleTranslate.value, properties.circleTranslateAnchor.value, state), @@ -45,7 +45,7 @@ void Painter::renderCircle(PaintParameters& parameters, }} : pixelsToGLUnits, frame.pixelRatio - ), + }, gl::Segmented<gl::Triangles>( *bucket.vertexBuffer, *bucket.indexBuffer, diff --git a/src/mbgl/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp index d3f95e6e65..d3e9c86a1a 100644 --- a/src/mbgl/renderer/painter_clipping.cpp +++ b/src/mbgl/renderer/painter_clipping.cpp @@ -18,13 +18,13 @@ void Painter::renderClippingMask(const UnwrappedTileID& tileID, const ClipID& cl }, gl::ColorMode::disabled(), shaders->fill, - FillColorUniforms::values( + FillColorUniforms::Values { matrixForTile(tileID), 0.0f, Color {}, Color {}, context.viewport.getCurrentValue().size - ), + }, gl::Unindexed<gl::Triangles>(tileTriangleVertexBuffer) }); } diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp index c290f9b04b..a9a50b3a26 100644 --- a/src/mbgl/renderer/painter_debug.cpp +++ b/src/mbgl/renderer/painter_debug.cpp @@ -24,13 +24,13 @@ void Painter::renderTileDebug(const RenderTile& renderTile) { stencilModeForClipping(renderTile.clip), gl::ColorMode::unblended(), shaders->fill, - FillColorUniforms::values( + FillColorUniforms::Values { renderTile.matrix, 1.0f, color, color, context.viewport.getCurrentValue().size - ), + }, subject }); }; diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp index b386e227d5..5726858450 100644 --- a/src/mbgl/renderer/painter_fill.cpp +++ b/src/mbgl/renderer/painter_fill.cpp @@ -82,7 +82,7 @@ void Painter::renderFill(PaintParameters& parameters, stencilModeForClipping(tile.clip), colorModeForRenderPass(), shader, - FillColorUniforms::values( + FillColorUniforms::Values { tile.translatedMatrix(properties.fillTranslate.value, properties.fillTranslateAnchor.value, state), @@ -90,7 +90,7 @@ void Painter::renderFill(PaintParameters& parameters, properties.fillColor.value, outlineColor, context.viewport.getCurrentValue().size - ), + }, subject }); }; diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp index e77b4cf535..441bca9dc8 100644 --- a/src/mbgl/renderer/painter_raster.cpp +++ b/src/mbgl/renderer/painter_raster.cpp @@ -59,7 +59,7 @@ void Painter::renderRaster(PaintParameters& parameters, gl::StencilMode::disabled(), colorModeForRenderPass(), parameters.shaders.raster, - RasterUniforms::values( + RasterUniforms::Values { tile.matrix, 0, 1, @@ -73,7 +73,7 @@ void Painter::renderRaster(PaintParameters& parameters, 1.0f, 1.0f, std::array<float, 2> {{ 0.0f, 0.0f }} - ), + }, gl::Unindexed<gl::TriangleStrip>(rasterVertexBuffer) }); } diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index 9e3638a3a8..11d48db90e 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -124,12 +124,12 @@ void Painter::renderSymbol(PaintParameters& parameters, gl::StencilMode::disabled(), colorModeForRenderPass(), shaders->collisionBox, - CollisionBoxUniforms::values( + CollisionBoxUniforms::Values { tile.matrix, std::pow(2.0f, state.getZoom() - tile.tile.id.overscaledZ), state.getZoom() * 10, (tile.id.canonical.z + 1) * 10 - ), + }, gl::Unindexed<gl::Lines>( *bucket.collisionBox.vertexBuffer, 1.0f |