Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 18:26:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing android GLES config

Browse source
This commit is contained in:
Brad Davis 2018-01-12 00:40:11 -08:00
parent 8241def9b9
commit 8b2e8706ff
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/gl/src/gl/Config.h
View file

@ -16,7 +16,6 @@
#if defined(USE_GLES) #if defined(USE_GLES)
#define HIFI_GLES #define HIFI_GLES
#define HIFI_EGL
#endif #endif
#if defined(HIFI_GLES) #if defined(HIFI_GLES)
@ -37,10 +36,8 @@
#if defined(HIFI_GLES) #if defined(HIFI_GLES)
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES
#include <GLES3/gl32.h>
#include <EGL/egl.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_DEPTH_COMPONENT32_OES 0x81A7
#define GL_TIME_ELAPSED_EXT 0x88BF #define GL_TIME_ELAPSED_EXT 0x88BF

5
libraries/gl/src/gl/OpenGLVersionChecker.cpp
View file

@ -10,6 +10,9 @@
// //
#include "OpenGLVersionChecker.h" #include "OpenGLVersionChecker.h"
#if !defined(Q_OS_ANDROID)
#include "Config.h" #include "Config.h"
#include <mutex> #include <mutex>
@ -110,3 +113,5 @@ QJsonObject OpenGLVersionChecker::checkVersion(bool& valid, bool& override) {
return glData; return glData;
} }
#endif

3
libraries/gl/src/gl/OpenGLVersionChecker.h
View file

@ -12,6 +12,8 @@
#ifndef hifi_OpenGLVersionChecker_h #ifndef hifi_OpenGLVersionChecker_h
#define hifi_OpenGLVersionChecker_h #define hifi_OpenGLVersionChecker_h
#include <QtGlobal>
#if !defined(Q_OS_ANDROID)
#include <QApplication> #include <QApplication>
class OpenGLVersionChecker : public QApplication { class OpenGLVersionChecker : public QApplication {
@ -21,5 +23,6 @@ public:
static QJsonObject checkVersion(bool& valid, bool& override); static QJsonObject checkVersion(bool& valid, bool& override);
}; };
#endif
#endif // hifi_OpenGLVersionChecker_h #endif // hifi_OpenGLVersionChecker_h