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
11831183 }
11841184
11851185 bool Application::eventFilter(QObject* object, QEvent* event) {
1186−
11871186 if (event->type() == QEvent::ShortcutOverride) {
11881187 if (DependencyManager::get<OffscreenUi>()->shouldSwallowShortcut(event)) {
11891188 event->accept();
@@ -1788,6 +1787,7 @@ void Application::checkFPS() { · 598 unmodified lines
17881787 }
17891788
17901789 void Application::idle() {
1790+ PROFILE_RANGE(__FUNCTION__);
17911791 static SimpleAverage<float> interIdleDurations;
17921792 static uint64_t lastIdleEnd{ 0 };
17931793