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

Merged master into NewAtmosphere.

Browse Source
This commit is contained in:
Jonathas Costa
2017-12-14 15:55:27 -05:00
parent f6ab44ee12 f78c10168f
commit eead4b7f25
110 changed files with 4277 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rendering/framebufferrenderer.cpp
View File

@@ -43,6 +43,7 @@
#include <openspace/performance/performancemeasurement.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/textureunit.h>
@@ -190,8 +191,8 @@ void FramebufferRenderer::initialize() {
try {
_resolveProgram = ghoul::opengl::ProgramObject::Build(
"Framebuffer Resolve",
"${SHADERS}/framebuffer/resolveframebuffer.vert",
"${SHADERS}/framebuffer/resolveframebuffer.frag"
absPath("${SHADERS}/framebuffer/resolveframebuffer.vert"),
absPath("${SHADERS}/framebuffer/resolveframebuffer.frag")
);
} catch (const ghoul::RuntimeError& e) {
LERRORC(e.component, e.message);