From 9e8368e50e156e7da338946566547b9156716a97 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 2 Mar 2018 11:12:44 -0800
Subject: [PATCH] Disable virtual trackpad rendering on non-Android builds

---
 .../display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp    | 6 ++++--
 .../src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h  | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
index 1a1714ad56..b725c91174 100644
--- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
@@ -23,6 +23,7 @@ const QString Basic2DWindowOpenGLDisplayPlugin::NAME("Desktop");
 static const QString FULLSCREEN = "Fullscreen";
 
 void Basic2DWindowOpenGLDisplayPlugin::customizeContext() {
+#if defined(Q_OS_ANDROID)
     auto iconPath = PathUtils::resourcesPath() + "images/analog_stick.png";
     auto image = QImage(iconPath);
     if (image.format() != QImage::Format_ARGB32) {
@@ -61,8 +62,7 @@ void Basic2DWindowOpenGLDisplayPlugin::customizeContext() {
         _virtualPadStickBaseTexture->assignStoredMip(0, image.byteCount(), image.constBits());
         _virtualPadStickBaseTexture->setAutoGenerateMips(true);
     }
-
-
+#endif
     Parent::customizeContext();
 }
 
@@ -88,6 +88,7 @@ bool Basic2DWindowOpenGLDisplayPlugin::internalActivate() {
 }
 
 void Basic2DWindowOpenGLDisplayPlugin::compositeExtra() {
+#if defined(Q_OS_ANDROID)
     auto& virtualPadManager = VirtualPad::Manager::instance();
     if(virtualPadManager.getLeftVirtualPad()->isBeingTouched()) {
         // render stick base
@@ -115,6 +116,7 @@ void Basic2DWindowOpenGLDisplayPlugin::compositeExtra() {
             batch.draw(gpu::TRIANGLE_STRIP, 4);
         });
     }
+#endif
     Parent::compositeExtra();
 }
 
diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
index d9b942bd97..7a69a40f19 100644
--- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
@@ -42,6 +42,8 @@ private:
     uint32_t _framerateTarget { 0 };
     int _fullscreenTarget{ -1 };
 
+#if defined(Q_OS_ANDROID)
     gpu::TexturePointer _virtualPadStickTexture;
     gpu::TexturePointer _virtualPadStickBaseTexture;
+#endif
 };