summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-04-05 11:00:56 +0200
committerKonstantin Käfer <mail@kkaefer.com>2019-04-05 11:49:17 +0200
commit1d58850d0c5b467132af92eb0604b903b9199e8d (patch)
treed626f48a91224209f9fcd222a085686264627a89 /src
parent5cc3d7a73328d6df9c16d27d6aca5b49ba085351 (diff)
downloadqtlocation-mapboxgl-1d58850d0c5b467132af92eb0604b903b9199e8d.tar.gz
[core] remove Renderer::flush
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/gl/context.cpp4
-rw-r--r--src/mbgl/gl/context.hpp5
-rw-r--r--src/mbgl/renderer/renderer.cpp4
-rw-r--r--src/mbgl/renderer/renderer_impl.cpp7
-rw-r--r--src/mbgl/renderer/renderer_impl.hpp2
5 files changed, 0 insertions, 22 deletions
diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp
index 458bf9b649..29675b0446 100644
--- a/src/mbgl/gl/context.cpp
+++ b/src/mbgl/gl/context.cpp
@@ -811,9 +811,5 @@ void Context::performCleanup() {
}
}
-void Context::flush() {
- MBGL_CHECK_ERROR(glFinish());
-}
-
} // namespace gl
} // namespace mbgl
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp
index 0fad92f3df..062cbd7b8a 100644
--- a/src/mbgl/gl/context.hpp
+++ b/src/mbgl/gl/context.hpp
@@ -107,11 +107,6 @@ public:
// Only call this while the OpenGL context is exclusive to this thread.
void reset();
- // Flush pending graphics commands. Will block until the pipeline
- // is empty. Should be used only with a very good reason because
- // it will have a performance impact.
- void flush();
-
bool empty() const {
return pooledTextures.empty()
&& abandonedPrograms.empty()
diff --git a/src/mbgl/renderer/renderer.cpp b/src/mbgl/renderer/renderer.cpp
index 1c6d937237..49debb1530 100644
--- a/src/mbgl/renderer/renderer.cpp
+++ b/src/mbgl/renderer/renderer.cpp
@@ -36,10 +36,6 @@ void Renderer::render(const UpdateParameters& updateParameters) {
impl->render(updateParameters);
}
-void Renderer::flush() {
- impl->flush();
-}
-
std::vector<Feature> Renderer::queryRenderedFeatures(const ScreenLineString& geometry, const RenderedQueryOptions& options) const {
return impl->queryRenderedFeatures(geometry, options);
}
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index 9352fae471..345bd2f259 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -598,13 +598,6 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
// CommandEncoder destructor submits render commands.
}
-void Renderer::Impl::flush() {
- assert(gfx::BackendScope::exists());
-
- gl::Context& glContext = static_cast<gl::Context&>(backend.getContext());
- glContext.flush();
-}
-
std::vector<Feature> Renderer::Impl::queryRenderedFeatures(const ScreenLineString& geometry, const RenderedQueryOptions& options) const {
std::vector<const RenderLayer*> layers;
if (options.layerIDs) {
diff --git a/src/mbgl/renderer/renderer_impl.hpp b/src/mbgl/renderer/renderer_impl.hpp
index dc692fb8ce..ec65224cd2 100644
--- a/src/mbgl/renderer/renderer_impl.hpp
+++ b/src/mbgl/renderer/renderer_impl.hpp
@@ -55,8 +55,6 @@ public:
void render(const UpdateParameters&);
- void flush();
-
std::vector<Feature> queryRenderedFeatures(const ScreenLineString&, const RenderedQueryOptions&) const;
std::vector<Feature> querySourceFeatures(const std::string& sourceID, const SourceQueryOptions&) const;
std::vector<Feature> queryShapeAnnotations(const ScreenLineString&) const;