From 884ee1a68ba23f371223ab9588fb07611d42c598 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Sun, 7 Aug 2016 11:07:30 -0700
Subject: [PATCH] Disable debug HMD plugin, ensure we release resources each
 frame

---
 .../src/display-plugins/OpenGLDisplayPlugin.cpp            | 2 ++
 .../src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp      | 7 +++++--
 .../stereo/SideBySideStereoDisplayPlugin.cpp               | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 3961f21021..d0f0d2fe8d 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -170,6 +170,7 @@ public:
             }
 
             // Execute the frame and present it to the display device.
+            _context->makeCurrent();
             {
                 PROFILE_RANGE("PluginPresent")
                 currentPlugin->present();
@@ -580,6 +581,7 @@ void OpenGLDisplayPlugin::present() {
 
     incrementPresentCount();
     if (_currentFrame) {
+        _backend->cleanupTrash();
         _backend->setStereoState(_currentFrame->stereoState);
         {
             PROFILE_RANGE_EX("execute", 0xff00ff00, (uint64_t)presentCount())
diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
index 5a34c70c72..fa267e2c68 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
@@ -7,6 +7,8 @@
 //
 #include "DebugHmdDisplayPlugin.h"
 
+#include <QtCore/QProcessEnvironment>
+
 #include <ViewFrustum.h>
 #include <controllers/Pose.h>
 #include <gpu/Frame.h>
@@ -14,10 +16,11 @@
 const QString DebugHmdDisplayPlugin::NAME("HMD Simulator");
 
 static const QString DEBUG_FLAG("HIFI_DEBUG_HMD");
+static bool enableDebugHmd = QProcessEnvironment::systemEnvironment().contains(DEBUG_FLAG);
+
 
 bool DebugHmdDisplayPlugin::isSupported() const {
-    // FIXME use the env variable
-    return true;
+    return enableDebugHmd;
 }
 
 void DebugHmdDisplayPlugin::resetSensors() {
diff --git a/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp
index 104c8ecc75..aac9b9584f 100644
--- a/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp
@@ -12,6 +12,6 @@ const QString SideBySideStereoDisplayPlugin::NAME("3D TV - Side by Side Stereo")
 
 glm::uvec2 SideBySideStereoDisplayPlugin::getRecommendedRenderSize() const {
     uvec2 result = Parent::getRecommendedRenderSize();
-    //result.x *= 2;
+    result.x *= 2;
     return result;
 }