From 8b2e8706ff78e13e2e8408fbdcbd3c4ab524ce4f Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 12 Jan 2018 00:40:11 -0800
Subject: [PATCH] Fixing android GLES config
---
libraries/gl/src/gl/Config.h | 5 +----
libraries/gl/src/gl/OpenGLVersionChecker.cpp | 5 +++++
libraries/gl/src/gl/OpenGLVersionChecker.h | 3 +++
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/libraries/gl/src/gl/Config.h b/libraries/gl/src/gl/Config.h
index 0258f573f6..5c278400c9 100644
--- a/libraries/gl/src/gl/Config.h
+++ b/libraries/gl/src/gl/Config.h
@@ -16,7 +16,6 @@
#if defined(USE_GLES)
#define HIFI_GLES
-#define HIFI_EGL
#endif
#if defined(HIFI_GLES)
@@ -37,10 +36,8 @@
#if defined(HIFI_GLES)
#define GL_GLEXT_PROTOTYPES
+#include <GLES3/gl32.h>
#include <EGL/egl.h>
-#include <GLES3/gl3.h>
-#include <GLES3/gl3ext.h>
-#include <GLES3/gl3platform.h>
#define GL_DEPTH_COMPONENT32_OES 0x81A7
#define GL_TIME_ELAPSED_EXT 0x88BF
diff --git a/libraries/gl/src/gl/OpenGLVersionChecker.cpp b/libraries/gl/src/gl/OpenGLVersionChecker.cpp
index 771a8b9a75..05dfa7ea17 100644
--- a/libraries/gl/src/gl/OpenGLVersionChecker.cpp
+++ b/libraries/gl/src/gl/OpenGLVersionChecker.cpp
@@ -10,6 +10,9 @@
//
#include "OpenGLVersionChecker.h"
+
+#if !defined(Q_OS_ANDROID)
+
#include "Config.h"
#include <mutex>
@@ -110,3 +113,5 @@ QJsonObject OpenGLVersionChecker::checkVersion(bool& valid, bool& override) {
return glData;
}
+
+#endif
diff --git a/libraries/gl/src/gl/OpenGLVersionChecker.h b/libraries/gl/src/gl/OpenGLVersionChecker.h
index 913675af24..4b965122f5 100644
--- a/libraries/gl/src/gl/OpenGLVersionChecker.h
+++ b/libraries/gl/src/gl/OpenGLVersionChecker.h
@@ -12,6 +12,8 @@
#ifndef hifi_OpenGLVersionChecker_h
#define hifi_OpenGLVersionChecker_h
+#include <QtGlobal>
+#if !defined(Q_OS_ANDROID)
#include <QApplication>
class OpenGLVersionChecker : public QApplication {
@@ -21,5 +23,6 @@ public:
static QJsonObject checkVersion(bool& valid, bool& override);
};
+#endif
#endif // hifi_OpenGLVersionChecker_h