Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -76,6 +76,7 @@ · 75 unmodified lines | |||
| 76 | #include "devices/OculusManager.h" | 76 | #include "devices/OculusManager.h" |
| 77 | #include "devices/TV3DManager.h" | 77 | #include "devices/TV3DManager.h" |
| 78 | #include "renderer/ProgramObject.h" | 78 | #include "renderer/ProgramObject.h" |
| 79 | #include "gpu/Batch.h" | ||
| 79 | 80 | ||
| 80 | #include "scripting/AccountScriptingInterface.h" | 81 | #include "scripting/AccountScriptingInterface.h" |
| 81 | #include "scripting/AudioDeviceScriptingInterface.h" | 82 | #include "scripting/AudioDeviceScriptingInterface.h" |
| @@ -588,6 +589,7 @@ void Application::initializeGL() { · 506 unmodified lines | |||
| 588 | } | 589 | } |
| 589 | 590 | ||
| 590 | void Application::paintGL() { | 591 | void Application::paintGL() { |
| 592 | PROFILE_RANGE(__FUNCTION__); | ||
| 591 | PerformanceTimer perfTimer("paintGL"); | 593 | PerformanceTimer perfTimer("paintGL"); |
| 592 | 594 | ||
| 593 | PerformanceWarning::setSuppressShortTimings(Menu::getInstance()->isOptionChecked(MenuOption::SuppressShortTimings)); | 595 | PerformanceWarning::setSuppressShortTimings(Menu::getInstance()->isOptionChecked(MenuOption::SuppressShortTimings)); |
| @@ -2776,6 +2778,7 @@ QImage Application::renderAvatarBillboard() { · 2182 unmodified lines | |||
| 2776 | } | 2778 | } |
| 2777 | 2779 | ||
| 2778 | void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { | 2780 | void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { |
| 2781 | PROFILE_RANGE(__FUNCTION__); | ||
| 2779 | PerformanceTimer perfTimer("display"); | 2782 | PerformanceTimer perfTimer("display"); |
| 2780 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()"); | 2783 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()"); |
| 2781 | // transform by eye offset | 2784 | // transform by eye offset |
| @@ -2935,6 +2938,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 153 unmodified lines | |||
| 2935 | } | 2938 | } |
| 2936 | 2939 | ||
| 2937 | { | 2940 | { |
| 2941 | PROFILE_RANGE("DeferredLighting"); | ||
| 2938 | PerformanceTimer perfTimer("lighting"); | 2942 | PerformanceTimer perfTimer("lighting"); |
| 2939 | _deferredLightingEffect.render(); | 2943 | _deferredLightingEffect.render(); |
| 2940 | } | 2944 | } |