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

Moved shader compilation to the same state to avoid performance warning in OpenGL.

Browse Source
This commit is contained in:
Jonathas Costa
2017-07-21 11:35:42 -04:00
parent 4842b21db4
commit db7b60f4f0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rendering/framebufferrenderer.cpp
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -129,9 +129,8 @@ void FramebufferRenderer::initialize() {
updateResolution();
updateRendererData();
updateRaycastData();
updateDeferredcastData();
updateHDRData();
// updateDeferredcastData();
glBindFramebuffer(GL_FRAMEBUFFER, _mainFramebuffer);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE, _mainColorTexture, 0);
// G-buffer
@@ -179,6 +178,10 @@ void FramebufferRenderer::initialize() {
LERROR("Deferred framebuffer is not complete");
}
// JCC: Moved to here to avoid NVidia: "Program/shader state performance warning"
updateHDRData();
updateDeferredcastData();
glBindFramebuffer(GL_FRAMEBUFFER, defaultFbo);
try {
@@ -685,7 +688,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
}
}
// g-buffer1
// g-buffer
if (!tasks.deferredcasterTasks.empty()) {
glBindFramebuffer(GL_FRAMEBUFFER, _deferredFramebuffer);
GLenum dBuffer[1] = { GL_COLOR_ATTACHMENT0 };