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

Issue/525 (#593)

Browse Source 
* Add initializeGL and deinitializeGL methods to OpenSpaceModule Call releaseAll from ProgramObjectManager in deinitializeGL to guard against errors when deinitializing assets

* Change removeProgramObject function in RenderEngine to take a non-owning pointer instead of a reference to a unique pointer to make it compatible with the ProgramObjectManager
Update Ghoul repository

* Using ProgramObjectManager in more modules to reduce the number of programs compiled at startup
This commit is contained in:
Alexander Bock
2018-04-10 15:55:52 -04:00
committed by GitHub
parent 34987e9f85
commit 40dbf875c5
55 changed files with 621 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/space/rendering/renderablerings.cpp
View File

@@ -216,7 +216,7 @@ void RenderableRings::deinitializeGL() {
_textureFile = nullptr;
_texture = nullptr;
OsEng.renderEngine().removeRenderProgram(_shader);
OsEng.renderEngine().removeRenderProgram(_shader.get());
_shader = nullptr;
}