diff --git a/shaders/dimensions/all_solid.fsh b/shaders/dimensions/all_solid.fsh index 7d36607..16a98fd 100644 --- a/shaders/dimensions/all_solid.fsh +++ b/shaders/dimensions/all_solid.fsh @@ -1,4 +1,3 @@ -#extension GL_EXT_gpu_shader4 : enable #extension GL_ARB_shader_texture_lod : enable #include "/lib/settings.glsl" @@ -464,11 +463,11 @@ void main() { //////////////////////////////// //////////////////////////////// #if defined WORLD && defined MC_NORMAL_MAP - vec3 NormalTex = texture2D_POMSwitch(normals, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM).xya; + vec3 NormalTex = texture2D_POMSwitch(normals, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM).xyw; float Heightmap = 1.0 - NormalTex.z; - NormalTex.xy = NormalTex.xy*2.0-1.0; - NormalTex.z = clamp(sqrt(1.0 - dot(NormalTex.xy, NormalTex.xy)),0.0,1.0) ; + NormalTex.xy = NormalTex.xy * 2.0-1.0; + NormalTex.z = sqrt(max(1.0 - dot(NormalTex.xy, NormalTex.xy), 0.0)); #if defined HEIGTHMAP_DEPTH_OFFSET && !defined HAND gl_FragDepth = gl_FragCoord.z; diff --git a/shaders/dimensions/all_solid.vsh b/shaders/dimensions/all_solid.vsh index 640a829..3f05d44 100644 --- a/shaders/dimensions/all_solid.vsh +++ b/shaders/dimensions/all_solid.vsh @@ -1,4 +1,4 @@ -#extension GL_EXT_gpu_shader4 : enable + #include "/lib/settings.glsl" #include "/lib/res_params.glsl" #include "/lib/bokeh.glsl" diff --git a/shaders/dimensions/composite.vsh b/shaders/dimensions/composite.vsh index 476633c..b9bebb0 100644 --- a/shaders/dimensions/composite.vsh +++ b/shaders/dimensions/composite.vsh @@ -1,6 +1,3 @@ - -//#extension GL_EXT_gpu_shader4 : disable - #include "/lib/settings.glsl" flat varying vec2 TAA_Offset; diff --git a/shaders/dimensions/deferred.vsh b/shaders/dimensions/deferred.vsh index d90f3f5..66b872c 100644 --- a/shaders/dimensions/deferred.vsh +++ b/shaders/dimensions/deferred.vsh @@ -2,7 +2,7 @@ #include "/lib/res_params.glsl" #include "/lib/Shadow_Params.glsl" -// #extension GL_EXT_gpu_shader4 : enable + flat varying vec3 averageSkyCol_Clouds; flat varying vec3 averageSkyCol; diff --git a/shaders/dimensions/deferred2.fsh b/shaders/dimensions/deferred2.fsh index 2c7cbc7..4def756 100644 --- a/shaders/dimensions/deferred2.fsh +++ b/shaders/dimensions/deferred2.fsh @@ -1,5 +1,3 @@ - -//#extension GL_EXT_gpu_shader4 : disable #include "/lib/settings.glsl" //Computes volumetric clouds at variable resolution (default 1/4 res) diff --git a/shaders/dimensions/deferred2.vsh b/shaders/dimensions/deferred2.vsh index 87fc6e3..d214d47 100644 --- a/shaders/dimensions/deferred2.vsh +++ b/shaders/dimensions/deferred2.vsh @@ -1,5 +1,3 @@ - -//#extension GL_EXT_gpu_shader4 : disable #include "/lib/settings.glsl" flat varying vec3 averageSkyCol; diff --git a/shaders/world0/shadow.fsh b/shaders/world0/shadow.fsh index 6d43fc3..f4b57ef 100644 --- a/shaders/world0/shadow.fsh +++ b/shaders/world0/shadow.fsh @@ -1,6 +1,6 @@ #version 120 //#extension GL_ARB_shader_texture_lod : disable -#extension GL_EXT_gpu_shader4 : enable + #include "/lib/settings.glsl" @@ -22,7 +22,7 @@ void main() { gl_FragData[0] = texture2D(tex,texcoord.xy); #ifdef SHADOW_DISABLE_ALPHA_MIPMAPS - gl_FragData[0].a = texture2DLod(tex,texcoord.xy,0).a; + gl_FragData[0].a = texture2DLod(tex,texcoord.xy, 0).a; #endif #ifdef RENDER_ENTITY_SHADOWS diff --git a/shaders/world0/shadow.vsh b/shaders/world0/shadow.vsh index 0d49ee4..9af489e 100644 --- a/shaders/world0/shadow.vsh +++ b/shaders/world0/shadow.vsh @@ -1,5 +1,5 @@ #version 120 -#extension GL_EXT_gpu_shader4 : enable + /*