- changed deprecated texture sampler access function names.

This commit is contained in:
Christoph Oelckers 2014-11-28 12:28:45 +01:00
parent ec627d94dd
commit 020b02e073
3 changed files with 4 additions and 4 deletions

View file

@ -8,8 +8,8 @@ void main()
{
vec4 frag = vColor;
vec4 t1 = texture2D(tex, vTexCoord.xy);
vec4 t2 = texture2D(texture2, vec2(vTexCoord.x, 1.0-vTexCoord.y));
vec4 t1 = texture(tex, vTexCoord.xy);
vec4 t2 = texture(texture2, vec2(vTexCoord.x, 1.0-vTexCoord.y));
FragColor = frag * vec4(t1.r, t1.g, t1.b, t2.a);
}

View file

@ -7,6 +7,6 @@ vec4 ProcessTexel()
vec4 ProcessLight(vec4 color)
{
vec4 brightpix = desaturate(texture2D(texture2, vTexCoord.st));
vec4 brightpix = desaturate(texture(texture2, vTexCoord.st));
return vec4(min (color.rgb + brightpix.rgb, 1.0), color.a);
}

View file

@ -53,7 +53,7 @@ vec4 desaturate(vec4 texel)
vec4 getTexel(vec2 st)
{
vec4 texel = texture2D(tex, st);
vec4 texel = texture(tex, st);
//
// Apply texture modes