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

fix android and GL ES3 shaders

Browse Source
This commit is contained in:
XProger
2020-02-02 14:04:42 +03:00
parent 576a7cda0d
commit e05c587681
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gapi/gl.h
View File

@@ -1317,11 +1317,15 @@ namespace GAPI {
char extHeader[256]; char extHeader[256];
GLSL_HEADER_VERT[0] = GLSL_HEADER_FRAG[0] = extHeader[0] = 0; GLSL_HEADER_VERT[0] = GLSL_HEADER_FRAG[0] = extHeader[0] = 0;
if (_GL_OES_standard_derivatives) { if (_GL_OES_standard_derivatives) {
strcat(extHeader, "#extension GL_OES_standard_derivatives : enable\n"); if (!GLES3) {
strcat(extHeader, "#extension GL_OES_standard_derivatives : enable\n");
}
} }
if (_GL_EXT_shadow_samplers && !_GL_ARB_shadow) { if (_GL_EXT_shadow_samplers && !_GL_ARB_shadow) {
strcat(extHeader, "#extension GL_EXT_shadow_samplers : enable\n"); if (!GLES3) {
strcat(extHeader, "#extension GL_EXT_shadow_samplers : enable\n");
}
strcat(extHeader, "#define USE_GL_EXT_shadow_samplers\n"); strcat(extHeader, "#define USE_GL_EXT_shadow_samplers\n");
} }
@@ -1346,6 +1350,7 @@ namespace GAPI {
"#define texture2D texture\n" "#define texture2D texture\n"
"#define texture3D texture\n" "#define texture3D texture\n"
"#define textureCube texture\n" "#define textureCube texture\n"
"#define shadow2DEXT texture\n"
"out vec4 fragColor;\n"); "out vec4 fragColor;\n");
} else { } else {
// vertex // vertex

2
src/platform/android/app/src/main/cpp/main.cpp
View File

@@ -189,7 +189,7 @@ JNI_METHOD(void, nativeFrameRender)(JNIEnv* env) {
} }
JNI_METHOD(void, nativeResize)(JNIEnv* env, jobject obj, jint x, jint y, jint w, jint h) { JNI_METHOD(void, nativeResize)(JNIEnv* env, jobject obj, jint x, jint y, jint w, jint h) {
Core::viewportDef = Viewport(x, y, w, h); Core::viewportDef = short4(x, y, w, h);
Core::x = x; Core::x = x;
Core::y = y; Core::y = y;
Core::width = w; Core::width = w;