From 07ebd7a059a87a17eb04c145a54f8a5e7445adb2 Mon Sep 17 00:00:00 2001 From: ExMix Date: Thu, 4 Apr 2013 17:44:02 +0300 Subject: [PATCH] In benchmark we need invalidate window only after tile counter decrementation --- map/coverage_generator.cpp | 14 ++++++++++++-- map/coverage_generator.hpp | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/map/coverage_generator.cpp b/map/coverage_generator.cpp index 053f48d780..1900fcd559 100644 --- a/map/coverage_generator.cpp +++ b/map/coverage_generator.cpp @@ -1,4 +1,5 @@ #include "../base/SRC_FIRST.hpp" +#include "../platform/settings.hpp" #include "coverage_generator.hpp" #include "screen_coverage.hpp" @@ -268,7 +269,10 @@ void CoverageGenerator::MergeTile(core::CommandsQueue::Environment const & env, m_workCoverage->Clear(); - m_windowHandle->invalidate(); + bool isBenchmarking = false; + Settings::Get("IsBenchmarking", isBenchmarking); + if (!isBenchmarking) + m_windowHandle->invalidate(); } void CoverageGenerator::AddCheckEmptyModelTask(int sequenceID) @@ -311,7 +315,13 @@ void CoverageGenerator::AddDecrementTileCountTask(int sequenceID) if (g_coverageGeneratorDestroyed) return; - m_queue.AddCommand(bind(&BenchmarkRenderingBarier::DecrementTileCounter, &m_benchmarkBarrier, sequenceID)); + m_queue.AddCommand(bind(&CoverageGenerator::DecrementTileCounter, this, sequenceID)); +} + +void CoverageGenerator::DecrementTileCounter(int sequenceID) +{ + m_benchmarkBarrier.DecrementTileCounter(sequenceID); + m_windowHandle->invalidate(); } void CoverageGenerator::WaitForEmptyAndFinished() diff --git a/map/coverage_generator.hpp b/map/coverage_generator.hpp index 3af5e6781a..abdf9ce722 100644 --- a/map/coverage_generator.hpp +++ b/map/coverage_generator.hpp @@ -112,6 +112,7 @@ public: void AddFinishSequenceTaskIfNeeded(); void AddDecrementTileCountTask(int sequenceID); + void DecrementTileCounter(int sequenceID); void CoverScreen(core::CommandsQueue::Environment const & env, ScreenBase const & screen,