forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replacing possibly deprecated gl_FragColor

This commit is contained in:
James Johnson 2018-01-18 15:40:11 -05:00
parent cfff2982e8
commit 798eed24c8
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
views/res/shaders/colored.frag
View File

@ -66,7 +66,7 @@ uniform float u_modulateAlpha;
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// Variables // Variables
vec4 _baseColor; vec4 _baseColor;
out vec4 _fragColor;
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// Varyings // Varyings
#if defined(VERTEX_COLOR) #if defined(VERTEX_COLOR)
@ -115,30 +115,30 @@ void main()
_baseColor = u_diffuseColor; _baseColor = u_diffuseColor;
#endif #endif
gl_FragColor.a = _baseColor.a; _fragColor.a = _baseColor.a;
gl_FragColor.rgb = getLitPixel(); _fragColor.rgb = getLitPixel();
#else #else
#if defined(VERTEX_COLOR) #if defined(VERTEX_COLOR)
gl_FragColor.rgb = v_color; _fragColor.rgb = v_color;
gl_FragColor.a = 1.0; _fragColor.a = 1.0;
#else #else
gl_FragColor = u_diffuseColor; _fragColor = u_diffuseColor;
#endif #endif
#endif #endif
#if defined(LIGHTMAP) #if defined(LIGHTMAP)
vec4 lightColor = texture2D(u_lightmapTexture, v_texCoord1); vec4 lightColor = texture2D(u_lightmapTexture, v_texCoord1);
gl_FragColor.rgb *= lightColor.rgb; _fragColor.rgb *= lightColor.rgb;
#endif #endif
#if defined(MODULATE_COLOR) #if defined(MODULATE_COLOR)
gl_FragColor *= u_modulateColor; _fragColor *= u_modulateColor;
#endif #endif
#if defined(MODULATE_ALPHA) #if defined(MODULATE_ALPHA)
gl_FragColor.a *= u_modulateAlpha; _fragColor.a *= u_modulateAlpha;
#endif #endif
} }

16
views/res/shaders/textured.frag
View File

@ -81,7 +81,7 @@ uniform float u_fogMaxDistance;
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// Variables // Variables
vec4 _baseColor; vec4 _baseColor;
out vec4 _fragColor;
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// Varyings // Varyings
varying vec2 v_texCoord; varying vec2 v_texCoord;
@ -146,30 +146,30 @@ void main()
_baseColor = mix(u_fogColor, _baseColor, fogFactor); _baseColor = mix(u_fogColor, _baseColor, fogFactor);
#endif #endif
gl_FragColor.a = _baseColor.a; _fragColor.a = _baseColor.a;
#if defined(TEXTURE_DISCARD_ALPHA) #if defined(TEXTURE_DISCARD_ALPHA)
if (gl_FragColor.a < 0.5) if (_fragColor.a < 0.5)
discard; discard;
#endif #endif
#if defined(LIGHTING) #if defined(LIGHTING)
gl_FragColor.rgb = getLitPixel(); _fragColor.rgb = getLitPixel();
#else #else
gl_FragColor.rgb = _baseColor.rgb; _fragColor.rgb = _baseColor.rgb;
#endif #endif
#if defined(LIGHTMAP) #if defined(LIGHTMAP)
vec4 lightColor = texture2D(u_lightmapTexture, v_texCoord1); vec4 lightColor = texture2D(u_lightmapTexture, v_texCoord1);
gl_FragColor.rgb *= lightColor.rgb; _fragColor.rgb *= lightColor.rgb;
#endif #endif
#if defined(MODULATE_COLOR) #if defined(MODULATE_COLOR)
gl_FragColor *= u_modulateColor; _fragColor *= u_modulateColor;
#endif #endif
#if defined(MODULATE_ALPHA) #if defined(MODULATE_ALPHA)
gl_FragColor.a *= u_modulateAlpha; _fragColor.a *= u_modulateAlpha;
#endif #endif
} }