Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 16:53:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android' of https://github.com/highfidelity/hifi into android-fixes

Browse source
This commit is contained in:
Sam Gateau 2018-01-12 19:33:47 -08:00
commit 44920dd828
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@
#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)
@ -34,10 +35,12 @@
#define MINIMUM_GL_VERSION ((GL_MIN_VERSION_MAJOR << 8) | GL_MIN_VERSION_MINOR) #define MINIMUM_GL_VERSION ((GL_MIN_VERSION_MAJOR << 8) | GL_MIN_VERSION_MINOR)
#if defined(HIFI_GLES) #if defined(HIFI_EGL)
#define GL_GLEXT_PROTOTYPES
#include <GLES3/gl32.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#endif
#if defined(HIFI_GLES)
#include <GLES3/gl32.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