History

Merge pull request #5278 from samcake/yellow

Adding more NSight instrumentation

Brad Davis committed 11 years ago

Commit b173ac32 parents 625cc86 4c44eb610 files · +55 −18Browse files

Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all

Unified · Split

interface/src/Application.cpp+1−1
@@ -1183,7 +1183,6 @@ bool Application::event(QEvent* event) { · 1182 unmodified lines
1183}1183}
1184 1184
1185bool Application::eventFilter(QObject* object, QEvent* event) {1185bool Application::eventFilter(QObject* object, QEvent* event) {
1186
1187 if (event->type() == QEvent::ShortcutOverride) {1186 if (event->type() == QEvent::ShortcutOverride) {
1188 if (DependencyManager::get<OffscreenUi>()->shouldSwallowShortcut(event)) {1187 if (DependencyManager::get<OffscreenUi>()->shouldSwallowShortcut(event)) {
1189 event->accept();1188 event->accept();
@@ -1788,6 +1787,7 @@ void Application::checkFPS() { · 598 unmodified lines
1788}1787}
1789 1788
1790void Application::idle() {1789void Application::idle() {
1790 PROFILE_RANGE(__FUNCTION__);
1791 static SimpleAverage<float> interIdleDurations;1791 static SimpleAverage<float> interIdleDurations;
1792 static uint64_t lastIdleEnd{ 0 };1792 static uint64_t lastIdleEnd{ 0 };
1793 1793