From 38f536049a8ed8f4bdf7706f4afcbbaf06c974c9 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Sat, 29 Oct 2016 18:13:12 +0300 Subject: [core] Moved util::log2 to its own header - Added util::{MIN,MAX}_ZOOM_F to avoid consecutive conversions from double to float - Move util::log2 to its own header (part of mbgl/math) --- cmake/core-files.cmake | 3 ++- include/mbgl/math/log2.hpp | 27 +++++++++++++++++++++ include/mbgl/util/constants.hpp | 2 ++ src/mbgl/algorithm/generate_clip_ids_impl.hpp | 2 +- src/mbgl/layout/symbol_layout.cpp | 14 +++++------ src/mbgl/map/map.cpp | 1 + src/mbgl/map/transform_state.cpp | 4 +-- src/mbgl/math/log2.cpp | 25 +++++++++++++++++++ src/mbgl/text/collision_tile.cpp | 1 + src/mbgl/util/math.cpp | 35 --------------------------- src/mbgl/util/math.hpp | 6 ----- 11 files changed, 67 insertions(+), 53 deletions(-) create mode 100644 include/mbgl/math/log2.hpp create mode 100644 src/mbgl/math/log2.cpp delete mode 100644 src/mbgl/util/math.cpp diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 9bab51aec8..a89c0d7f4f 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -119,8 +119,10 @@ set(MBGL_CORE_FILES # math include/mbgl/math/clamp.hpp + include/mbgl/math/log2.hpp include/mbgl/math/minmax.hpp include/mbgl/math/wrap.hpp + src/mbgl/math/log2.cpp # mbgl include/mbgl/mbgl.hpp @@ -481,7 +483,6 @@ set(MBGL_CORE_FILES src/mbgl/util/mat3.hpp src/mbgl/util/mat4.cpp src/mbgl/util/mat4.hpp - src/mbgl/util/math.cpp src/mbgl/util/math.hpp src/mbgl/util/offscreen_texture.cpp src/mbgl/util/offscreen_texture.hpp diff --git a/include/mbgl/math/log2.hpp b/include/mbgl/math/log2.hpp new file mode 100644 index 0000000000..8a3bc7f1c0 --- /dev/null +++ b/include/mbgl/math/log2.hpp @@ -0,0 +1,27 @@ +#pragma once + +#include +#include +#include + +namespace mbgl { +namespace util { + +// Computes the log2(x) rounded up to the next integer. +// (== number of bits required to store x) +uint32_t ceil_log2(uint64_t x); + +template +typename std::enable_if_t::value, T> log2(T x) +{ +// log2() is producing wrong results on ARMv5 binaries +// running on ARMv7+ CPUs. +#if defined(__ANDROID__) + return std::log(x) / M_LN2; +#else + return std::log2(x); +#endif +} + +} // namespace util +} // namespace mbgl diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp index e6e9f6e67d..85e19c2ff0 100644 --- a/include/mbgl/util/constants.hpp +++ b/include/mbgl/util/constants.hpp @@ -35,6 +35,8 @@ constexpr double DEGREES_MAX = 360; constexpr double PITCH_MAX = M_PI / 3; constexpr double MIN_ZOOM = 0.0; constexpr double MAX_ZOOM = 25.5; +constexpr float MIN_ZOOM_F = MIN_ZOOM; +constexpr float MAX_ZOOM_F = MAX_ZOOM; constexpr uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024; diff --git a/src/mbgl/algorithm/generate_clip_ids_impl.hpp b/src/mbgl/algorithm/generate_clip_ids_impl.hpp index ff8f8d3fdf..47f7df12f9 100644 --- a/src/mbgl/algorithm/generate_clip_ids_impl.hpp +++ b/src/mbgl/algorithm/generate_clip_ids_impl.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include namespace mbgl { diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index 0bf152e973..06f26b8ffb 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -11,12 +11,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include @@ -418,8 +418,7 @@ std::unique_ptr SymbolLayout::place(CollisionTile& collisionTile) template void SymbolLayout::addSymbols(Buffer &buffer, const SymbolQuads &symbols, float scale, const bool keepUpright, const style::SymbolPlacementType placement, const float placementAngle) { - - const float placementZoom = ::fmax(std::log(scale) / std::log(2) + zoom, 0); + const float placementZoom = util::max(util::log2(scale) + zoom, 0.0f); for (const auto& symbol : symbols) { const auto &tl = symbol.tl; @@ -428,9 +427,8 @@ void SymbolLayout::addSymbols(Buffer &buffer, const SymbolQuads &symbols, float const auto &br = symbol.br; const auto &tex = symbol.tex; - float minZoom = - util::max(static_cast(zoom + log(symbol.minScale) / log(2)), placementZoom); - float maxZoom = util::min(static_cast(zoom + log(symbol.maxScale) / log(2)), 25.0f); + float minZoom = util::max(zoom + util::log2(symbol.minScale), placementZoom); + float maxZoom = util::min(zoom + util::log2(symbol.maxScale), util::MAX_ZOOM_F); const auto &anchorPoint = symbol.anchorPoint; // drop upside down versions of glyphs @@ -510,8 +508,8 @@ void SymbolLayout::addToDebugBuffers(CollisionTile& collisionTile, SymbolBucket& bl = util::matrixMultiply(collisionTile.reverseRotationMatrix, bl); br = util::matrixMultiply(collisionTile.reverseRotationMatrix, br); - const float maxZoom = util::clamp(zoom + log(box.maxScale) / log(2), util::MIN_ZOOM, util::MAX_ZOOM); - const float placementZoom = util::clamp(zoom + log(box.placementScale) / log(2), util::MIN_ZOOM, util::MAX_ZOOM); + const float maxZoom = util::clamp(zoom + util::log2(box.maxScale), util::MIN_ZOOM_F, util::MAX_ZOOM_F); + const float placementZoom = util::clamp(zoom + util::log2(box.placementScale), util::MIN_ZOOM_F, util::MAX_ZOOM_F); collisionBox.vertices.emplace_back(anchor.x, anchor.y, tl.x, tl.y, maxZoom, placementZoom); collisionBox.vertices.emplace_back(anchor.x, anchor.y, tr.x, tr.y, maxZoom, placementZoom); diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index c7a47abebd..3daad10061 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -24,6 +24,7 @@ #include #include #include +#include namespace mbgl { diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index 188b3aa79a..5a8d495bac 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include namespace mbgl { @@ -117,7 +117,7 @@ double TransformState::pixel_y() const { #pragma mark - Zoom double TransformState::getZoom() const { - return std::log(scale) / M_LN2; + return scaleZoom(scale); } int32_t TransformState::getIntegerZoom() const { diff --git a/src/mbgl/math/log2.cpp b/src/mbgl/math/log2.cpp new file mode 100644 index 0000000000..222e67dbd7 --- /dev/null +++ b/src/mbgl/math/log2.cpp @@ -0,0 +1,25 @@ +#include + +namespace mbgl { +namespace util { + +// From http://stackoverflow.com/questions/3272424/compute-fast-log-base-2-ceiling +uint32_t ceil_log2(uint64_t x) { + static const uint64_t t[6] = {0xFFFFFFFF00000000, 0x00000000FFFF0000, + 0x000000000000FF00, 0x00000000000000F0, + 0x000000000000000C, 0x0000000000000002}; + uint32_t y = (((x & (x - 1)) == 0) ? 0 : 1); + uint32_t j = 32; + + for (const auto& i : t) { + const uint32_t k = (((x & i) == 0) ? 0 : j); + y += k; + x >>= k; + j >>= 1; + } + + return y; +} + +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/text/collision_tile.cpp b/src/mbgl/text/collision_tile.cpp index e485fbf36c..419ab31a79 100644 --- a/src/mbgl/text/collision_tile.cpp +++ b/src/mbgl/text/collision_tile.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include #include diff --git a/src/mbgl/util/math.cpp b/src/mbgl/util/math.cpp deleted file mode 100644 index 7b1516c041..0000000000 --- a/src/mbgl/util/math.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include - -namespace mbgl { -namespace util { - -// From http://stackoverflow.com/questions/3272424/compute-fast-log-base-2-ceiling -uint32_t ceil_log2(uint64_t x) { - static const uint64_t t[6] = {0xFFFFFFFF00000000, 0x00000000FFFF0000, - 0x000000000000FF00, 0x00000000000000F0, - 0x000000000000000C, 0x0000000000000002}; - uint32_t y = (((x & (x - 1)) == 0) ? 0 : 1); - uint32_t j = 32; - - for (const auto& i : t) { - const uint32_t k = (((x & i) == 0) ? 0 : j); - y += k; - x >>= k; - j >>= 1; - } - - return y; -} - -double log2(double x) { -// log2() is producing wrong results on ARMv5 binaries -// running on ARMv7+ CPUs. -#if defined(__ANDROID__) - return std::log(x) / 0.6931471805599453; // log(x) / log(2) -#else - return ::log2(x); -#endif -} - -} // namespace util -} // namespace mbgl diff --git a/src/mbgl/util/math.hpp b/src/mbgl/util/math.hpp index 5d4220d0a2..f969ecaedd 100644 --- a/src/mbgl/util/math.hpp +++ b/src/mbgl/util/math.hpp @@ -106,11 +106,5 @@ T smoothstep(T edge0, T edge1, T x) { return t * t * (T(3) - T(2) * t); } -// Computes the log2(x) rounded up to the next integer. -// (== number of bits required to store x) -uint32_t ceil_log2(uint64_t x); - -double log2(double x); - } // namespace util } // namespace mbgl -- cgit v1.2.1