mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-20 20:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove performance measurements that have been supersceded by using Tracy

Browse Source
This commit is contained in:
Alexander Bock
2020-08-05 18:28:08 +02:00
parent 1acd9302b9
commit 6e9db78f40
27 changed files with 18 additions and 1545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/rendering/framebufferrenderer.cpp
View File

@@ -26,8 +26,6 @@
#include <openspace/engine/globals.h>
#include <openspace/engine/windowdelegate.h>
#include <openspace/performance/performancemanager.h>
#include <openspace/performance/performancemeasurement.h>
#include <openspace/rendering/deferredcaster.h>
#include <openspace/rendering/deferredcastermanager.h>
#include <openspace/rendering/raycastermanager.h>
@@ -523,14 +521,6 @@ void FramebufferRenderer::deferredcastersChanged(Deferredcaster&,
}
void FramebufferRenderer::applyTMO(float blackoutFactor) {
const bool doPerformanceMeasurements = global::performanceManager.isEnabled();
std::unique_ptr<performance::PerformanceMeasurement> perfInternal;
if (doPerformanceMeasurements) {
perfInternal = std::make_unique<performance::PerformanceMeasurement>(
"FramebufferRenderer::render::TMO"
);
}
_hdrFilteringProgram->activate();
ghoul::opengl::TextureUnit hdrFeedingTextureUnit;
@@ -563,15 +553,6 @@ void FramebufferRenderer::applyTMO(float blackoutFactor) {
}
void FramebufferRenderer::applyFXAA() {
const bool doPerformanceMeasurements = global::performanceManager.isEnabled();
std::unique_ptr<performance::PerformanceMeasurement> perfInternal;
if (doPerformanceMeasurements) {
perfInternal = std::make_unique<performance::PerformanceMeasurement>(
"FramebufferRenderer::render::FXAA"
);
}
_fxaaProgram->activate();
ghoul::opengl::TextureUnit renderedTextureUnit;
@@ -645,15 +626,6 @@ void FramebufferRenderer::updateDownscaleTextures() {
}
void FramebufferRenderer::writeDownscaledVolume() {
const bool doPerformanceMeasurements = global::performanceManager.isEnabled();
std::unique_ptr<performance::PerformanceMeasurement> perfInternal;
if (doPerformanceMeasurements) {
perfInternal = std::make_unique<performance::PerformanceMeasurement>(
"FramebufferRenderer::render::writeDownscaledVolume"
);
}
// Saving current OpenGL state
GLboolean blendEnabled = glIsEnabledi(GL_BLEND, 0);
@@ -1177,16 +1149,6 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
}
_pingPongIndex = 0;
// Measurements cache variable
const bool doPerformanceMeasurements = global::performanceManager.isEnabled();
std::unique_ptr<performance::PerformanceMeasurement> perf;
if (doPerformanceMeasurements) {
perf = std::make_unique<performance::PerformanceMeasurement>(
"FramebufferRenderer::render"
);
}
if (!scene || !camera) {
return;
}
@@ -1207,7 +1169,6 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
RenderData data = {
*camera,
std::move(time),
doPerformanceMeasurements,
0,
{}
};
@@ -1234,13 +1195,6 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
// Run Volume Tasks
{
GLDebugGroup group("Raycaster Tasks");
std::unique_ptr<performance::PerformanceMeasurement> perfInternal;
if (doPerformanceMeasurements) {
perfInternal = std::make_unique<performance::PerformanceMeasurement>(
"FramebufferRenderer::render::raycasterTasks"
);
}
performRaycasterTasks(tasks.raycasterTasks);
if (HasGLDebugInfo) {
@@ -1257,12 +1211,6 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
glBindFramebuffer(GL_FRAMEBUFFER, _pingPongBuffers.framebuffer);
glDrawBuffers(1, &ColorAttachment01Array[_pingPongIndex]);
std::unique_ptr<performance::PerformanceMeasurement> perfInternal;
if (doPerformanceMeasurements) {
perfInternal = std::make_unique<performance::PerformanceMeasurement>(
"FramebufferRenderer::render::deferredTasks"
);
}
performDeferredTasks(tasks.deferredcasterTasks);
}