mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-16 00:38:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed dummy texture units. Fixed empty ATM.

Browse Source
This commit is contained in:
Jonathas Costa
2017-05-17 14:11:26 -04:00
parent 08fa7a9e7e
commit 87843b57a5
6 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/rendering/framebufferrenderer.cpp
View File

@@ -607,7 +607,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
ghoul::opengl::ProgramObject* deferredcastProgram = nullptr;
if (deferredcastProgram != _deferredcastPrograms[deferredcaster].get()) {
deferredcastProgram = _deferredcastPrograms[deferredcaster].get();
deferredcastProgram = _deferredcastPrograms[deferredcaster].get();
}
deferredcastProgram->activate();
@@ -638,22 +638,10 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
deferredcastProgram->setUniform("nAaSamples", _nAaSamples);
// deferredcastProgram->setUniform("windowSize", glm::vec2(_resolution));
deferredcaster->preRaycast(deferredcasterTask.renderData,
_deferredcastData[deferredcaster],
*deferredcastProgram);
// DEBUG: Temporary until fix problem in architecture.
ghoul::opengl::TextureUnit dummyTextureUnit;
dummyTextureUnit.activate();
ghoul::opengl::TextureUnit dummyTextureUnit1;
dummyTextureUnit1.activate();
ghoul::opengl::TextureUnit dummyTextureUnit2;
dummyTextureUnit2.activate();
ghoul::opengl::TextureUnit dummyTextureUnit3;
dummyTextureUnit3.activate();
glDisable(GL_DEPTH_TEST);
glDepthMask(false);
@@ -663,11 +651,12 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
glDepthMask(true);
glEnable(GL_DEPTH_TEST);
deferredcaster->postRaycast(deferredcasterTask.renderData,
_deferredcastData[deferredcaster],
*deferredcastProgram);
deferredcastProgram->deactivate();
_deferredcastData[deferredcaster],
*deferredcastProgram);
deferredcastProgram->deactivate();
} else {
LWARNING("Deferredcaster is not attached when trying to perform deferred task");