From 58f127f29946f0ad0940219f0f2ba66842183973 Mon Sep 17 00:00:00 2001
From: Niraj Venkat <venkatn93@gmail.com>
Date: Wed, 8 Jul 2015 17:17:31 -0700
Subject: [PATCH] Fixing names of GL enums

---
 libraries/gpu/src/gpu/GLBackend.h        | 2 +-
 libraries/gpu/src/gpu/GLBackendQuery.cpp | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/gpu/src/gpu/GLBackend.h b/libraries/gpu/src/gpu/GLBackend.h
index b142e63e65..6313e8e7ac 100644
--- a/libraries/gpu/src/gpu/GLBackend.h
+++ b/libraries/gpu/src/gpu/GLBackend.h
@@ -191,7 +191,7 @@ public:
     class GLQuery : public GPUObject {
     public:
         GLuint _qo = 0;
-        GLuint _result = 0;
+        GLuint64 _result = 0;
 
         GLQuery();
         ~GLQuery();
diff --git a/libraries/gpu/src/gpu/GLBackendQuery.cpp b/libraries/gpu/src/gpu/GLBackendQuery.cpp
index 585d7de5ff..003f757450 100644
--- a/libraries/gpu/src/gpu/GLBackendQuery.cpp
+++ b/libraries/gpu/src/gpu/GLBackendQuery.cpp
@@ -65,10 +65,9 @@ void GLBackend::do_beginQuery(Batch& batch, uint32 paramOffset) {
     auto query = batch._queries.get(batch._params[paramOffset]._uint);
     GLQuery* glquery = syncGPUObject(*query);
     if (glquery) {
-        glBeginQuery(GL_TIME_ELAPSED, glquery->_qo);
         #if (GPU_FEATURE_PROFILE == GPU_LEGACY)
             // (EXT_TIMER_QUERY)
-            glBeginQuery(TIME_ELAPSED_EXT, glquery->_qo);
+            glBeginQuery(GL_TIME_ELAPSED_EXT, glquery->_qo);
         #else
             glBeginQuery(GL_TIME_ELAPSED, glquery->_qo);
         #endif
@@ -82,7 +81,7 @@ void GLBackend::do_endQuery(Batch& batch, uint32 paramOffset) {
     if (glquery) {
         #if (GPU_FEATURE_PROFILE == GPU_LEGACY)
             // (EXT_TIMER_QUERY)
-            glEndQuery(TIME_ELAPSED_EXT);
+            glEndQuery(GL_TIME_ELAPSED_EXT);
         #else
             glEndQuery(GL_TIME_ELAPSED);
         #endif
@@ -96,7 +95,7 @@ void GLBackend::do_getQuery(Batch& batch, uint32 paramOffset) {
     if (glquery) { 
         #if (GPU_FEATURE_PROFILE == GPU_LEGACY)
             // (EXT_TIMER_QUERY)
-            GetQueryObjectui64vEXT(glquery->_qo, GL_QUERY_RESULT, &glquery->_result);
+            glGetQueryObjectui64vEXT(glquery->_qo, GL_QUERY_RESULT, &glquery->_result);
         #else
             glGetQueryObjectui64v(glquery->_qo, GL_QUERY_RESULT, &glquery->_result);
         #endif