diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-20 10:34:02 +0100 |
---|---|---|
committer | Alf Watt <alf.watt@mapbox.com> | 2019-03-21 12:25:11 -0700 |
commit | 4b2bd713144d63ed4b57350c6612ed9b529c2524 (patch) | |
tree | 566c4be3d3f5457fdaf8b304fd6a56cba0e7ab3a /src/mbgl/renderer/renderer_impl.cpp | |
parent | bf9e76c1cb2f6b0e1f6bc824d5c2d822595158b7 (diff) | |
download | qtlocation-mapboxgl-4b2bd713144d63ed4b57350c6612ed9b529c2524.tar.gz |
[core] move cleanup to gfx::Context
Diffstat (limited to 'src/mbgl/renderer/renderer_impl.cpp')
-rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index dee42a6128..aa47d56b47 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -589,19 +589,6 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { } #endif - // TODO: Find a better way to unbind VAOs after we're done with them without introducing - // unnecessary bind(0)/bind(N) sequences. - { - MBGL_DEBUG_GROUP(parameters.context, "cleanup"); - - glContext.activeTextureUnit = 1; - glContext.texture[1] = 0; - glContext.activeTextureUnit = 0; - glContext.texture[0] = 0; - - glContext.bindVertexArray = 0; - } - observer->onDidFinishRenderingFrame( loaded ? RendererObserver::RenderMode::Full : RendererObserver::RenderMode::Partial, updateParameters.mode == MapMode::Continuous && hasTransitions(parameters.timePoint) @@ -615,7 +602,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { } // Cleanup only after signaling completion - glContext.performCleanup(); + parameters.context.performCleanup(); } std::vector<Feature> Renderer::Impl::queryRenderedFeatures(const ScreenLineString& geometry, const RenderedQueryOptions& options) const { |