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

polymost.cpp: Adjust shaders to use texture2DGradARB() if available

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7781 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
pogokeen 2019-07-12 08:44:32 +00:00 committed by Christoph Oelckers
parent cfa40f33df
commit fe36034e43
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
source/build/src/polymost.cpp
View file

@ -904,6 +904,7 @@ void polymost_glinit()
}\n"; }\n";
const char* const POLYMOST1_BASIC_FRAGMENT_SHADER_CODE = const char* const POLYMOST1_BASIC_FRAGMENT_SHADER_CODE =
"#version 110\n\ "#version 110\n\
#extension ARB_shader_texture_lod : enable\n\
\n\ \n\
//s_texture points to an indexed color texture\n\ //s_texture points to an indexed color texture\n\
uniform sampler2D s_texture;\n\ uniform sampler2D s_texture;\n\
@ -951,12 +952,17 @@ void polymost_glinit()
coordX += u_npotEmulationXOffset*floor(mod(coordY,u_npotEmulationFactor));\n\ coordX += u_npotEmulationXOffset*floor(mod(coordY,u_npotEmulationFactor));\n\
coordY = period+mod(coordY,u_npotEmulationFactor);\n\ coordY = period+mod(coordY,u_npotEmulationFactor);\n\
vec2 newCoord = mix(gl_TexCoord[0].xy,mix(vec2(coordX,coordY),vec2(coordY,coordX),u_usePalette),u_npotEmulation);\n\ vec2 newCoord = mix(gl_TexCoord[0].xy,mix(vec2(coordX,coordY),vec2(coordY,coordX),u_usePalette),u_npotEmulation);\n\
//GLSL 130+ could alternatively use texture2DGrad()\n\ #ifdef GL_ARB_shader_texture_lod\n\
vec2 transitionBlend = fwidth(floor(newCoord.xy));\n\ vec2 texCoord = fract(newCoord.xy);\n\
transitionBlend = fwidth(transitionBlend)+transitionBlend;\n\ texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize);\n\
vec2 texCoord = mix(fract(newCoord.xy), abs(c_one-mod(newCoord.xy+c_one, c_two)), transitionBlend);\n\ vec4 color = texture2DGradARB(s_texture, u_texturePosSize.xy+texCoord, dFdx(texCoord), dFdy(texCoord));\n\
texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize);\n\ #else\n\
vec4 color = texture2D(s_texture, u_texturePosSize.xy+texCoord);\n\ vec2 transitionBlend = fwidth(floor(newCoord.xy));\n\
transitionBlend = fwidth(transitionBlend)+transitionBlend;\n\
vec2 texCoord = mix(fract(newCoord.xy), abs(c_one-mod(newCoord.xy+c_one, c_two)), transitionBlend);\n\
texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize);\n\
vec4 color = texture2D(s_texture, u_texturePosSize.xy+texCoord);\n\
#endif\n\
\n\ \n\
float shade = clamp((u_shade+max(u_visFactor*v_distance-0.5*u_shadeInterpolate,c_zero)), c_zero, u_numShades-c_one);\n\ float shade = clamp((u_shade+max(u_visFactor*v_distance-0.5*u_shadeInterpolate,c_zero)), c_zero, u_numShades-c_one);\n\
float shadeFrac = mod(shade, c_one);\n\ float shadeFrac = mod(shade, c_one);\n\
@ -994,6 +1000,7 @@ void polymost_glinit()
}\n"; }\n";
const char* const POLYMOST1_EXTENDED_FRAGMENT_SHADER_CODE = const char* const POLYMOST1_EXTENDED_FRAGMENT_SHADER_CODE =
"#version 110\n\ "#version 110\n\
#extension ARB_shader_texture_lod : enable\n\
\n\ \n\
//s_texture points to an indexed color texture\n\ //s_texture points to an indexed color texture\n\
uniform sampler2D s_texture;\n\ uniform sampler2D s_texture;\n\
@ -1047,12 +1054,17 @@ void polymost_glinit()
coordX += u_npotEmulationXOffset*floor(mod(coordY,u_npotEmulationFactor));\n\ coordX += u_npotEmulationXOffset*floor(mod(coordY,u_npotEmulationFactor));\n\
coordY = period+mod(coordY,u_npotEmulationFactor);\n\ coordY = period+mod(coordY,u_npotEmulationFactor);\n\
vec2 newCoord = mix(gl_TexCoord[0].xy,mix(vec2(coordX,coordY),vec2(coordY,coordX),u_usePalette),u_npotEmulation);\n\ vec2 newCoord = mix(gl_TexCoord[0].xy,mix(vec2(coordX,coordY),vec2(coordY,coordX),u_usePalette),u_npotEmulation);\n\
//GLSL 130+ could alternatively use texture2DGrad()\n\ #ifdef GL_ARB_shader_texture_lod\n\
vec2 transitionBlend = fwidth(floor(newCoord.xy));\n\ vec2 texCoord = fract(newCoord.xy);\n\
transitionBlend = fwidth(transitionBlend)+transitionBlend;\n\ texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize);\n\
vec2 texCoord = mix(fract(newCoord.xy), abs(c_one-mod(newCoord.xy+c_one, c_two)), transitionBlend);\n\ vec4 color = texture2DGradARB(s_texture, u_texturePosSize.xy+texCoord, dFdx(texCoord), dFdy(texCoord));\n\
texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize);\n\ #else\n\
vec4 color = texture2D(s_texture, u_texturePosSize.xy+texCoord);\n\ vec2 transitionBlend = fwidth(floor(newCoord.xy));\n\
transitionBlend = fwidth(transitionBlend)+transitionBlend;\n\
vec2 texCoord = mix(fract(newCoord.xy), abs(c_one-mod(newCoord.xy+c_one, c_two)), transitionBlend);\n\
texCoord = clamp(u_texturePosSize.zw*texCoord, u_halfTexelSize, u_texturePosSize.zw-u_halfTexelSize);\n\
vec4 color = texture2D(s_texture, u_texturePosSize.xy+texCoord);\n\
#endif\n\
\n\ \n\
float shade = clamp((u_shade+max(u_visFactor*v_distance-0.5*u_shadeInterpolate,c_zero)), c_zero, u_numShades-c_one);\n\ float shade = clamp((u_shade+max(u_visFactor*v_distance-0.5*u_shadeInterpolate,c_zero)), c_zero, u_numShades-c_one);\n\
float shadeFrac = mod(shade, c_one);\n\ float shadeFrac = mod(shade, c_one);\n\