zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed the shader.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-20 15:02:49 +02:00
parent f6993940e5
commit a55e19ed83
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/build/src/polymost1Frag.glsl
View file

@ -1,5 +1,4 @@
#version 110 #version 110
#extension ARB_shader_texture_lod : enable
//include an additional space here so that we can programmatically search for and disable this preprocessor definition easily //include an additional space here so that we can programmatically search for and disable this preprocessor definition easily
#define POLYMOST1_EXTENDED #define POLYMOST1_EXTENDED
@ -33,6 +32,7 @@ uniform float u_npotEmulation;
uniform float u_npotEmulationFactor; uniform float u_npotEmulationFactor;
uniform float u_npotEmulationXOffset; uniform float u_npotEmulationXOffset;
uniform float u_shadeInterpolate; uniform float u_shadeInterpolate;
uniform float u_brightness;
#ifdef POLYMOST1_EXTENDED #ifdef POLYMOST1_EXTENDED
uniform float u_useDetailMapping; uniform float u_useDetailMapping;
@ -59,17 +59,11 @@ void main()
coordX += u_npotEmulationXOffset*floor(mod(coordY,u_npotEmulationFactor)); coordX += u_npotEmulationXOffset*floor(mod(coordY,u_npotEmulationFactor));
coordY = period+mod(coordY,u_npotEmulationFactor); coordY = period+mod(coordY,u_npotEmulationFactor);
vec2 newCoord = mix(gl_TexCoord[0].xy,mix(vec2(coordX,coordY),vec2(coordY,coordX),u_usePalette),u_npotEmulation); vec2 newCoord = mix(gl_TexCoord[0].xy,mix(vec2(coordX,coordY),vec2(coordY,coordX),u_usePalette),u_npotEmulation);
#ifdef GL_ARB_shader_texture_lod
vec2 texCoord = fract(newCoord.xy);
texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize);
vec4 color = texture2DGradARB(s_texture, u_texturePosSize.xy+texCoord, dFdx(texCoord), dFdy(texCoord));
#else
vec2 transitionBlend = fwidth(floor(newCoord.xy)); vec2 transitionBlend = fwidth(floor(newCoord.xy));
transitionBlend = fwidth(transitionBlend)+transitionBlend; transitionBlend = fwidth(transitionBlend)+transitionBlend;
vec2 texCoord = mix(fract(newCoord.xy), abs(c_one-mod(newCoord.xy+c_one, c_two)), transitionBlend); vec2 texCoord = mix(fract(newCoord.xy), abs(c_one-mod(newCoord.xy+c_one, c_two)), transitionBlend);
texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize); texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize);
vec4 color = texture2D(s_texture, u_texturePosSize.xy+texCoord); vec4 color = texture2D(s_texture, u_texturePosSize.xy+texCoord);
#endif
float shade = clamp((u_shade+max(u_visFactor*v_distance-0.5*u_shadeInterpolate,c_zero)), c_zero, u_numShades-c_one); float shade = clamp((u_shade+max(u_visFactor*v_distance-0.5*u_shadeInterpolate,c_zero)), c_zero, u_numShades-c_one);
float shadeFrac = mod(shade, c_one); float shadeFrac = mod(shade, c_one);
@ -111,6 +105,7 @@ void main()
#endif #endif
color.a *= v_color.a; color.a *= v_color.a;
color.rgb = pow(color.rgb, vec3(u_brightness));
gl_FragData[0] = color; gl_FragData[0] = color;
} }