From edc75c562c54e597108c0bb2aaa54abc2ca439a2 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Fri, 20 Jul 2018 11:11:30 -0400 Subject: [PATCH] Use correct uniform name --- ext/ghoul | 2 +- src/rendering/framebufferrenderer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/ghoul b/ext/ghoul index 01b1f2fd8a..bba5c7d6a0 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 01b1f2fd8ae5965eef16171dc5c7fe1c79d3022f +Subproject commit bba5c7d6a0e74669e64e9729b4e80014db215b6d diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp index 2a884c08ac..065460ddf8 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -51,7 +51,7 @@ namespace { constexpr const char* _loggerCat = "FramebufferRenderer"; constexpr const std::array UniformNames = { - "mainColorTextures", "blackoutFactor", "nAaSamples" + "mainColorTexture", "blackoutFactor", "nAaSamples" }; constexpr const char* ExitFragmentShaderPath = @@ -64,7 +64,7 @@ namespace { "${SHADERS}/framebuffer/renderframebuffer.frag"; void saveTextureToMemory(GLenum attachment, int width, int height, - std::vector& memory) + std::vector& memory) { memory.clear(); memory.resize(width * height * 3);