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

Address Visual Studio analyzer warnings

Browse Source
This commit is contained in:
Alexander Bock
2022-04-12 00:58:11 +02:00
parent f1667a7f43
commit d360f2ae59
17 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/base/rendering/screenspaceframebuffer.cpp
View File

@@ -97,7 +97,7 @@ bool ScreenSpaceFramebuffer::deinitializeGL() {
_framebuffer->activate();
_framebuffer->detachAll();
_framebuffer->deactivate();
ghoul::opengl::FramebufferObject::deactivate();
removeAllRenderFunctions();
return true;
@@ -122,7 +122,7 @@ void ScreenSpaceFramebuffer::render() {
);
global::renderEngine->openglStateCache().setViewportState(viewport);
GLint defaultFBO = _framebuffer->getActiveObject();
GLint defaultFBO = ghoul::opengl::FramebufferObject::getActiveObject();
_framebuffer->activate();
glClearColor(0.f, 0.f, 0.f, 0.f);
@@ -130,7 +130,7 @@ void ScreenSpaceFramebuffer::render() {
for (const RenderFunction& renderFunction : _renderFunctions) {
renderFunction();
}
_framebuffer->deactivate();
ghoul::opengl::FramebufferObject::deactivate();
glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
@@ -185,7 +185,7 @@ void ScreenSpaceFramebuffer::createFramebuffer() {
_texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
_texture->purgeFromRAM();
_framebuffer->attachTexture(_texture.get(), GL_COLOR_ATTACHMENT0);
_framebuffer->deactivate();
ghoul::opengl::FramebufferObject::deactivate();
}
int ScreenSpaceFramebuffer::id() {