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

fix OGL shader headers

Browse Source
This commit is contained in:
XProger 2019-02-27 05:11:12 +03:00
parent 669dd29c4a
commit fc8f656ce4
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/gapi_gl.h
View File

@ -214,6 +214,8 @@
#define GetProcOGL(x) x=(decltype(x))GetProc(#x);
// TODO: different systems, different headers, different extension suffixes... fuck this shit and make your own OGL header!
// Texture
#ifdef _OS_WIN
PFNGLACTIVETEXTUREPROC glActiveTexture;
@ -1132,12 +1134,13 @@ namespace GAPI {
#endif
bool _GL_EXT_shadow_samplers = extSupport(ext, "GL_EXT_shadow_samplers");
bool _GL_ARB_shadow = extSupport(ext, "GL_ARB_shadow");
bool _GL_OES_standard_derivatives = extSupport(ext, "GL_OES_standard_derivatives");
support.shaderBinary = extSupport(ext, "_program_binary");
support.VAO = GLES3 || extSupport(ext, "_vertex_array_object");
support.depthTexture = GLES3 || extSupport(ext, "_depth_texture");
support.shadowSampler = extSupport(ext, "_shadow_samplers") || extSupport(ext, "GL_ARB_shadow");
support.shadowSampler = _GL_EXT_shadow_samplers || _GL_ARB_shadow;
support.discardFrame = extSupport(ext, "_discard_framebuffer");
support.texNPOT = GLES3 || extSupport(ext, "_texture_npot") || extSupport(ext, "_texture_non_power_of_two");
support.texRG = GLES3 || extSupport(ext, "_texture_rg "); // hope that isn't last extension in string ;)
@ -1214,17 +1217,8 @@ namespace GAPI {
"#define attribute in\n"
"#define texture2D texture\n");
// fragment
strcat(GLSL_HEADER_FRAG, "#version 300 es\n");
if (_GL_EXT_shadow_samplers) {
strcat(GLSL_HEADER_FRAG, "#extension GL_EXT_shadow_samplers : enable\n");
}
if (_GL_OES_standard_derivatives) {
strcat(GLSL_HEADER_FRAG, "#extension GL_OES_standard_derivatives : enable\n");
}
if (support.shadowSampler) {
strcat(GLSL_HEADER_FRAG, "precision lowp sampler2DShadow;\n");
}
strcat(GLSL_HEADER_FRAG, "precision lowp int;\n"
strcat(GLSL_HEADER_FRAG, "#version 300 es\n"
"precision lowp int;\n"
"precision highp float;\n"
"precision lowp sampler3D;\n"
"#define FRAGMENT\n"
@ -1241,20 +1235,15 @@ namespace GAPI {
"#define VERTEX\n");
// fragment
strcat(GLSL_HEADER_FRAG, "#version 100\n");
if (_GL_EXT_shadow_samplers) {
strcat(GLSL_HEADER_FRAG, "#extension GL_EXT_shadow_samplers : enable\n");
}
if (_GL_OES_standard_derivatives) {
strcat(GLSL_HEADER_FRAG, "#extension GL_OES_standard_derivatives : enable\n");
}
if (support.shadowSampler) {
strcat(GLSL_HEADER_FRAG, "#define sampler2DShadow lowp sampler2DShadow\n");
}
strcat(GLSL_HEADER_FRAG, "precision lowp int;\n"
"precision highp float;\n"
"#define FRAGMENT\n"
"#define fragColor gl_FragColor\n");
}
if (support.shadowSampler) {
strcat(GLSL_HEADER_FRAG, "#define sampler2DShadow lowp sampler2DShadow\n");
}
#else
// vertex
strcat(GLSL_HEADER_VERT, "#version 110\n"
@ -1265,6 +1254,15 @@ namespace GAPI {
"#define fragColor gl_FragColor\n");
#endif
if (_GL_OES_standard_derivatives) {
strcat(GLSL_HEADER_FRAG, "#extension GL_OES_standard_derivatives : enable\n");
}
if (_GL_EXT_shadow_samplers && !_GL_ARB_shadow) {
strcat(GLSL_HEADER_FRAG, "#extension GL_EXT_shadow_samplers : enable\n");
strcat(GLSL_HEADER_FRAG, "#define USE_GL_EXT_shadow_samplers\n");
}
ASSERT(strlen(GLSL_HEADER_VERT) < COUNT(GLSL_HEADER_VERT));
ASSERT(strlen(GLSL_HEADER_FRAG) < COUNT(GLSL_HEADER_FRAG));
}

2
src/shaders/compose.glsl
View File

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