History

Introducing the COntext and the Backend object and the specialized GLBackend for the real OpenGL backend to the graphics api

Sam Gateau committed 12 years ago

Commit 88eaeae1 parent 6101c3b7 files · +39 −819Browse files

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

Unified · Split

interface/src/Application.cpp+4−0
@@ -76,6 +76,7 @@ · 75 unmodified lines
7676 #include "devices/OculusManager.h"
7777 #include "devices/TV3DManager.h"
7878 #include "renderer/ProgramObject.h"
79+#include "gpu/Batch.h"
7980
8081 #include "scripting/AccountScriptingInterface.h"
8182 #include "scripting/AudioDeviceScriptingInterface.h"
@@ -588,6 +589,7 @@ void Application::initializeGL() { · 506 unmodified lines
588589 }
589590
590591 void Application::paintGL() {
592+ PROFILE_RANGE(__FUNCTION__);
591593 PerformanceTimer perfTimer("paintGL");
592594
593595 PerformanceWarning::setSuppressShortTimings(Menu::getInstance()->isOptionChecked(MenuOption::SuppressShortTimings));
@@ -2776,6 +2778,7 @@ QImage Application::renderAvatarBillboard() { · 2182 unmodified lines
27762778 }
27772779
27782780 void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
2781+ PROFILE_RANGE(__FUNCTION__);
27792782 PerformanceTimer perfTimer("display");
27802783 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()");
27812784 // transform by eye offset
@@ -2935,6 +2938,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 153 unmodified lines
29352938 }
29362939
29372940 {
2941+ PROFILE_RANGE("DeferredLighting");
29382942 PerformanceTimer perfTimer("lighting");
29392943 _deferredLightingEffect.render();
29402944 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t