Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8580 from jherico/scale_resolution_fix

Browse source 
Fix overlays when scaling resolution
This commit is contained in:
Brad Hefta-Gaub 2016-09-08 20:57:52 -07:00 committed by GitHub
commit 85cf7e8fe1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -512,7 +512,7 @@ void OpenGLDisplayPlugin::compositeOverlay() {
batch.draw(gpu::TRIANGLE_STRIP, 4); batch.draw(gpu::TRIANGLE_STRIP, 4);
}); });
} else { } else {
batch.setViewportTransform(ivec4(uvec2(0), _currentFrame->framebuffer->getSize())); batch.setViewportTransform(ivec4(uvec2(0), _compositeFramebuffer->getSize()));
batch.draw(gpu::TRIANGLE_STRIP, 4); batch.draw(gpu::TRIANGLE_STRIP, 4);
} }
}); });
@ -536,7 +536,7 @@ void OpenGLDisplayPlugin::compositePointer() {
batch.draw(gpu::TRIANGLE_STRIP, 4); batch.draw(gpu::TRIANGLE_STRIP, 4);
}); });
} else { } else {
batch.setViewportTransform(ivec4(uvec2(0), _currentFrame->framebuffer->getSize())); batch.setViewportTransform(ivec4(uvec2(0), _compositeFramebuffer->getSize()));
batch.draw(gpu::TRIANGLE_STRIP, 4); batch.draw(gpu::TRIANGLE_STRIP, 4);
} }
}); });
@ -726,7 +726,7 @@ bool OpenGLDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
} }
ivec4 OpenGLDisplayPlugin::eyeViewport(Eye eye) const { ivec4 OpenGLDisplayPlugin::eyeViewport(Eye eye) const {
uvec2 vpSize = _currentFrame->framebuffer->getSize(); uvec2 vpSize = _compositeFramebuffer->getSize();
vpSize.x /= 2; vpSize.x /= 2;
uvec2 vpPos; uvec2 vpPos;
if (eye == Eye::Right) { if (eye == Eye::Right) {