summaryrefslogtreecommitdiff
path: root/src/mbgl/geometry/line_atlas.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-02-16 13:48:33 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-15 09:56:18 -0700
commit6e78eabfff75579286ab23cbde8a36fba061ca1d (patch)
tree2437392712213f97c0326cce8691a6944fb72734 /src/mbgl/geometry/line_atlas.cpp
parent253a007d99c2079b95d5c6d11715e16815067e16 (diff)
downloadqtlocation-mapboxgl-6e78eabfff75579286ab23cbde8a36fba061ca1d.tar.gz
[core] Clean up ThreadContext vestiges
Diffstat (limited to 'src/mbgl/geometry/line_atlas.cpp')
-rw-r--r--src/mbgl/geometry/line_atlas.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp
index 9b133319dc..1213b8d778 100644
--- a/src/mbgl/geometry/line_atlas.cpp
+++ b/src/mbgl/geometry/line_atlas.cpp
@@ -3,7 +3,6 @@
#include <mbgl/gl/gl_object_store.hpp>
#include <mbgl/platform/log.hpp>
#include <mbgl/platform/platform.hpp>
-#include <mbgl/util/thread_context.hpp>
#include <boost/functional/hash.hpp>
@@ -20,12 +19,9 @@ LineAtlas::LineAtlas(GLsizei w, GLsizei h)
}
LineAtlas::~LineAtlas() {
- assert(util::ThreadContext::currentlyOn(util::ThreadType::Map));
}
LinePatternPos LineAtlas::getDashPosition(const std::vector<float> &dasharray, bool round, gl::GLObjectStore& glObjectStore) {
- assert(util::ThreadContext::currentlyOn(util::ThreadType::Map));
-
size_t key = round ? std::numeric_limits<size_t>::min() : std::numeric_limits<size_t>::max();
for (const float part : dasharray) {
boost::hash_combine<float>(key, part);
@@ -132,8 +128,6 @@ void LineAtlas::upload(gl::GLObjectStore& glObjectStore) {
}
void LineAtlas::bind(gl::GLObjectStore& glObjectStore) {
- assert(util::ThreadContext::currentlyOn(util::ThreadType::Map));
-
bool first = false;
if (!texture) {
texture.create(glObjectStore);