From 7102cf44b87cd54fa328f030d768d225b212da95 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Fri, 9 Feb 2018 10:30:57 -0800
Subject: [PATCH] Fixing merge errors

---
 interface/src/Application.cpp            | 8 +++-----
 libraries/gpu-gles/src/gpu/gl/GLShared.h | 5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 7ab1df2dac..15c1cfd60d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2427,10 +2427,6 @@ void Application::initializeUi() {
     }
 
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    DeadlockWatchdogThread::withPause([&] {
-        offscreenUi->create();
-    });
-
     connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated,
         this, &Application::onDesktopRootContextCreated);
     connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated,
@@ -2439,7 +2435,9 @@ void Application::initializeUi() {
     offscreenUi->setProxyWindow(_window->windowHandle());
     // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
     // support the window management and scripting proxies for VR use
-    offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml"));
+    DeadlockWatchdogThread::withPause([&] {
+        offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml"));
+    });
     // FIXME either expose so that dialogs can set this themselves or
     // do better detection in the offscreen UI of what has focus
     offscreenUi->setNavigationFocused(false);
diff --git a/libraries/gpu-gles/src/gpu/gl/GLShared.h b/libraries/gpu-gles/src/gpu/gl/GLShared.h
index dcce896a37..1341dd16fa 100644
--- a/libraries/gpu-gles/src/gpu/gl/GLShared.h
+++ b/libraries/gpu-gles/src/gpu/gl/GLShared.h
@@ -9,11 +9,14 @@
 #define hifi_gpu_GLShared_h
 
 #include <gl/Config.h>
+#include <gl/GLHelpers.h>
+
 #include <gpu/Forward.h>
 #include <gpu/Format.h>
 #include <gpu/Context.h>
 #include <QLoggingCategory>
 
+
 Q_DECLARE_LOGGING_CATEGORY(gpugllogging)
 Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl)
 Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl_detail)
@@ -143,8 +146,6 @@ struct ShaderObject;
 
 } } // namespace gpu::gl 
 
-#define CHECK_GL_ERROR() gpu::gl::checkGLErrorDebug(__FUNCTION__)
-
 #endif