mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-14 00:54:05 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/XProger/OpenLara

Browse Source
This commit is contained in:
XProger
2019-02-15 03:19:50 +03:00
parent 63cf0ebf7d ac16716893
commit abf26376e9
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gapi_gl.h
View File

@@ -63,6 +63,8 @@
#define GL_COMPARE_REF_TO_TEXTURE 0x884E #define GL_COMPARE_REF_TO_TEXTURE 0x884E
#undef GL_RG #undef GL_RG
#undef GL_RG32F
#undef GL_RG16F
#undef GL_RGBA32F #undef GL_RGBA32F
#undef GL_RGBA16F #undef GL_RGBA16F
#undef GL_HALF_FLOAT #undef GL_HALF_FLOAT
@@ -70,11 +72,17 @@
#define GL_RG GL_RGBA #define GL_RG GL_RGBA
#define GL_RGBA32F GL_RGBA #define GL_RGBA32F GL_RGBA
#define GL_RGBA16F GL_RGBA #define GL_RGBA16F GL_RGBA
#define GL_RG32F GL_RGBA
#define GL_RG16F GL_RGBA
#define GL_HALF_FLOAT GL_HALF_FLOAT_OES #define GL_HALF_FLOAT GL_HALF_FLOAT_OES
#define GL_TEXTURE_3D 0
#define GL_TEXTURE_WRAP_R 0
#define GL_DEPTH_STENCIL GL_DEPTH_STENCIL_OES #define GL_DEPTH_STENCIL GL_DEPTH_STENCIL_OES
#define GL_UNSIGNED_INT_24_8 GL_UNSIGNED_INT_24_8_OES #define GL_UNSIGNED_INT_24_8 GL_UNSIGNED_INT_24_8_OES
#define glTexImage3D(...) 0
#define glGenVertexArrays(...) #define glGenVertexArrays(...)
#define glDeleteVertexArrays(...) #define glDeleteVertexArrays(...)
#define glBindVertexArray(...) #define glBindVertexArray(...)
@@ -206,7 +214,9 @@
#if defined(_OS_WIN) || defined(_OS_LINUX) #if defined(_OS_WIN) || defined(_OS_LINUX)
PFNGLGENERATEMIPMAPPROC glGenerateMipmap; PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
PFNGLTEXIMAGE3DPROC glTexImage3D; #ifdef _OS_WIN
PFNGLTEXIMAGE3DPROC glTexImage3D;
#endif
// Profiling // Profiling
#ifdef PROFILE #ifdef PROFILE
PFNGLOBJECTLABELPROC glObjectLabel; PFNGLOBJECTLABELPROC glObjectLabel;
@@ -996,7 +1006,9 @@ namespace GAPI {
#if defined(_OS_WIN) || defined(_OS_LINUX) #if defined(_OS_WIN) || defined(_OS_LINUX)
GetProcOGL(glGenerateMipmap); GetProcOGL(glGenerateMipmap);
GetProcOGL(glTexImage3D); #ifdef _OS_WIN
GetProcOGL(glTexImage3D);
#endif
#ifdef PROFILE #ifdef PROFILE
GetProcOGL(glObjectLabel); GetProcOGL(glObjectLabel);
@@ -1150,7 +1162,13 @@ namespace GAPI {
GLSL_HEADER_VERT[0] = GLSL_HEADER_FRAG[0] = 0; GLSL_HEADER_VERT[0] = GLSL_HEADER_FRAG[0] = 0;
#ifdef _GAPI_GLES #ifdef _GAPI_GLES
if (WEBGL_VERSION == 1) { bool GLES3 = false;
#ifdef _OS_WEB
GLES3 = WEBGL_VERSION != 1;
#else
GLES3 = false;
#endif
if (!GLES3) {
strcat(GLSL_HEADER_VERT, "#define VERTEX\n" strcat(GLSL_HEADER_VERT, "#define VERTEX\n"
"precision lowp int;\n" "precision lowp int;\n"
"precision highp float;\n"); "precision highp float;\n");