From 751db23bc8a423ab35ca3ed5a746053c1747f1e0 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Sat, 8 Aug 2015 14:19:43 -0700
Subject: [PATCH] Fixing naming, and improving viewport handling

---
 interface/src/Application.cpp              | 6 +++---
 interface/src/ui/ApplicationCompositor.cpp | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4934fa7298..68186ea75c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1078,17 +1078,17 @@ void Application::paintGL() {
         auto primaryFbo = framebufferCache->getPrimaryFramebuffer();
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(primaryFbo));
         if (displayPlugin->isStereo()) {
-            QRect r(QPoint(0, 0), QSize(size.width() / 2, size.height()));
+            QRect currentViewport(QPoint(0, 0), QSize(size.width() / 2, size.height()));
             glClear(GL_DEPTH_BUFFER_BIT);
             for_each_eye([&](Eye eye) {
-                glViewport(r.x(), r.y(), r.width(), r.height());
+                renderArgs._viewport = toGlm(currentViewport);
                 if (displayPlugin->isHmd()) {
                     _compositor.displayOverlayTextureHmd(&renderArgs, eye);
                 } else {
                     _compositor.displayOverlayTexture(&renderArgs);
                 }
             }, [&] {
-                r.moveLeft(r.width());
+                currentViewport.moveLeft(currentViewport.width());
             });
         } else {
             glViewport(0, 0, size.width(), size.height());
diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp
index 7033d577d9..abc1e49101 100644
--- a/interface/src/ui/ApplicationCompositor.cpp
+++ b/interface/src/ui/ApplicationCompositor.cpp
@@ -215,7 +215,7 @@ void ApplicationCompositor::displayOverlayTexture(RenderArgs* renderArgs) {
     auto geometryCache = DependencyManager::get<GeometryCache>();
 
     geometryCache->useSimpleDrawPipeline(batch);
-    batch.setViewportTransform(glm::ivec4(0, 0, deviceSize.width(), deviceSize.height()));
+    batch.setViewportTransform(renderArgs->_viewport);
     batch.setModelTransform(Transform());
     batch.setViewTransform(Transform());
     batch.setProjectionTransform(mat4());
@@ -295,6 +295,7 @@ void ApplicationCompositor::displayOverlayTextureHmd(RenderArgs* renderArgs, int
     mat4 camMat;
     _cameraBaseTransform.getMatrix(camMat);
     camMat = camMat * qApp->getEyePose(eye);
+    batch.setViewportTransform(renderArgs->_viewport);
     batch.setViewTransform(camMat);
 
     batch.setProjectionTransform(qApp->getEyeProjection(eye));