From 020b02e073c6a67f86dfe951c91a2f0b520aab3c Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Fri, 28 Nov 2014 12:28:45 +0100
Subject: [PATCH] - changed deprecated texture sampler access function names.

---
 wadsrc/static/shaders/glsl/burn.fp           | 4 ++--
 wadsrc/static/shaders/glsl/func_brightmap.fp | 2 +-
 wadsrc/static/shaders/glsl/main.fp           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wadsrc/static/shaders/glsl/burn.fp b/wadsrc/static/shaders/glsl/burn.fp
index 4ab4cac95..f928fd8db 100644
--- a/wadsrc/static/shaders/glsl/burn.fp
+++ b/wadsrc/static/shaders/glsl/burn.fp
@@ -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);
 }
diff --git a/wadsrc/static/shaders/glsl/func_brightmap.fp b/wadsrc/static/shaders/glsl/func_brightmap.fp
index bea336eb6..8e5f44d04 100644
--- a/wadsrc/static/shaders/glsl/func_brightmap.fp
+++ b/wadsrc/static/shaders/glsl/func_brightmap.fp
@@ -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);
 }
diff --git a/wadsrc/static/shaders/glsl/main.fp b/wadsrc/static/shaders/glsl/main.fp
index 41150fa20..90fab0e25 100644
--- a/wadsrc/static/shaders/glsl/main.fp
+++ b/wadsrc/static/shaders/glsl/main.fp
@@ -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