aboutsummaryrefslogtreecommitdiff
path: root/system/shaders/GL/1.5/gl_convolution-6x6.glsl
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2017-12-27 11:30:00 +0100
committerRainer Hochecker <fernetmenta@online.de>2017-12-29 15:56:38 +0100
commitc141bb14d959414aaf72c58d617df2a0978a9d90 (patch)
tree90aaf9f8a94f2920e29a8ebc94a45b63c267c382 /system/shaders/GL/1.5/gl_convolution-6x6.glsl
parentf0b888922aaf9c007c1db8bc02f884b58959048e (diff)
VideoPlayer: drop unneeded define USE1DTEXTURE
Diffstat (limited to 'system/shaders/GL/1.5/gl_convolution-6x6.glsl')
-rw-r--r--system/shaders/GL/1.5/gl_convolution-6x6.glsl19
1 files changed, 3 insertions, 16 deletions
diff --git a/system/shaders/GL/1.5/gl_convolution-6x6.glsl b/system/shaders/GL/1.5/gl_convolution-6x6.glsl
index b6e7c39968..950192d496 100644
--- a/system/shaders/GL/1.5/gl_convolution-6x6.glsl
+++ b/system/shaders/GL/1.5/gl_convolution-6x6.glsl
@@ -6,12 +6,7 @@ uniform float m_stretch;
uniform float m_alpha;
in vec2 m_cord;
out vec4 fragColor;
-
-#if (USE1DTEXTURE)
- uniform sampler1D kernelTex;
-#else
- uniform sampler2D kernelTex;
-#endif
+uniform sampler1D kernelTex;
//nvidia's half is a 16 bit float and can bring some speed improvements
//without affecting quality
@@ -24,17 +19,9 @@ out vec4 fragColor;
half3 weight(float pos)
{
#if (HAS_FLOAT_TEXTURE)
- #if (USE1DTEXTURE)
- return texture(kernelTex, pos).rgb;
- #else
- return texture(kernelTex, vec2(pos, 0.5)).rgb;
- #endif
+ return texture(kernelTex, pos).rgb;
#else
- #if (USE1DTEXTURE)
- return texture(kernelTex, pos).rgb * 2.0 - 1.0;
- #else
- return texture(kernelTex, vec2(pos, 0.5)).rgb * 2.0 - 1.0;
- #endif
+ return texture(kernelTex, pos).rgb * 2.0 - 1.0;
#endif
}