aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2014-11-27 16:09:29 +0100
committerRainer Hochecker <fernetmenta@online.de>2014-11-27 16:09:29 +0100
commit6d3b6760475dad515b3e3d861c90be53e5582eb5 (patch)
tree942a8260b9ec4b40c67bae31290bb3283241dfff
parenta839b2d90069a403ca652ec6917605c0a6a8df75 (diff)
Revert "gl: multipass renderer would use wrong source pixels sizes"
This reverts commit 9255204c264b25969558035deeae4a6d2d7f2842. breaks HQ scaling for sw decoding on Linux
-rw-r--r--xbmc/cores/VideoRenderers/LinuxRendererGL.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
index 468c51b2a0..ae7f649805 100644
--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
@@ -1481,8 +1481,8 @@ void CLinuxRendererGL::RenderFromFBO()
m_fbo.fbo.SetFiltering(GL_TEXTURE_2D, filter);
m_pVideoFilterShader->SetSourceTexture(0);
- m_pVideoFilterShader->SetWidth(m_fbo.width);
- m_pVideoFilterShader->SetHeight(m_fbo.height);
+ m_pVideoFilterShader->SetWidth(m_sourceWidth);
+ m_pVideoFilterShader->SetHeight(m_sourceHeight);
//disable non-linear stretch when a dvd menu is shown, parts of the menu are rendered through the overlay renderer
//having non-linear stretch on breaks the alignment
@@ -1502,8 +1502,8 @@ void CLinuxRendererGL::RenderFromFBO()
VerifyGLState();
- float imgwidth = m_sourceWidth / m_fbo.width;
- float imgheight = m_sourceHeight / m_fbo.height;
+ float imgwidth = m_fbo.width / m_sourceWidth;
+ float imgheight = m_fbo.height / m_sourceHeight;
glBegin(GL_QUADS);