From 51a01314140f00073fcd940ee966e22d99b0aedb Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 12 Jan 2018 19:37:28 -0800
Subject: [PATCH] Fix linkage

---
 cmake/macros/TargetOpenGL.cmake                  | 5 ++++-
 libraries/gl/src/gl/Config.h                     | 2 +-
 libraries/gl/src/gl/Context.cpp                  | 6 +-----
 libraries/gpu-gles/src/gpu/gl/GLBackendQuery.cpp | 6 ++++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cmake/macros/TargetOpenGL.cmake b/cmake/macros/TargetOpenGL.cmake
index a7e6c5c93f..b9ccd2d5b5 100644
--- a/cmake/macros/TargetOpenGL.cmake
+++ b/cmake/macros/TargetOpenGL.cmake
@@ -14,8 +14,11 @@ macro(TARGET_OPENGL)
             target_link_libraries(${TARGET_NAME} ${OpenGLES3} ${EGL})
         else()
             set(GLAD_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/interface/external/glad/include")
-            message("QQQ ${GLAD_INCLUDE_DIR}")
             target_include_directories(${TARGET_NAME} PUBLIC ${GLAD_INCLUDE_DIR})
+
+            find_package(OpenGL REQUIRED)
+            target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
+            target_include_directories(${TARGET_NAME} PUBLIC ${OPENGL_INCLUDE_DIR})
         endif()
     else() 
         if (APPLE)
diff --git a/libraries/gl/src/gl/Config.h b/libraries/gl/src/gl/Config.h
index 141741a386..33d0846500 100644
--- a/libraries/gl/src/gl/Config.h
+++ b/libraries/gl/src/gl/Config.h
@@ -34,8 +34,8 @@
 
 #if defined(Q_OS_ANDROID)
 
-#include <GLES3/gl32.h>
 #include <EGL/egl.h>
+#include <GLES3/gl32.h>
 
 #else
 
diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp
index 99fd401ff3..21bb73ceda 100644
--- a/libraries/gl/src/gl/Context.cpp
+++ b/libraries/gl/src/gl/Context.cpp
@@ -23,6 +23,7 @@
 #include <shared/GlobalAppProperties.h>
 #include <GLMHelpers.h>
 #include "GLLogging.h"
+#include "Config.h"
 
 #ifdef Q_OS_WIN
 
@@ -130,11 +131,6 @@ void Context::setWindow(QWindow* window) {
     updateSwapchainMemoryCounter();
 }
 
-static HMODULE glModule = nullptr;
-#ifndef GLAPIENTRY 
-#define GLAPIENTRY APIENTRYP
-#endif
-
 
 void debugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam) {
     if (GL_DEBUG_SEVERITY_NOTIFICATION == severity) {
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackendQuery.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackendQuery.cpp
index e5126bb3df..43c8f8f465 100644
--- a/libraries/gpu-gles/src/gpu/gl/GLBackendQuery.cpp
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackendQuery.cpp
@@ -25,6 +25,7 @@ static bool timeElapsed = false;
 #endif
 
 void GLBackend::do_beginQuery(const Batch& batch, size_t paramOffset) {
+#if !defined(USE_GLES)
     auto query = batch._queries.get(batch._params[paramOffset]._uint);
     GLQuery* glquery = syncGPUObject(*query);
     if (glquery) {
@@ -40,9 +41,11 @@ void GLBackend::do_beginQuery(const Batch& batch, size_t paramOffset) {
         glquery->_rangeQueryDepth = _queryStage._rangeQueryDepth;
         (void)CHECK_GL_ERROR();
     }
+#endif
 }
 
 void GLBackend::do_endQuery(const Batch& batch, size_t paramOffset) {
+#if !defined(USE_GLES)
     auto query = batch._queries.get(batch._params[paramOffset]._uint);
     GLQuery* glquery = syncGPUObject(*query);
     if (glquery) {
@@ -65,9 +68,11 @@ void GLBackend::do_endQuery(const Batch& batch, size_t paramOffset) {
 
         (void)CHECK_GL_ERROR();
     }
+#endif
 }
 
 void GLBackend::do_getQuery(const Batch& batch, size_t paramOffset) {
+#if !defined(USE_GLES)
     auto query = batch._queries.get(batch._params[paramOffset]._uint);
     if (glGetQueryObjectui64vEXT == NULL)
         return;
@@ -87,6 +92,7 @@ void GLBackend::do_getQuery(const Batch& batch, size_t paramOffset) {
         }
         (void)CHECK_GL_ERROR();
     }
+#endif
 }
 
 void GLBackend::resetQueryStage() {