mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-10 13:41:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update Ghoul version

Browse Source 
Add initial Tracy profiling macros
This commit is contained in:
Alexander Bock
2020-02-10 14:50:41 +01:00
parent 0b34c0bb9f
commit 49c793d976
40 changed files with 671 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/rendering/framebufferrenderer.cpp
View File

@@ -40,6 +40,7 @@
#include <openspace/util/updatestructures.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/misc/profiling.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/textureunit.h>
@@ -1039,16 +1040,21 @@ void FramebufferRenderer::updateDownscaledVolume() {
}
void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFactor) {
// Set OpenGL default rendering state
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
glEnablei(GL_BLEND, 0);
glDisablei(GL_BLEND, 1);
glDisablei(GL_BLEND, 2);
glClampColor(GL_CLAMP_READ_COLOR, GL_FALSE);
ZoneScoped
glEnable(GL_DEPTH_TEST);
{
// Set OpenGL default rendering state
ZoneScopedN("Setting OpenGL state")
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
glEnablei(GL_BLEND, 0);
glDisablei(GL_BLEND, 1);
glDisablei(GL_BLEND, 2);
glClampColor(GL_CLAMP_READ_COLOR, GL_FALSE);
glEnable(GL_DEPTH_TEST);
}
_pingPongIndex = 0;
// Measurements cache variable
@@ -1065,11 +1071,15 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
return;
}
// deferred g-buffer
glBindFramebuffer(GL_FRAMEBUFFER, _gBuffers.framebuffer);
glDrawBuffers(3, ColorAttachment012Array);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
{
// deferred g-buffer
ZoneScopedN("Deferred G-Buffer")
TracyGpuZone("Deferred G-Buffer")
glBindFramebuffer(GL_FRAMEBUFFER, _gBuffers.framebuffer);
glDrawBuffers(3, ColorAttachment012Array);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
Time time = global::timeManager.time();
RenderData data = {
@@ -1148,6 +1158,8 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
}
void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>& tasks) {
ZoneScoped
for (const RaycasterTask& raycasterTask : tasks) {
VolumeRaycaster* raycaster = raycasterTask.raycaster;
@@ -1268,7 +1280,9 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
void FramebufferRenderer::performDeferredTasks(
const std::vector<DeferredcasterTask>& tasks)
{
{
ZoneScoped
for (const DeferredcasterTask& deferredcasterTask : tasks) {
Deferredcaster* deferredcaster = deferredcasterTask.deferredcaster;