mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-07 13:46:45 +02:00
Code Issues Releases Wiki Activity

fix shadow sampling for GL3

Browse Source
This commit is contained in:
XProger
2021-01-25 18:04:06 +03:00
parent 4a95219952
commit 977fa6e042
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gapi/gl.h
View File

@@ -1381,7 +1381,6 @@ namespace GAPI {
if (!GLES3) { if (!GLES3) {
strcat(extHeader, "#extension GL_EXT_shadow_samplers : enable\n"); strcat(extHeader, "#extension GL_EXT_shadow_samplers : enable\n");
} }
strcat(extHeader, "#define USE_GL_EXT_shadow_samplers\n");
} }
#ifdef _GAPI_GLES #ifdef _GAPI_GLES
@@ -1405,7 +1404,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" "#define FETCH_SHADOW2D(a,b) texture(a,b)\n"
"out vec4 fragColor;\n"); "out vec4 fragColor;\n");
} else { } else {
// vertex // vertex
@@ -1419,6 +1418,7 @@ namespace GAPI {
strcat(GLSL_HEADER_FRAG, "precision lowp int;\n" strcat(GLSL_HEADER_FRAG, "precision lowp int;\n"
"precision highp float;\n" "precision highp float;\n"
"#define FRAGMENT\n" "#define FRAGMENT\n"
"#define FETCH_SHADOW2D(a,b) shadow2DEXT(a,b)\n"
"#define fragColor gl_FragColor\n"); "#define fragColor gl_FragColor\n");
} }
@@ -1440,7 +1440,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 shadow2D texture\n" "#define FETCH_SHADOW2D(a,b) texture(a,b)\n"
"out vec4 fragColor;\n"); "out vec4 fragColor;\n");
} else { } else {
// vertex // vertex
@@ -1450,6 +1450,7 @@ namespace GAPI {
strcat(GLSL_HEADER_FRAG, "#version 110\n"); strcat(GLSL_HEADER_FRAG, "#version 110\n");
strcat(GLSL_HEADER_FRAG, extHeader); strcat(GLSL_HEADER_FRAG, extHeader);
strcat(GLSL_HEADER_FRAG, "#define FRAGMENT\n" strcat(GLSL_HEADER_FRAG, "#define FRAGMENT\n"
"#define FETCH_SHADOW2D(a,b) shadow2D(a,b).x\n"
"#define fragColor gl_FragColor\n"); "#define fragColor gl_FragColor\n");
} }
#endif #endif

6
src/shaders/compose.glsl
View File

@@ -262,11 +262,7 @@ varying vec4 vTexCoord; // xy - atlas coords, zw - trapezoidal correction
#ifdef OPT_SHADOW #ifdef OPT_SHADOW
#ifdef SHADOW_SAMPLER #ifdef SHADOW_SAMPLER
uniform sampler2DShadow sShadow; uniform sampler2DShadow sShadow;
#ifdef USE_GL_EXT_shadow_samplers #define SHADOW(p) (FETCH_SHADOW2D(sShadow, p))
#define SHADOW(V) (shadow2DEXT(sShadow, V))
#else
#define SHADOW(V) (shadow2D(sShadow, V).x)
#endif
#else #else
uniform sampler2D sShadow; uniform sampler2D sShadow;