From b78c2796763a54af5e48a95aa7a5fc1b9df0ffff Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Thu, 23 Mar 2017 15:42:26 +0700 Subject: [PATCH] Correct UScreenScale::update() --- .../GLSL/glsl_CombinerProgramUniformFactory.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp index f718bc30..8e3d0360 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp @@ -369,10 +369,11 @@ public: void update(bool _force) override { - if (config.frameBufferEmulation.nativeResFactor == 0) + FrameBuffer * pBuffer = frameBufferList().getCurrent(); + if (pBuffer == nullptr) uScreenScale.set(dwnd().getScaleX(), dwnd().getScaleY(), _force); else - uScreenScale.set(float(config.frameBufferEmulation.nativeResFactor), float(config.frameBufferEmulation.nativeResFactor), _force); + uScreenScale.set(pBuffer->m_scale, pBuffer->m_scale, _force); } private: