diff --git a/language.version b/language.version index ff0d1c2d7..c79455223 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r165 \cu(Fri 8 Jul 22:22:35 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r165 \cu(2022-07-08 22:22:35)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r167 \cu(Fri 8 Jul 22:26:26 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r167 \cu(2022-07-08 22:26:26)\c-"; diff --git a/shaders/glsl/NewLogoAnimated.fp b/shaders/glsl/NewLogoAnimated.fp index 5ea8ed602..f39a6fa10 100644 --- a/shaders/glsl/NewLogoAnimated.fp +++ b/shaders/glsl/NewLogoAnimated.fp @@ -32,12 +32,7 @@ vec4 blacktoalpha( in vec4 src ) dst.a *= alpha; return dst; } -#ifdef NO_BILINEAR -vec4 BilinearSample( in sampler2D tex, in vec2 pos, in vec2 size, in vec2 pxsize ) -{ - return texture(tex,pos); -} -#else + vec4 BilinearSample( in sampler2D tex, in vec2 pos, in vec2 size, in vec2 pxsize ) { vec2 f = fract(pos*size); @@ -50,7 +45,6 @@ vec4 BilinearSample( in sampler2D tex, in vec2 pos, in vec2 size, in vec2 pxsize vec4 pInterp_q1 = mix(p0q1,p1q1,f.x); return mix(pInterp_q0,pInterp_q1,f.y); } -#endif vec3 GradientMap( in vec3 color ) {